shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,326 Commits 5 Branches 0 Tags
dca90db321f828d5987c258ea7b91fa26588b549
Commit Graph

14633 Commits

Author SHA1 Message Date
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
kevinz000
d64e5b29fd Update reactions.dm 2019-08-25 15:59:45 -07: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
deathride58
ea9eaedf1a Ports BeeStation/BeeStation-Hornet#345 2019-08-21 22:16:44 -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
kevinz000
ba2a6d6626 Merge pull request #9145 from Trilbyspaceclone/patch-212 
gives drones a RPD
 2019-08-21 08:15:08 -07:00
kevinz000
7fe2d2b5f2 Merge pull request #9142 from Trilbyspaceclone/patch-211 
removes glue from nukies/clownops uplinks
 2019-08-21 08:11:44 -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
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
Sishen
7a8e2c3f50 rebalances the lawyer heirloom briefcase while giving it a fancy new sprite 2019-08-19 17:54:16 -04:00
Trilbyspaceclone
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
BlackMajor
dbe50db261 Merge pull request #8349 from Trilbyspaceclone/patch-124 
Removes Nitryl bounty but adds 7 more in!
 2019-08-19 20:07:40 +12:00
kevinz000
3f734d9aca Merge pull request #8763 from Trilbyspaceclone/patch-188 
Reblances bone satchles
 2019-08-18 23:39:39 -07:00
kevinz000
47dd8d22eb Merge pull request #9149 from Trilbyspaceclone/padding_and_such 
Adds Tatical armor to IAA/Synda uplinks as well as some armor accessorys
 2019-08-18 23:37:56 -07:00
kevinz000
3ef29bbbeb Merge pull request #9097 from lolman360/durathread 
Adds durathread.
 2019-08-18 23:37:07 -07:00
kevinz000
8a96b29ef9 Merge pull request #9137 from Sishen1542/the-d-boiz 
addition of the "assistant response team" a pack of assistants sent in from CComm
 2019-08-18 23:34:49 -07:00
kevinz000
558ea557f8 Merge pull request #9151 from Trilbyspaceclone/cloak 
Adds chameloen necktie item
 2019-08-18 23:34:03 -07:00
kevinz000
ec349ae347 Merge pull request #9134 from Arturlang/Nanite-sloime-heals 
Nanite Adv toxin healing now heals slimes
 2019-08-18 23:33:02 -07:00
kevinz000
f55682d6dd Merge pull request #9136 from Sishen1542/strained 
strained muscles now costs chems to use, slows chem regen, and drains stacking stamina over time
 2019-08-18 23:32:47 -07:00
kevinz000
86cfd8a561 Merge pull request #9141 from deathride58/removwarpwissle 
Actually fixes warp whistle runtimes
 2019-08-18 23:32:15 -07:00
lolman360
323073f8d4 Merge pull request #6 from Trilbyspaceclone/patch-213 
Patch 213
 2019-08-19 11:12:50 +10:00
Poojawa
7fef33160d sure I guess 2019-08-18 15:25:48 -05:00
TrilbySpaceClone
e1cee15720 seed 2019-08-18 01:40:36 -04:00
TrilbySpaceClone
566a4e65a1 right crafting 2019-08-18 01:31:38 -04:00
Trilbyspaceclone
8214a7012f I Didnt save the two corrections 2019-08-18 01:17:34 -04:00
Trilbyspaceclone
fc6633071a rwar! 2019-08-18 01:07:38 -04:00
TrilbySpaceClone
4dae36869c tada 2019-08-18 01:01:00 -04:00
TrilbySpaceClone
2b08b97f1d yay 2019-08-17 23:54:50 -04: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
Trilbyspaceclone
43b1d0405e Update flowers.dm 2019-08-17 23:25:38 -04:00
Trilbyspaceclone
bb9aa4f039 I woulder how much this will fuck everthing up 2019-08-17 22:49:06 -04:00
Trilbyspaceclone
cfd8217947 Update flowers.dm 2019-08-17 22:10:23 -04:00
TrilbySpaceClone
e69d27f9eb Traitor armor 2019-08-17 20:36:47 -04:00
Poojawa
2eac1b6ca2 Everything's working again, for now. 2019-08-17 08:04:18 -05:00
Poojawa
5746126794 since it conflicted there, let's just fix it here 2019-08-17 05:43:24 -05:00
Poojawa
2d40733ff7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-17 05:43:05 -05:00
Poojawa
725a8046e1 just need items to actually have their overlays, ree 2019-08-17 04:50:24 -05:00