shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,116 Commits 5 Branches 0 Tags
231da023ec9c073f1644172794de8ef2dc43017e
Commit Graph

629 Commits

Author SHA1 Message Date
kevinz000
2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35 
Ports in the container_type to reagents flags refactor.
 2019-06-08 01:26:28 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
deathride58
8bf5777844 Merge pull request #8474 from Citadel-Station-13/adrenal_nerf 
Adrenal rebalancing/nerfing. Again. And a very slight meth buff.
 2019-06-08 01:07:56 -04:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie
44358e054a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29 2019-06-06 15:24:31 +02:00
Ghommie
0e630680ba forgot to pull from upstream. One second. 2019-06-06 15:20:27 +02:00
kevinz000
8cd0b69b61 adrenals 2019-05-28 01:00:41 -07: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
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
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
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
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
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
kevinz000
b291a927f7 Merge pull request #8209 from Trilbyspaceclone/anitrad 
Addtion ways to deal with radiation
 2019-04-06 19:14:46 -07: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
Ghommie
27efffb74c 1 2019-03-10 15:28:05 +01:00
deathride58
5e6395270b Merge pull request #7889 from Citadel-Station-13/kevinz000-patch-7 
Reworks meth
 2019-03-08 21:05:20 -05:00
kevinz000
2bd991042c Merge pull request #8051 from deathride58/gitgudscrub 
Reduces the pixel variance of thrown objects by four pixels and attempts to fix bartender glasses tilting uncontrollably
 2019-03-01 02:27:55 -08:00
kevinz000
317dc309a0 Merge pull request #8024 from deathride58/bloodybloodbloodblood 
Atomizes the med rework's blood effect changes (most things that make a blood effect will now make you actually lose blood) and makes the blood reagent act more like you'd expect
 2019-02-27 16:03:56 -08:00
deathride58
a205177ff5 Reduces the pixel variance of thrown objects and tries to fix the bug where bartender glasses are rotated 2019-02-26 21:11:50 -05:00
kevinz000
046dc1e7dd Update drug_reagents.dm 2019-02-22 17:07:39 -08:00
deathride58
38ae805c49 Adds changeling blood tests (heat up blood samples to test if someone's a ling or not) (#8023) 
* changeling blood tests + changeling readapt sound

* drops shield loudness down to 1 because apparently it's weaker than i thought it was

* chameleon skin no longer contributes to loudness
 2019-02-22 06:05:23 -08:00
deathride58
20740bda39 a bloody fun time - atomizes the med rework's blood effect changes and makes the blood reagent act more like you'd expect 2019-02-20 00:38:23 -05:00
Fermi
2308913205 Replaced mutagen in reaction with stable_plasma 
Why does it take issue with indents every time?

Byond is very confusing.

Don't worry I made sure it compiles.
 2019-02-18 23:24:37 +00:00