LetterJay
8aebc3b15a
Merge pull request #3364 from Citadel-Station-13/upstream-merge-30909
...
[MIRROR] Radiation rework and subsystem
2017-10-13 23:58:04 -04:00
LetterJay
e18e99f56f
Merge pull request #3361 from Citadel-Station-13/upstream-merge-31614
...
[MIRROR] Fixes electrocution animation
2017-10-13 23:37:46 -04:00
LetterJay
14dc8a5a35
Update life.dm
2017-10-13 12:30:35 -05:00
LetterJay
2d66ab4171
Update life.dm
2017-10-13 10:26:25 -05:00
Emmett Gaines
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
kevinz000
c84a270403
Fixes preferences generation ( #31607 )
2017-10-13 09:16:03 -05:00
Jordan Brown
1941a8fcfa
Merge pull request #31614 from AnturK/zap
...
Fixes electrocution animation
2017-10-13 09:14:45 -05:00
LetterJay
301dbad665
Update life.dm
2017-10-12 02:58:02 -05:00
duncathan salt
c0e9cde5c2
Minor refactor of how gas IDs are handled
2017-10-12 00:30:09 -05:00
LetterJay
74fbde6801
Merge pull request #3284 from Citadel-Station-13/upstream-merge-31495
...
[MIRROR] Diseases will now cure if species is changed
2017-10-10 22:29:58 -04:00
MoreRobustThanYou
bc318af840
Diseases will now cure if species is changed ( #31495 )
...
* Diseases will now cure if species is changed
* Update _disease.dm
* Update _disease.dm
* Update species.dm
2017-10-10 12:41:42 -05:00
AnturK
e880545425
Fixes emote runtimes ( #31498 )
...
* Emote runtime
* Bleh didn't add all
2017-10-10 08:42:30 -05:00
LetterJay
b7c65c7482
Merge pull request #3274 from Citadel-Station-13/upstream-merge-31492
...
[MIRROR] Fixes xeno mass confusion
2017-10-10 05:55:38 -04:00
oranges
429543f4ae
Merge pull request #31492 from ShizCalev/sometimes-i-drink-a-glass-of-water-just-to-suprise-my-liver
...
Fixes xeno mass confusion
2017-10-10 03:22:03 -05:00
oranges
5d3a805d30
Merge pull request #31416 from Armhulen/patch-2
...
Clockwork Golems will not slip on glass
2017-10-10 03:14:01 -05:00
XDTM
7a0ce217db
Refactors virus spreading
2017-10-09 08:55:57 -05:00
XDTM
a49441b1e2
Internals set to 0 pressure will prevent breathing environment air ( #31422 )
2017-10-08 19:09:34 -05:00
LetterJay
5e2deeff84
Merge pull request #3232 from Citadel-Station-13/upstream-merge-31411
...
[MIRROR] Dedicated equipment removal proc
2017-10-08 16:24:20 -04:00
LetterJay
f046f4f15b
Merge pull request #3225 from Citadel-Station-13/upstream-merge-31413
...
[MIRROR] Removes useless commented-out what-if code from the 1970s
2017-10-08 16:22:10 -04:00
LetterJay
4c408f4541
Update give.dm
2017-10-08 14:55:37 -05:00
AnturK
3f975a63b7
Dedicated equipment removal proc ( #31411 )
...
* Dedicated equipment removal proc
* department of redundancy department
* Whitespace makes me angry
2017-10-08 13:18:12 -05:00
Jordan Brown
58fd7f2067
Merge pull request #31413 from vuonojenmustaturska/codejanitoring
...
Removes useless commented-out what-if code from the 1970s
2017-10-08 10:00:34 -05:00
Jordan Brown
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
oranges
5a390937ae
Fix spelling of conscious
2017-10-06 01:34:33 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
ShizCalev
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
ShizCalev
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
Leo
c03513b65d
Merge pull request #31256 from ShizCalev/zombie-toxin
...
Zombies regen toxin damage
2017-10-04 06:14:57 -05:00
LetterJay
0515d2b754
Merge pull request #3110 from Citadel-Station-13/upstream-merge-31034
...
[MIRROR] Nightmare organs
2017-10-04 02:14:22 -04:00
John
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
LetterJay
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
LetterJay
1c199d426b
Merge branch 'master' into upstream-merge-31034
2017-10-03 20:15:07 -04:00
LetterJay
befcfd1f06
Merge pull request #3095 from Citadel-Station-13/upstream-merge-31202
...
[MIRROR] Organ initialization cleanup
2017-10-03 20:10:08 -04:00
LetterJay
dc9b438bd8
Update skeletons.dm
2017-10-03 18:47:01 -05:00
Armhulen
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
KorPhaeron
037ea0ce13
Nightmare organs
2017-10-03 18:22:01 -05:00
KorPhaeron
159835db24
Fixes humans having no examine feedback for soft crit ( #31247 )
...
* Soft crit examine
* Concise
2017-10-03 15:30:57 -05:00
LetterJay
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
AnturK
fd5acc5573
Organ initialization cleanup
2017-10-03 14:18:39 -05:00
John
42cfb61f42
Edited regen
...
Made it proper
2017-10-03 01:55:50 -05:00
John
221404bffb
cleaned up some things
2017-10-03 01:42:18 -05:00
KorPhaeron
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
Daniel0Mclovin
d4321ac0b5
Accidentally put a comma
2017-10-01 17:26:45 -05:00
Daniel0Mclovin
2d835e1d73
Nerfed overall healing
...
dialed down to 0.7
2017-10-01 17:25:20 -05:00
Daniel0Mclovin
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
LetterJay
e572d2e529
Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
...
[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
Leo
fd7c9110ca
Structure istype define
2017-09-30 21:31:57 -05:00
LetterJay
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
