Commit Graph

12467 Commits

Author SHA1 Message Date
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 72a5c7bf5e Updates surgery 2015-08-04 15:11:53 -04: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
c0 88f2073a5e Abductor glands are organs now 2015-08-04 01:46:32 +03:00
c0 d3c363a2e4 Changelog 2015-08-04 00:14:24 +03: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
PatchouliKnowledge 056c018b80 Preventative appendectomy prevents appendicitis 2015-08-03 15:13:00 +03: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
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