46b519309e
Merge pull request #11058 from Core0verload/surgery-organs-part2
...
Surgery & Organs rework: Phase 2
2015-08-13 18:04:16 +02:00
a959ed3727
Merge pull request #11120 from phil235/ThrowEmbedFix
...
Fixes item embedding not working.
2015-08-12 06:20:26 +01:00
032df41b14
Merge pull request #11067 from bgobandit/themobcannotventcrawl
...
Mobs can no longer ventcrawl while buckled or handcuffed
2015-08-11 18:27:03 -05:00
e922f510c5
Fixes not getting the hit message and sound (and logging) when the item embeds itself in a human.
...
Throwing a big item at an alien no longer pushes it.
If the item embeds itself in you, it doesn't push you.
Fixes an old argument in item/throw_impact() that I forgot to remove.
Rename the skip argument of hitby() to skipcatch (more explicit).
2015-08-09 20:30:47 +02:00
23a3ef7994
Fixes item embedding not working.
2015-08-09 15:57:36 +02:00
2e5cedef74
Added alien organs
2015-08-09 01:12:32 +03:00
2844c80ed5
Fixing merge conflicts
2015-08-08 15:43:38 +01:00
f4b41b99bf
Merge pull request #11016 from Core0verload/mmi
...
MMI ID lock removed
2015-08-07 19:38:27 +10:00
63c545346d
Merge pull request #10992 from RemieRichards/AlternateWornLayer
...
Adds alternate_worn_layer
2015-08-07 19:37:52 +10:00
842339dbc6
More slight nerfs
2015-08-07 00:28:06 -05:00
616f3da3f4
Extra punctuation
2015-08-07 00:21:14 -05:00
fc218bcf84
Nerfs Healer, adds checks to healer/bomb
2015-08-06 18:55:15 -05:00
9df13a2a9a
Mobs can no longer ventcrawl while buckled to a pipe, nor can they attempt to ventcrawl in handcuffs.
2015-08-06 18:14:05 -04:00
97543db0ed
Words
2015-08-06 10:21:13 -05:00
691f6fb66d
Surgery & Organs Rework: Phase 2
2015-08-06 09:56:54 +03:00
e9bec804a8
Ranged Version gets its own projectile
2015-08-06 00:13:36 -05:00
a8f9ddf56c
Fixes ranged simple animals
2015-08-05 22:27:36 -05:00
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
6e41222599
Merge pull request #11009 from KorPhaeron/korsbizzareadventure
...
Guardian Spirits/Parasitic Nanomachine Swarm/Scarab Hive
2015-08-06 02:32:40 +01:00
cee73fb4fb
Don't need those anyway
2015-08-05 20:30:09 -05:00
593e9a1d7b
Check for null input
2015-08-05 20:26:11 -05:00
e37efcc9c8
Ancient code
2015-08-05 20:19:25 -05:00
e714ecebcd
Removes nonfunctional bolding
2015-08-05 20:14:54 -05:00
e28a0857b2
More efficient disguising
2015-08-05 20:14:22 -05:00
5612860c94
I can't spell
2015-08-05 14:51:43 -05:00
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
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
933cdc1c0c
Merge pull request #11002 from AnturK/bizzaro
...
Some action button fixes
2015-08-05 14:50:23 +10:00
723d18400e
Merge pull request #10963 from astralenigma/petcollarfix
...
Fixes the renaming collar.
2015-08-05 13:55:47 +10:00
cb469e242f
Merge pull request #10871 from Xhuis/shadowling_update_3
...
Shadowling Update III
2015-08-05 13:43:16 +10:00
b67657787a
Fixes Cyborg Modules being permanently mouse_opacity 2, preventing you from turning them on/off.
2015-08-05 04:28:34 +01:00
69d758f897
Merge branch 'korsbizzareadventure' of https://github.com/KorPhaeron/kortg into korsbizzareadventure
2015-08-04 20:00:59 -05:00
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
4e5be438cd
Merge pull request #10990 from RemieRichards/StorageUnequipUsability
...
Storage Item Click Usability Improvement
2015-08-05 00:07:01 +02:00
06a4be7708
Applies the same "NO MORE PIXEL HUNTING" fix to the Cyborg Module Inventory too.
2015-08-04 23:04:19 +01:00
e370d89ca3
Merge remote-tracking branch 'remotes/upstream/master' into remove_thrall
2015-08-04 14:48:35 -04:00
a825eb02e8
Merge pull request #10991 from Ikarrus/fucksec
...
Head Beating no longer deconvert gangsters
2015-08-04 14:23:45 -03:00
8769e7b6f4
MMI ID lock removed
2015-08-04 16:33:42 +03:00
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
41b940c1fa
Clarified var names
2015-08-03 23:52:35 -05:00
54fa4d8044
Update
2015-08-03 23:17:21 -05:00
3419ffb579
Spirits, nanomachines, scarabs
2015-08-03 17:52:05 -05:00
d1ceb296be
Merge remote-tracking branch 'remotes/upstream/master' into remove_thrall
2015-08-03 16:37:06 -04:00
4cefd114c5
Shadowling update 3
2015-08-03 16:35:42 -04:00
667d5e75c3
Transferred body eggs to new organs system
2015-08-03 23:24:17 +03:00
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
aeea711c87
Merge pull request #10978 from Summoners/fixingthehiss
...
A stupid lazy fix but a needed fix.
2015-08-03 17:13:44 +01:00
9f005534ae
Fixes implant action buttons.
...
Turns action buttons off for morphs.
2015-08-03 16:56:58 +02:00
5434bb7854
Merge pull request #10970 from phil235/SyringeProjShieldBlockFix
...
Projectile blocking fixes
2015-08-03 05:28:28 +01:00
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
Swag McYolosteinen