c0
2e5cedef74
Added alien organs
2015-08-09 01:12:32 +03:00
c0
691f6fb66d
Surgery & Organs Rework: Phase 2
2015-08-06 09:56:54 +03: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
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
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
