3fdc29ba42
Merge pull request #3134 from Citadel-Station-13/upstream-merge-31283
...
[MIRROR] Fixes shaking people up while buckled into a bed/resin nest
2017-10-04 18:45:09 -04:00
ecf44ff651
Merge pull request #3131 from Citadel-Station-13/upstream-merge-31150
...
[MIRROR] Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower
2017-10-04 18:44:21 -04:00
8c77408bb1
Merge pull request #3114 from Daniel0Mclovin/patch-2
...
Rebalanced pod people so they arnt as weak.
2017-10-04 18:42:02 -04:00
929c737dfe
Fixes shaking people up while buckled into a bed/resin nest ( #31283 )
...
* Fixes shaking people up when buckled into bed
* CB
2017-10-04 17:01:27 -05:00
4d23dd56b8
Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower ( #31150 )
...
* Hides ninja socks, draining updated to DisplayPower
* CB
* KEEP_TOGETHER
2017-10-04 16:29:30 -05:00
c03513b65d
Merge pull request #31256 from ShizCalev/zombie-toxin
...
Zombies regen toxin damage
2017-10-04 06:14:57 -05:00
0515d2b754
Merge pull request #3110 from Citadel-Station-13/upstream-merge-31034
...
[MIRROR] Nightmare organs
2017-10-04 02:14:22 -04:00
315967bd15
Rebalanced pod people so they arnt as weak.
...
This will allow podpeople to regen at a steady pace without them being able to take tool boxes to the head like candy. it takes around 15 seconds to notably heal compared to the 40 it does just for a little bit and the 3 from before it was nerfed. The fact that podpeople need to go to the medbay to fix burn damage made me decide to make their brute regen stronger, not to mention that a single welder smach gives 18.75 damage and a shot to the leg with a laser carbine does 25 burn damage.
2017-10-03 23:10:50 -05:00
454fb160a8
Merge pull request #3112 from Citadel-Station-13/upstream-merge-31188
...
[MIRROR] Gives nightmares a random shadowling name
2017-10-03 20:15:31 -04:00
1c199d426b
Merge branch 'master' into upstream-merge-31034
2017-10-03 20:15:07 -04:00
befcfd1f06
Merge pull request #3095 from Citadel-Station-13/upstream-merge-31202
...
[MIRROR] Organ initialization cleanup
2017-10-03 20:10:08 -04:00
dc9b438bd8
Update skeletons.dm
2017-10-03 18:47:01 -05:00
65a73bcefa
Gives nightmares a random shadowling name ( #31188 )
...
* fuck you ruined my !ONE COMMIT PR!
* !ONE COMMIT PR!
2017-10-03 18:41:37 -05:00
037ea0ce13
Nightmare organs
2017-10-03 18:22:01 -05:00
159835db24
Fixes humans having no examine feedback for soft crit ( #31247 )
...
* Soft crit examine
* Concise
2017-10-03 15:30:57 -05:00
05f5ee73ce
Merge pull request #2922 from Daniel0Mclovin/Kris's-Garbage
...
Podpeople available as roundstart ft. minor stat changes
2017-10-03 15:22:43 -04:00
fd5acc5573
Organ initialization cleanup
2017-10-03 14:18:39 -05:00
42cfb61f42
Edited regen
...
Made it proper
2017-10-03 01:55:50 -05:00
221404bffb
cleaned up some things
2017-10-03 01:42:18 -05:00
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
d4321ac0b5
Accidentally put a comma
2017-10-01 17:26:45 -05:00
2d835e1d73
Nerfed overall healing
...
dialed down to 0.7
2017-10-01 17:25:20 -05:00
d3ae434b56
Changed a few stats
...
Darkness now does oxy damage and slight toxin, added a bit more heat mod, no longer heals toxin damage, oxygen loss healing nerfed. Can eat in the dark to try to combat starvation, added slight toxin damage to make it harder to stay in the dark with a shit ton of food.
2017-10-01 17:20:44 -05:00
e572d2e529
Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
...
[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
fd7c9110ca
Structure istype define
2017-09-30 21:31:57 -05:00
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
063a44281e
Merge branch 'master' into upstream-merge-31044
2017-09-30 14:53:08 -04:00
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
d7db5f23cb
Update humanoid.dm
2017-09-30 02:13:33 -05:00
e63f93979f
Merge pull request #2979 from Citadel-Station-13/upstream-merge-30572
...
[MIRROR] Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow
2017-09-30 02:41:38 -04:00
8048ce1842
Update humanoid.dm
2017-09-30 01:37:32 -05:00
75359598b3
Merge pull request #2988 from Citadel-Station-13/upstream-merge-31060
...
[MIRROR] Fixes larva evolving while restrained
2017-09-29 01:43:07 -04:00
9da41c3596
Stops revheads from being metagamed with healthscanners & medical HUDs. ( #31110 )
...
* Stops revheads metagaming
* Added comment.
2017-09-28 22:00:16 -05:00
a780d6f79e
Fixes larva evolving while restrained ( #31060 )
2017-09-28 21:46:43 -05:00
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
7054cf01ea
changed a few 1's to TRUE's, removed food prefs
2017-09-28 20:02:17 -05:00
9b5a2f7490
Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow
2017-09-28 16:02:31 -05:00
2d48a0cf50
[MIRROR] Makes borg modules and human species easily spawnable by admins from the mob spawn menu. ( #2967 )
...
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
2017-09-28 05:59:57 -07:00
a8043202c2
Update golems.dm
2017-09-27 22:43:57 -05:00
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
18545eb41c
Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893
...
[MIRROR] Datum abductors refactor
2017-09-27 16:31:53 -04:00
193d929e4b
Clockwork cult rework: Post-merge micro-patch
2017-09-26 19:59:41 -05:00
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
4bab4181f2
Fixes alium leap exploit
2017-09-26 13:54:26 -05:00
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
34e186dadb
Datum abductors refactor
2017-09-24 18:00:49 -05:00
fa9933a80b
Podpeople as roundstart
...
Essentially it allows podmen to be roundstart along with editing them so they take slightly more fire damage and more damage from plant-b-gone
2017-09-23 16:59:58 -05:00
894673ef97
Fixes revolutionary deconversion messages and logging
2017-09-23 11:07:05 -05:00
51d8182b13
[MIRROR] Fixes species being referenced instead of copied when cloning ( #2859 )
...
* Fixes species being referenced instead of copied when cloning
* fixes
* wew
2017-09-23 00:34:09 -05:00
2a860d1954
[MIRROR] More Initialize() fixes, requires someone to test with DB ( #2857 )
...
* More Initialize() fixes, requires someone to test with DB
* fucking mirror failure
2017-09-22 23:35:22 -05:00
LetterJay