kevinz000
7843e070ff
Update mob.dm
2019-09-08 12:13:24 -07:00
Fermi
018ebc32ae
All that remains is MK testing.
2019-09-08 02:46:43 +01:00
chefferz
d21a45cd53
Doubles stamina regen when laying down/standing
...
Does as named
2019-09-07 20:07:19 -04:00
Trilbyspaceclone
8c05b4a1d8
*poor cleanbot*
2019-09-06 19:20:32 -04:00
Trilbyspaceclone
3c38e6eb3d
Update cleanbot.dm
2019-09-06 18:49:42 -04:00
BlackMajor
3e5a192af0
Updates borg examine to also show what module type they are.
2019-09-06 13:31:01 +12:00
BlackMajor
cca2001ccb
Fixes dogborgs not using their deadsprite
2019-09-06 12:29:36 +12:00
BlackMajor
fbc2d3c8fe
Ports dogborg sprites from RP to main
...
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
2019-09-06 01:23:53 +12:00
Fermi
7890ad08d5
what is this
2019-09-03 20:30:21 +01:00
nik707
dd7907c3d7
Merge pull request #9057 from EgoSumStultus/male-AI-vox
...
Adds the Male AI vox voice.
2019-09-02 18:27:03 -05:00
nik707
e943cf0ae8
Merge pull request #9219 from Trilbyspaceclone/patch-219
...
Ports "Fixes slimes not feeding #44760 "
2019-08-31 02:09:15 -05:00
Trilbyspaceclone
9c9e1b1da3
Update life.dm
2019-08-30 09:24:58 -04:00
Poojawa
6b5388951f
Ohwait let's not return on a normal process. :^)
2019-08-30 03:16:18 -05:00
Poojawa
2849f82d0b
let's be sure people don't have negative bleeding, because that would be weird as fuck.
2019-08-30 03:15:46 -05:00
kevinz000
931527ff7c
Update mob.dm
2019-08-29 22:54:41 -07:00
Poojawa
dca90db321
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-29 23:03:26 -05:00
nik707
36a07f134b
Merge pull request #9208 from Ghommie/Ghommie-cit190
...
Socks uncolorability fix.
2019-08-29 19:28:01 -05:00
nik707
2f7402f591
Merge pull request #9184 from Ghommie/Ghommie-cit188
...
Removes an obnoxious temporary overlay var.
2019-08-29 18:19:44 -05:00
kevinz000
bea4349056
Merge pull request #9180 from deathride58/buffspoly
...
grants poly the ability to automatically speak through the TGS relay (with a 0.01% chance)
2019-08-27 20:50:59 -07:00
Ghommie
0ffeb704af
Socks color fix.
2019-08-28 05:33:36 +02:00
BlackMajor
4d6b9f5da1
Merge pull request #8537 from Ghommie/Ghommie-cit28
...
Fixes emags wasting charges on un-emaggable stuff.
2019-08-28 13:54:03 +12:00
Poojawa
5b4347c5ab
Initial commit.
...
needs to be added alongside all med_hud_set_status and tested to even fukkin' work.
2019-08-27 04:30:31 -05:00
Poojawa
fd16520ac0
buffs toxinlover blood deletion penalty
2019-08-27 02:42:45 -05:00
kevinz000
f07cdc0665
Merge pull request #9177 from JTGSZ/fix
...
Fixes gang bosses being able to be deconverted with headbeatings, Adds 1 more boss slot
2019-08-26 19:42:15 -07:00
Poojawa
bd49187ea7
on second thought, let's not try to half ass fancy ideas.
2019-08-26 14:45:36 -05:00
Poojawa
9558252b93
Revert/replaces a lot of #8024 with bleed_rate
...
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood. Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
2019-08-26 14:22:17 -05:00
Poojawa
d7ec568efc
Allows xeno weeds to regenerate lost blood
...
Honestly this should have been a thing since forever ago but whatever.
2019-08-26 09:08:00 -05:00
Linzolle
3e782795dd
get up
2019-08-25 13:14:57 -05:00
Poojawa
1ba9d374fe
whatever, I guess
2019-08-25 01:19:16 -05:00
Linzolle
955fafee11
make it Work
2019-08-24 23:22:02 -05:00
Linzolle
14ba00d477
shakes my head
2019-08-24 22:21:46 -05:00
Linzolle
9651ae45b1
love to work with merge conflicts
2019-08-24 20:27:47 -05:00
Rob Bailey
5e94a5db80
ports #44155 from /tg/station
2019-08-24 20:21:44 -05:00
Ghommie
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
Ghommie
5d1cac62da
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-08-24 13:50:22 +02:00
Poojawa
d60ba0a207
Fixes missing DNA info for slimes, resolves virology issues
2019-08-24 04:14:47 -05:00
Ghommie
2ce01b3bda
Removes an obnoxious temporary overlay var.
2019-08-23 19:57:57 +02:00
Linzolle
62a51d8df5
infinite sword exploit
2019-08-23 01:25:46 -05:00
Linzolle
7a481f4354
TABS
2019-08-23 01:08:53 -05:00
deathride58
9a32d437a5
grants poly the ability to speak through the TGS relay (with a 0.01% chance)
2019-08-22 20:33:12 -04:00
JTGSZ
e6dbaf8473
this should work
2019-08-22 13:02:01 -04:00
kevinz000
25a7d3af51
Merge pull request #8968 from Trilbyspaceclone/patch-199
...
Fixes dead/used face huggers from still infecting
2019-08-21 08:16:06 -07:00
Poojawa
b29607c019
It's working again, I guess. wtf
2019-08-21 01:36:59 -05:00
Poojawa
23333f6ea5
reverts the majority of clean act because it doesn't work properly otherwise
2019-08-20 23:03:31 -05:00
Poojawa
bda3ac8745
blood dna is fixed, your ERP code is too
2019-08-20 07:41:50 -05:00
Poojawa
96834bc517
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-20 03:36:17 -05:00
Poojawa
cede93299e
REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
2019-08-19 04:48:37 -05:00
Poojawa
9cbd8af5b9
Updates colors, fixes alignment issues.
2019-08-18 14:38:10 -05:00
Poojawa
2922f08ef6
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-17 23:41:28 -05:00
BlackMajor
13f27c040e
Merge pull request #8848 from Citadel-Station-13/trait_blacklisting
...
Trait blacklisting system: Blacklists Mute and Brain Tumor from ALL heads of staff. Blacklists pacifist + paraplegic from HoS. Blacklists Paraplegic/nolegs from CE. Blacklists phanosthing/no-recognize-faces from HoP
2019-08-18 15:33:08 +12:00
