Commit Graph

4758 Commits

Author SHA1 Message Date
Jordie
f4b41b99bf Merge pull request #11016 from Core0verload/mmi
MMI ID lock removed
2015-08-07 19:38:27 +10:00
Jordie
63c545346d Merge pull request #10992 from RemieRichards/AlternateWornLayer
Adds alternate_worn_layer
2015-08-07 19:37:52 +10:00
KorPhaeron
842339dbc6 More slight nerfs 2015-08-07 00:28:06 -05:00
KorPhaeron
616f3da3f4 Extra punctuation 2015-08-07 00:21:14 -05:00
KorPhaeron
fc218bcf84 Nerfs Healer, adds checks to healer/bomb 2015-08-06 18:55:15 -05:00
KorPhaeron
97543db0ed Words 2015-08-06 10:21:13 -05:00
KorPhaeron
e9bec804a8 Ranged Version gets its own projectile 2015-08-06 00:13:36 -05:00
KorPhaeron
a8f9ddf56c Fixes ranged simple animals 2015-08-05 22:27:36 -05:00
KorPhaeron
eb6a72a501 Guardian Fixes
Creating bombs with dense objects will make the bomb dense

The battlecry will only activate on mobs so you can't spam it on stuff with no clickdelay

Slightly nerfed the fire type (takes more damage, spreads less firestacks). Will probably need further balancing.

Using the communicate verb will now display the message for the user as well so you can keep track of your conversations better.
2015-08-05 22:00:08 -05:00
Remie Richards
6e41222599 Merge pull request #11009 from KorPhaeron/korsbizzareadventure
Guardian Spirits/Parasitic Nanomachine Swarm/Scarab Hive
2015-08-06 02:32:40 +01:00
KorPhaeron
cee73fb4fb Don't need those anyway 2015-08-05 20:30:09 -05:00
KorPhaeron
593e9a1d7b Check for null input 2015-08-05 20:26:11 -05:00
KorPhaeron
e37efcc9c8 Ancient code 2015-08-05 20:19:25 -05:00
KorPhaeron
e714ecebcd Removes nonfunctional bolding 2015-08-05 20:14:54 -05:00
KorPhaeron
e28a0857b2 More efficient disguising 2015-08-05 20:14:22 -05:00
KorPhaeron
5612860c94 I can't spell 2015-08-05 14:51:43 -05:00
KorPhaeron
edf99daf4d New Guardian Type and fixes
Bomb type that sets booby traps.

Various value tweaks, bug fix, death messages.
2015-08-05 13:50:51 -05:00
KorPhaeron
50a5877646 Another update
Fixed the bluespace one telporting APCs around, added sprites for the
ghost version, fixed naming.
2015-08-05 03:13:57 -05:00
Jordie
933cdc1c0c Merge pull request #11002 from AnturK/bizzaro
Some action button fixes
2015-08-05 14:50:23 +10:00
Jordie
723d18400e Merge pull request #10963 from astralenigma/petcollarfix
Fixes the renaming collar.
2015-08-05 13:55:47 +10:00
Jordie
cb469e242f Merge pull request #10871 from Xhuis/shadowling_update_3
Shadowling Update III
2015-08-05 13:43:16 +10:00
Remie Richards
b67657787a Fixes Cyborg Modules being permanently mouse_opacity 2, preventing you from turning them on/off. 2015-08-05 04:28:34 +01:00
KorPhaeron
69d758f897 Merge branch 'korsbizzareadventure' of https://github.com/KorPhaeron/kortg into korsbizzareadventure 2015-08-04 20:00:59 -05:00
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