Commit Graph

638 Commits

Author SHA1 Message Date
Poojawa 1f1f951924 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-06-03 05:35:52 -05:00
Ghommie cc334b9a57 honestly if they don't wear a gas mask, they do deserve the stunlock...
But ok.
2019-05-28 00:43:54 +02:00
Ghommie b5c4a44f01 pepper spray & teargas de-dunked. 2019-05-28 00:30:55 +02:00
Poojawa 971ddef989 reverts forensics components. If I can't figure it out, MURDER IT 2019-05-22 04:10:29 -05:00
Poojawa f6f4c946e6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-22 00:08:13 -05:00
deathride58 4a17f192e8 Merge pull request #8201 from Citadel-Station-13/kevinz000-patch-19
Changes OD thresholds to match RP server and only trigger when you /exceed/ it per definition of threshold
2019-05-21 08:05:54 -04:00
deathride58 276a6e9896 Merge pull request #8307 from Citadel-Station-13/kevinz000-patch-49
buff sleepy pens to quickly drain stamina after 10 seconds
2019-05-17 00:54:17 -04:00
Poojawa 0f6677b956 Blood colors happens to footprints now.
Different prints not working. splatter effect not working, I'm just sick of looking at this right now.
2019-05-16 08:23:53 -05:00
Poojawa 1a047c0068 I think I got it.
Also gibs should be better too.
2019-05-12 04:06:35 -05:00
Poojawa fcdc748bf1 u h g. I hate this 2019-05-10 07:07:09 -05:00
Poojawa 5ad532f723 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-09 03:08:54 -05:00
Poojawa 5a67114d33 get blood id is my foe now. 2019-05-08 04:53:51 -05:00
kevinz000 1e40a65536 buff this a bit 2019-05-08 01:31:00 -07:00
kevinz000 55d54592d5 Update toxin_reagents.dm 2019-05-08 01:30:24 -07:00
Poojawa 69eca2ae4b progress, just need to fiddle with footprints again 2019-05-07 13:23:49 -05:00
Poojawa d14943d4b0 well we have footprints now, xenoblood back to blood subtype. 2019-05-07 05:29:45 -05:00
deathride58 24cfef7329 Merge pull request #8299 from Citadel-Station-13/kevinz000-patch-48
disables skewium due to severe code issues
2019-05-06 22:08:16 -04:00
Poojawa 105b40a4f8 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-06 02:53:42 -05:00
BurgerLua 1557c33008 Adds Penis Enlargement Pills 2019-05-02 14:55:04 -07:00
kevinz000 6e7e385de0 Update toxin_reagents.dm 2019-04-29 04:00:06 -07:00
kevinz000 e9ce738879 Update toxin_reagents.dm 2019-04-28 03:44:01 -07:00
BurgerLua fd19d67cc2 "Improves" how slurring works, and adjusts how fast you recover from slurring. 2019-04-25 11:57:02 -07:00
Poojawa f58cc09aed Some slight fixes 2019-04-16 08:53:19 -05:00
Poojawa b3e894dcbb oh god oh fuck oh god it's snowballing 2019-04-16 07:40:37 -05:00
Poojawa a772f532c3 Synthetic and RNG blood 2019-04-16 04:28:04 -05:00
Poojawa 5f1db72ba3 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-04-13 02:47:34 -05:00
Trilbyspaceclone 690183b14f Update chem_dispenser.dm 2019-04-11 16:08:42 -04:00
Trilbyspaceclone be6dbd415e Update chem_dispenser.dm 2019-04-11 15:07:45 -04:00
Poojawa 03a174d21f compile fixes except we're memes still
why yes, I'm making the bloods all subtypes of each other at this point. I should probably change the way stuff is colored. but, meh. effort.
2019-04-07 08:54:05 -05:00
kevinz000 b291a927f7 Merge pull request #8209 from Trilbyspaceclone/anitrad
Addtion ways to deal with radiation
2019-04-06 19:14:46 -07:00
Poojawa 60920fb449 Synthetics blood and greyscale blood effects 2019-04-06 20:05:10 -05:00
deathride58 70ace01312 Merge pull request #8211 from Poojawa/hypo-belts
Medical belt overlays + hypo storage
2019-04-05 20:13:55 -04:00
kevinz000 b287362f99 Merge pull request #8191 from Trilbyspaceclone/patch-92
Makes chem dispenders upgradable once again!
2019-04-05 08:07:46 -07:00
Poojawa d8312ec5ae Medical belt overlays + hypo storage 2019-04-04 18:38:34 -05:00
Trilbyspaceclone b096e2f4cf Hmm cat brain fails 2019-04-04 16:27:21 -04:00
Trilbyspaceclone 0bf8d345e2 Update pill.dm 2019-04-04 15:52:46 -04:00
Trilbyspaceclone abf3cde518 Update medicine_reagents.dm 2019-04-04 15:20:00 -04:00
Trilbyspaceclone d4b9c06dd2 Update pill.dm 2019-04-04 14:59:23 -04:00
Trilbyspaceclone a1c8155ec8 Update chem_dispenser.dm 2019-04-02 15:42:18 -04:00
kevinz000 e16b632d6f Update holder.dm 2019-04-02 04:03:00 -07:00
Trilbyspaceclone de7398b1ed Update chem_dispenser.dm 2019-03-31 23:48:10 -04:00
deathride58 684d6cf074 Merge pull request #8149 from Ragolution/fixes-the-cum
Fixes Semen Vent Foam
2019-03-31 21:25:28 -04:00
Trilbyspaceclone 1b1786800a Update chem_dispenser.dm 2019-03-31 20:29:07 -04:00
Trilbyspaceclone 5883b53a87 Update chem_dispenser.dm 2019-03-31 19:33:13 -04:00
Trilbyspaceclone b108505629 Update chem_dispenser.dm 2019-03-31 19:28:40 -04:00
kevinz000 e9558d1b17 Update pyrotechnics.dm 2019-03-23 12:38:23 -07:00
kevinz000 3175bf1db9 Update pyrotechnics.dm 2019-03-23 12:37:03 -07:00
Ragolution ee9368cadb why does ghomme help us
is it because he feels bad for us
real deepthink
2019-03-20 20:08:07 -04:00
Trilbyspaceclone 4699d83801 the icons damn it! 2019-03-18 20:24:57 -04:00
Trilbyspaceclone c321e44319 Update drink_reagents.dm 2019-03-18 20:20:24 -04:00