Commit Graph

6438 Commits

Author SHA1 Message Date
phil235 74f8a08522 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation
Conflicts:
	code/modules/mob/living/living.dm
2014-11-04 18:55:07 +01:00
phil235 1eaaf35b41 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechAtkFix1
Conflicts:
	code/game/objects/objs.dm
	code/modules/mob/living/carbon/human/human_defense.dm
2014-11-04 18:24:52 +01:00
GunHog 3c58bf7435 Moved some things around!
All radios now have a keyslot var (replacing keyslot1 for headsets).
- recalculateChannels() proc moved to radios instead of just headsets.
- Removed the duplicated recalc proc for borg radios.
- Moved the translate vars to radios as well.
- The syndicate headset subtype has been removed in favor of using the
make_syndie() proc on it instead.
2014-11-04 10:46:18 -06:00
GunHog 604bc648ff Gives Traitor AIs the Syndicate Channel!
This PR is intended to support #5283 .
- Traitor AIs, when set as a traitor, will be given a new internal radio
calibrated to hear and transmit to the encrypted syndicate frequency.

Since traitors can buy a headset key for getting the Syndicate Channel,
Traitor AIs can get one too, as they cannot purchase their own TC items.
2014-11-03 21:59:36 -06:00
Cheridan df13b0d840 Merge pull request #5591 from hornygranny/OOPgularity3
improved deconstruction, singularity stuff
2014-11-03 20:20:55 -06:00
hornygranny e662932bd1 Merge pull request #5512 from RemieRichards/AcidBurns
Acid Rework
2014-11-03 18:11:49 -08:00
hornygranny 38b4f50e3e Merge pull request #5630 from GunHog/Soft_Silky_Hair
Adds three new hairstyles by Mandurrrh!
2014-11-03 17:37:55 -08:00
hornygranny 3d09f8031a Merge pull request #5632 from GunHog/Botcall_Lagfix_TryTwo
Botcall Fix for MC lag + Tweak to floorbots Take Two
2014-11-03 17:35:16 -08:00
hornygranny d7b3b64c7a Merge pull request #5619 from MrPerson/I_know_this_should_be_two_prs_but_fuck_it
Cyborg law additions
2014-11-03 17:27:42 -08:00
hornygranny 8b4ab665cb Merge pull request #5490 from tkdrg/hiasl
Nanotransen Relay Chat
2014-11-03 17:26:53 -08:00
hornygranny 7e4688e3f6 Merge pull request #5427 from paprka/littlejanitorthings
Soap, lube, and janitor tweaks
2014-11-03 17:19:37 -08:00
hornygranny d79ccb4883 Merge pull request #5608 from tkdrg/whynamesandnotbodies
Creates the "Always use random body" option
2014-11-03 17:16:08 -08:00
hornygranny b4cc33e64e Merge pull request #5593 from tkdrg/investment
Adds cargo and secrecords to admin_investigate
2014-11-03 17:14:23 -08:00
hornygranny c12f67dae7 Merge pull request #5507 from tkdrg/xenonecrophilia
Facehuggers no longer violate the dead
2014-11-03 17:11:02 -08:00
hornygranny 85016d7f38 Merge pull request #5493 from tkdrg/pullingyourleg
Makes pull into a mob verb
2014-11-03 17:10:34 -08:00
hornygranny cf7de8d24d Merge pull request #5485 from MrPerson/emo_logging
Fixes slimes and borgs not emote logging
2014-11-03 17:08:38 -08:00
tkdrg 0335c4adec Makes ghostpointing invisible (thanks PsiOmegaDelta!) 2014-11-03 18:19:20 -03:00
phil235 9c11d9fa25 All mechs have a melee attack now, the force of non combat mechs is 5.
Changing the mech melee attack code to be more object oriented. Creating mech_melee_attack() proc for atom and overidden in its children.
Mechs can now hit windoors with their melee attack. (they can still open them by bumping)
2014-11-03 21:40:25 +01:00
Remie Richards c1060d95b2 Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidBurns
Conflicts:
	code/game/atoms.dm
	code/game/objects/items.dm
2014-11-03 19:38:58 +00:00
GunHog 7f41894319 Gives bots their own place in the MC!
- Adds bots to the Master Controller as their own datum instead of
machines.
- Puts bots into their own global list.
- Processes bots asynchronously so as to not hold up the MC processing
them.
2014-11-03 12:39:07 -06:00
Ergovisavi 46a3170b2a Firefighting changes:
-Firesuit level protection will not entirely protect you from being set on fire. You will gain small amounts of heat while on fire.
-Overhauls the Atmos Water Backpack into a more effective firefighting tool
-Adds a secure ATMOS closet containing said atmos water backpack to the code, but is not on the map as the backpack already exists in the ATMOS hardsuit object at this moment
2014-11-03 10:25:12 -08:00
Jordie0608 2ef1fd21d6 Adds bee swarms and butterflies and diseases to create them 2014-11-04 03:52:18 +11:00
Cheridan 5d7993eb75 Merge pull request #5602 from tkdrg/ihavenohandstopullyouwith
Slimes can no longer pull
2014-11-03 10:19:27 -06:00
phil235 1506383b2c Adding some missing do_attack_animation()
Moving do_attack_animation() proc to mob/living
Fixing the pixel offset issue from beds especially rollerbed.
Fixing the nograv bouncing stopping because of another animation being used.(lying down, jittering, attack animation)
2014-11-03 15:11:39 +01:00
MrPerson f67b5d68c8 Moving while dead causes you to ghost 2014-11-03 05:48:24 -08:00
MrPerson 8d7d302053 Fixes the world's worst typo and adds a changelog 2014-11-03 00:42:02 -08:00
GunHog d8efbc4f07 Botcall Fix for MC lag + Tweak to floorbots
- Attempts to fix a major screwup in bot movement code that created
artificial lag for the entire Master Controller.
- Fixes floorbots not patrolling or performing certain functions.
- You can now toggle the anchored status on Floorbots manually. They
will still automatically anchor when fixing hull breaches.

Allow me to apologize for taking so long to come up with a fix for this.
I tried several other solutions such as simply removing the sleep(4)
that causes this issue (it results in 'teleportation' movement). Other
times I used spawn() incorrectly, resulting in several race conditions.
And then I tried to give them their own ticker, independent of the MC.
The game lagged and runtimed before it even finished setting up.

Excuses aside, this solution seems to be working so far, but I welcome
any more elegant solutions to fixing this issue.

fixes #5560
2014-11-02 19:01:43 -06:00
GunHog a9c5667ab6 Adds three new hairstyles!
-Adds the High Ponytail, Long Ponytail, and Long Side Part hairstyles!
2014-11-02 18:06:53 -06:00
phil235 8b49caa5ee Fixes typos and show messages. Fixes attack animation code. 2014-11-03 01:06:02 +01:00
phil235 3f30912c51 WIP - Adding attack animation to most attacks.
Fixing a couple "for(......) show_message()".
2014-11-02 22:50:58 +01:00
tkdrg 9140006256 Fixes ghost pointing 2014-11-02 15:24:03 -03:00
Cheridan cf5df74a27 Merge pull request #5540 from phil235/botRepairFix1
adding CoolDown to welding repair on bot/borg/mecha
2014-11-02 12:12:19 -06:00
tkdrg 7ebc4bb742 Merge remote-tracking branch 'upstream/master' into pullingyourleg
Conflicts:
	code/modules/mob/mob.dm
2014-11-02 14:40:37 -03:00
Cheridan 51eae4c5a2 Merge pull request #5601 from phil235/ObjVerbCheckFix
Adding checks for stun, restrained to many object verbs.
2014-11-02 11:34:48 -06:00
MrPerson d78beb1c93 Cyborg law additions
Allow direct usage of law modules onto unslaved borgs
Lock newly emagged borgs down until their new laws are shown. Fixes #5587
2014-11-02 04:46:38 -08:00
paprka 4ea78aa077 fixes some things with the HUD 2014-11-01 22:19:14 -07:00
Cheridan 47c2e9339b Merge pull request #5567 from MrPerson/my_little_droney
Hopefully fixes that runtime where drones could wind up in nullspace.
2014-11-01 22:39:17 -05:00
paprka eeb1a52031 moved overlay cut back to the top 2014-11-01 18:45:41 -07:00
paprka 6d848f90fd final commit for now 2014-11-01 18:40:52 -07:00
paprka 651accb441 updates to health doll 2014-11-01 18:01:31 -07:00
paprka 911b643c77 initial commit 2014-11-01 17:35:50 -07:00
tkdrg 30841b5f37 Merge remote-tracking branch 'upstream/master' into hiasl
Conflicts:
	code/modules/research/message_server.dm
2014-11-01 20:04:26 -03:00
Hornygranny b16ed90db1 Merge branch 'OOPgularity3' of https://github.com/hornygranny/-tg-station 2014-11-01 13:29:46 -07:00
tkdrg 8a93247ef8 Creates the "Always use random body" config option 2014-11-01 16:48:42 -03:00
tkdrg 7ab17964d6 Slimes can no longer pull. 2014-11-01 16:15:42 -03:00
phil235 128c9222e5 Adding checks for stun, restrained to many object verbs.
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
tkdrg b030d0b432 admin_investigate will now log sec/med records deletion as well. 2014-11-01 13:25:09 -03:00
Remie Richards 0bc683aa29 Merge pull request #5457 from GunHog/AI_Radio
Adds AI Integrated Radio
2014-11-01 03:44:44 +00:00
tkdrg 977a1c3de1 Merge remote-tracking branch 'upstream/master' into investment
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-10-31 23:23:00 -03:00
tkdrg f995b2e94b Adds cargo and secrecords to admin_investigate 2014-10-31 23:20:33 -03:00