Commit Graph
23329 Commits
Author SHA1 Message Date
Poojawa b2252a1c74 Medical assistance treats bleed_rate to stop phantom bleeding 2019-08-30 02:46:57 -05:00
Poojawa dae3e91293 MIGHT HELP IF SYNTHETICS EXISTED, WHOOPS 2019-08-30 00:07:06 -05:00
Poojawa 583cf3d2ed Maps in Blood generators 2019-08-29 23:15:44 -05:00
Poojawa dca90db321 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-29 23:03:26 -05:00
Poojawa a0412933c0 Blood Generator QOL, put in hands, select slot to add bloodbag to 2019-08-29 23:02:41 -05:00
Poojawa fd16520ac0 buffs toxinlover blood deletion penalty 2019-08-27 02:42:45 -05:00
Poojawa bd49187ea7 on second thought, let's not try to half ass fancy ideas. 2019-08-26 14:45:36 -05:00
Poojawa 74a24fdcc1 WHAT IN TARNATION 2019-08-26 14:30:27 -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 bdae9e051b Fixes some errant issues with overlays 2019-08-26 14:15:55 -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
deathride58andGitHub 3a31785dee Merge pull request #9196 from Citadel-Station-13/kevinz000-patch-78
sishen broke master (or i did by not doing my job right)
2019-08-25 19:51:00 -04:00
kevinz000andGitHub d64e5b29fd Update reactions.dm 2019-08-25 15:59:45 -07:00
deathride58andGitHub 89f8578a35 Merge pull request #9195 from Sishen1542/bzoinks
[s] fixes BZ research exploit
2019-08-25 18:58:19 -04:00
Sishen b093439c73 aaaaaaaa 2019-08-25 16:27:02 -04:00
Poojawa d60ba0a207 Fixes missing DNA info for slimes, resolves virology issues 2019-08-24 04:14:47 -05:00
kevinz000andGitHub 62e931c62d Merge pull request #9174 from deathride58/fuckprinters
[S] fixes major href exploit
2019-08-22 03:11:10 -07:00
deathride58 ea9eaedf1a Ports BeeStation/BeeStation-Hornet#345 2019-08-21 22:16:44 -04:00
CitadelStationBot 8195fb84d3 Automatic changelog generation for PR #9164 [ci skip] 2019-08-21 10:17:41 -05:00
deathride58andGitHub fc2fdf71ca Merge pull request #9164 from lolman360/sprites
lolman fucks up his first pr
2019-08-21 11:17:39 -04:00
CitadelStationBot b8615e8659 Automatic changelog generation for PR #8968 [ci skip] 2019-08-21 10:16:08 -05:00
kevinz000andGitHub 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
CitadelStationBot 8bec3bc705 Automatic changelog generation for PR #9145 [ci skip] 2019-08-21 10:15:11 -05:00
kevinz000andGitHub ba2a6d6626 Merge pull request #9145 from Trilbyspaceclone/patch-212
gives drones a RPD
2019-08-21 08:15:08 -07:00
CitadelStationBot 4cf684b5d4 Automatic changelog generation for PR #9142 [ci skip] 2019-08-21 10:11:46 -05:00
kevinz000andGitHub 7fe2d2b5f2 Merge pull request #9142 from Trilbyspaceclone/patch-211
removes glue from nukies/clownops uplinks
2019-08-21 08:11:44 -07:00
CitadelStationBot 861bd2a53d Automatic changelog generation for PR #9155 [ci skip] 2019-08-21 10:10:25 -05:00
kevinz000andGitHub 1e76941160 Merge pull request #9155 from Poojawa/Poly-bot-lite
Enables Poly phrases on tgs commands
2019-08-21 08:10:23 -07:00
Poojawa 32c7a7c3ee Virology's broken as fuck, damnifino why 2019-08-21 03:36:40 -05:00
Poojawa b29607c019 It's working again, I guess. wtf 2019-08-21 01:36:59 -05:00
CitadelStationBot 2617f4f4a3 Automatic changelog generation for PR #9162 [ci skip] 2019-08-21 00:04:00 -05:00
kevinz000andGitHub bfe7854992 Merge pull request #9162 from Sishen1542/beefcase
heirloom briefcase resprite & rebalance
2019-08-20 22:03:58 -07: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 518eeb9dbe fixes tgui I guess lol 2019-08-19 21:11:36 -05:00
lolman360andGitHub 8811164b0a ssssssEEEEEEEEEEEEEEEE 2019-08-20 10:20:31 +10:00
lolman360andGitHub c586ef56bc SLEEP BAD 2019-08-20 10:15:20 +10:00
lolman360andGitHub a83dea7bd0 eeeeeeeeeeeeeeeeepic 2019-08-20 10:01:53 +10:00
lolman360andGitHub 9cf17372a9 digi ones left 2019-08-20 09:58:49 +10:00
lolman360andGitHub ceddd83e63 ddddddddd 2019-08-20 09:55:16 +10:00
lolman360andGitHub 846d70fe27 eeeeeeeeeeee 2019-08-20 09:48:58 +10:00
lolman360andGitHub 5f00cc61b8 GMER 2019-08-20 09:46:03 +10:00
lolman360andGitHub 7ce942e69a actual retard 2019-08-20 09:32:01 +10:00
lolman360andGitHub f78fc3ea65 AAAAAAAAAAAAAAAAAAAAAAA 2019-08-20 09:15:10 +10:00
Sishen 7a8e2c3f50 rebalances the lawyer heirloom briefcase while giving it a fancy new sprite 2019-08-19 17:54:16 -04:00
TrilbyspacecloneandGitHub d1404a84d8 Update backpack.dm 2019-08-19 07:03:54 -04:00
Poojawa cede93299e REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE 2019-08-19 04:48:37 -05:00
Poojawa 213b01b969 fixes the IV dripper memes, better formatting too 2019-08-19 04:33:40 -05:00
CitadelStationBot 4a741d4938 Automatic changelog generation for PR #8349 [ci skip] 2019-08-19 03:07:44 -05:00