Commit Graph

6438 Commits

Author SHA1 Message Date
KorPhaeron a82d9c5a0f More updates
Punching variant can choose battlecry, removed ventcrawl from scout
(weird interactions with incorporeal move), added an explosive act.
2015-08-04 20:00:45 -05:00
phil235 4e5be438cd Merge pull request #10990 from RemieRichards/StorageUnequipUsability
Storage Item Click Usability Improvement
2015-08-05 00:07:01 +02:00
Remie Richards 06a4be7708 Applies the same "NO MORE PIXEL HUNTING" fix to the Cyborg Module Inventory too. 2015-08-04 23:04:19 +01:00
Xhuis e370d89ca3 Merge remote-tracking branch 'remotes/upstream/master' into remove_thrall 2015-08-04 14:48:35 -04:00
Aranclanos a825eb02e8 Merge pull request #10991 from Ikarrus/fucksec
Head Beating no longer deconvert gangsters
2015-08-04 14:23:45 -03:00
c0 8769e7b6f4 MMI ID lock removed 2015-08-04 16:33:42 +03:00
Jordie d5a88d3f98 Merge pull request #10957 from Core0verload/surgery-organs-implants
Implants, Surgery and Organs rework: Phase 1
2015-08-04 21:45:02 +10:00
KorPhaeron 41b940c1fa Clarified var names 2015-08-03 23:52:35 -05:00
KorPhaeron 54fa4d8044 Update 2015-08-03 23:17:21 -05:00
KorPhaeron 3419ffb579 Spirits, nanomachines, scarabs 2015-08-03 17:52:05 -05:00
Xhuis d1ceb296be Merge remote-tracking branch 'remotes/upstream/master' into remove_thrall 2015-08-03 16:37:06 -04:00
Xhuis 4cefd114c5 Shadowling update 3 2015-08-03 16:35:42 -04:00
c0 667d5e75c3 Transferred body eggs to new organs system 2015-08-03 23:24:17 +03:00
Remie Richards db22dd672e Merge pull request #10962 from Core0verload/weneedtogodeeper
Removes some annoying inventory tetris with storages in storages
2015-08-03 17:15:11 +01:00
Remie Richards aeea711c87 Merge pull request #10978 from Summoners/fixingthehiss
A stupid lazy fix but a needed fix.
2015-08-03 17:13:44 +01:00
AnturK 9f005534ae Fixes implant action buttons.
Turns action buttons off for morphs.
2015-08-03 16:56:58 +02:00
Remie Richards 5434bb7854 Merge pull request #10970 from phil235/SyringeProjShieldBlockFix
Projectile blocking fixes
2015-08-03 05:28:28 +01:00
Remie Richards f124fe7a25 Merge pull request #10955 from Core0verload/ghostnotify
Changes cloning ghost notifications to be less copypasta/snowfake
2015-08-03 05:24:26 +01:00
Remie Richards ffe7bae869 Merge pull request #10941 from SvartaSvansen/whispering-lizards
Fixes hisspering (whisper bug)
2015-08-03 05:22:30 +01:00
Remie Richards e262b309db Merge pull request #10953 from KorPhaeron/slowdemon
Nerfs Slaughter Demon
2015-08-03 05:21:29 +01:00
Remie Richards af7a671097 Merge pull request #10921 from phil235/StorageThrowFix
Storage throw runtime fix
2015-08-03 05:17:50 +01: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
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
Summoners 8e167bd46e DEATH OF THE S REMOVAL AND THE UNDERSCORES 2015-08-02 13:44:07 +09:00
Summoners 662b1c1c92 A stupid lazy fix but a needed fix. 2015-08-02 09:38:19 +09: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 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 04f7b3f2de Surgery, Implants and Organs rework: Phase 1 2015-07-31 22:18:31 +03: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
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
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
Remie Richards aff1d90848 Merge pull request #10885 from KorPhaeron/blood
Slaughter Demon powers can now be used by any mob
2015-07-29 19:42:27 +01:00
KorPhaeron b521801ef9 Updated comment 2015-07-29 13:22:52 -05:00
KorPhaeron bece4783ad Last PoolOrNew 2015-07-29 13:21:27 -05:00
KorPhaeron fdf186ad5a More of the same 2015-07-29 13:20:51 -05:00