Commit Graph

14295 Commits

Author SHA1 Message Date
Remie Richards af7a671097 Merge pull request #10921 from phil235/StorageThrowFix
Storage throw runtime fix
2015-08-03 05:17:50 +01:00
Mike Long 56e824fdb7 Fixes compile error, and removes erroneous line of code. 2015-08-02 22:08:54 -04:00
Mike Long 3d53fa266e Collars no longer pop up if you aren't wearing a uniform.
Added new saying.
2015-08-02 21:56:42 -04:00
Remie Richards 47fe31346e Adds alternate_worn_layer, like alternate_worn_icon it allows an item to slightly bend the rules of worn item rendering, DOES NOT MODIFY THE STANDING_ICONS INDEXES, BECAUSE THAT WOULD BREAK THINGS 2015-08-02 22:45:18 +01:00
Ikarrus 439dd6d011 Head Beating no longer deconvert gangsters
I've seen enough rounds where security just goes full Hitler and beats everyone, gangster or no, to death and just leaves their corpse in the brig afterwards.

Gangs have implant breakers and security still has implants. Head beatings are no longer needed and just lead to extreme mad.
2015-08-02 14:20:47 -06:00
c0 600d424ea5 Moved cyberimplants to internal organs system 2015-08-02 22:28:45 +03:00
Rui Neves Carvalho 91e3ee3658 Everybody hates my code. 2015-08-02 16:42:07 +01:00
Cheridan 31fca2d6b8 Merge pull request #10952 from phil235/BartenderSecPhotoFix
Fixes bartender uniform not appearing in security record photo.
2015-08-02 07:20:45 -05:00
Cheridan 975fa419a5 Merge pull request #10938 from phil235/HostileTargetingChanges
Changes the targeting code for hostile animals
2015-08-02 07:11:19 -05:00
Cheridan 88b2180017 Merge pull request #10949 from phil235/SleepSmokeFix
Fixes sleeping smoke never disappearing.
2015-08-02 06:56:47 -05:00
Cheridan 7763263cc0 Merge pull request #10940 from Incoming5643/no_glove_no_love
Syndicate toolboxes now come with insulated gloves
2015-08-02 06:35:42 -05:00
c0 93b72c863a Added progress bars to surgeries 2015-08-02 14:15:06 +03:00
Summoners 8e167bd46e DEATH OF THE S REMOVAL AND THE UNDERSCORES 2015-08-02 13:44:07 +09:00
Mike Long 7a9135ddaa Reduced the amount of speech and emote spam. 2015-08-02 00:04:23 -04:00
Mike Long 53cf253ddd Fixes compile error. Oops. 2015-08-01 23:40:03 -04:00
Mike Long bb4e140ed1 Adds new chemical: spray tan 2015-08-01 23:30:49 -04:00
Summoners 662b1c1c92 A stupid lazy fix but a needed fix. 2015-08-02 09:38:19 +09:00
c0 8e0e6f3191 Tweaks and fixes 2015-08-02 00:37:29 +03:00
Rui Neves Carvalho 738b72702b Phil hates semi-colons and parenthesis and has supreme god bug fixer he requires sacrifices. 2015-08-01 20:32:46 +01:00
Rui Neves Carvalho d686ad3a69 Corrected the copypasta by Phil's wise specifications. 2015-08-01 18:02:32 +01:00
Rui Neves Carvalho 4c0d685d6f Revert "Added L"
This reverts commit d0c0760653.
2015-08-01 17:42:19 +01:00
Rui Neves Carvalho d0c0760653 Added L 2015-08-01 17:41:57 +01:00
phil235 7498d3de63 Merge pull request #10835 from RemieRichards/ninjastuff
Ninja Invisiblity Fixes
2015-08-01 18:39:11 +02:00
phil235 40a1c3c5de Merge pull request #10935 from bear1ake/ian-stuff
FIX IAN STUFF (paths)
2015-08-01 17:27:36 +02:00
phil235 cdd15b7c27 Removes some unneeded code(flag = "magic" when already inheriting it from parent, adding a 0 argument to on_hit when it already defaults to 0).
Fixes syringe dart not respecting shield blocking.
Projectile doesn't show the hit message anymore if 100% blocked (shield blocking mostly). (but it is still logged)

Fixes deflected dart projectiles not being logged.
2015-08-01 16:57:27 +02:00
Rui Neves Carvalho f0ebee0467 Digging gets the same progress bar as minning.
Fixes #10854
2015-08-01 08:18:33 +01:00
Rui Neves Carvalho a127656fb3 Fixes the renaming collar. 2015-08-01 04:04:35 +01:00
c0 d70acbc7a8 Second level storages are not closing on mob movement 2015-08-01 02:59:06 +03:00
c0 47524811c5 Renamed "glass case" -> "implant case". Changed implant syndiekit to be less FUCKS. 2015-08-01 01:56:54 +03:00
c0 04f7b3f2de Surgery, Implants and Organs rework: Phase 1 2015-07-31 22:18:31 +03:00
bgobandit 0a6d65472c Fixes bug. Restores /retaliate to blacklist. Adds changelog. 2015-07-31 12:06:57 -04:00
c0 7495bf3569 Changed default message to more useful 2015-07-31 18:56:16 +03:00
c0 95285e7946 Changed cloning ghost notifications to be less copypasta 2015-07-31 18:42:03 +03:00
KorPhaeron 03ee347b4b Updated playstyle string 2015-07-31 09:39:57 -05:00
KorPhaeron f007e69581 Nerfs slaughter demon
They are now slower, but get a temporary speed boost upon exiting blood
(good idea Lumi)

They now have 200 health instead of 250
2015-07-31 09:35:54 -05:00
phil235 13e561e3e8 Fixes bartender uniform not appearing in security record photo.
Removing bar_suit icon in uniforms.dmi because it's identical to "barman"
Replaced instances of "ba_suit" and "bar_suit" with "barman" (so that the bartender uniform icon names follow the same pattern as other job uniforms ("chef", "captain", "hos", ...)
2015-07-31 16:20:21 +02:00
phil235 6a0be8b9a3 Fixes sleeping smoke never disappearing. Also switching processing.Add(src) to processing |= src.
Makes the empty space on the chem bottles sprites clickable.
Fixes a runtime with reagent_containers/throw_impact()
2015-07-31 15:01:35 +02:00
Cheridan 7b94435e9c Merge pull request #10924 from phil235/ProtolatheInsertFix
Fixes being able to insert sheets into the protolathe from a distance
2015-07-31 02:01:55 -05:00
bgobandit 751159b43d Adds a water reaction to gold slimes. Removes mobs from plasma/blood blacklist that shouldn't be blacklisted. 2015-07-31 01:04:26 -04:00
Cheridan 5b7c29073d Merge pull request #10872 from phil235/DisposalStuff
Some disposal fixes
2015-07-30 17:30:18 -05:00
SvartaSvansen decf5495cb Removed unnecessary braces. 2015-07-30 18:09:33 -04:00
Incoming e2c39a20f4 RemieRichards wins the technical code semantics fight today 2015-07-30 17:55:35 -04:00
Incoming 248b1f5c96 Syndicate toolboxes now come with insulted gloves (that look like red gloves). Wires are lost as a consequence. 2015-07-30 17:28:11 -04:00
SvartaSvansen 7ead988517 Teach those lizards some manners! 2015-07-30 17:14:42 -04:00
phil235 1f9143c224 Move hostile animal target into the life subproc handle_automated_action().
Renaming AI_SLEEP to AI_IDLE.
Removing debug messages.
2015-07-30 22:49:26 +02:00
phil235 357c595176 Changes the targeting code for hostile animals to be a bit more efficient. AIStatus and stance vars are now only one var. The idle stance is fused with the AI_SLEEP status. hostile/life() now only calls ListTargets() once per cycle (we save a list of targets then use that instead of calling the proc again).
Alien animals no longer plant egg/weed when player controlled (even if disconnected).
Created the the proc handle_automated_action() for simple_animals , currently only used by giant spiders and alien animals.

Player controlled hostile animals no longer starts targetting things again when the player disconnects.
2015-07-30 22:26:07 +02:00
Remie Richards f212ac2502 Merge pull request #10877 from Miauw62/spiders
Some spider improvements
2015-07-30 20:08:32 +01:00
bear1ake 5af0bdec25 fix ian stuff 2015-07-31 01:18:03 +09:00
phil235 95be17923e Merge branch 'master' of https://github.com/tgstation/-tg-station into DisposalStuff
Conflicts:
	_maps/map_files/AsteroidStation/Asteroidstation.dmm
2015-07-30 16:34:39 +02:00
Jordie0608 1132344628 Rice hat by scones 2015-07-30 21:13:43 +10:00