deathride58
|
8f168727c5
|
Merge pull request #8730 from Ghommie/Ghommie-cit80
Port in alt click to eject beaker and swapping beakers for chem machines, grinder radial menu.
|
2019-06-28 00:52:59 -04:00 |
|
kevinz000
|
f7dcedce5f
|
Merge pull request #8715 from Sishen1542/toxinmanbad
Pentetic Jelly, the chem we all needed. Anatomic panacea not deadly for slimes! Also, medbeam buff?
|
2019-06-23 06:57:09 -07:00 |
|
kevinz000
|
c9d67ecd49
|
Merge pull request #8667 from Ghommie/Ghommie-cit61
Ports the system for randomized semi-persistent chem reactions.
|
2019-06-23 06:54:43 -07:00 |
|
kevinz000
|
2b50f355d7
|
Merge pull request #8666 from Ghommie/Ghommie-cit60
Fixes roffle waffle, mushroom hallucinogen and some invalid reagents.
|
2019-06-23 06:54:05 -07:00 |
|
kevinz000
|
dcab96d9d5
|
Merge pull request #8721 from Ghommie/Ghommie-cit77
Ports in "Liver removal/failure now also stops passive reagent effects"
|
2019-06-23 06:53:30 -07:00 |
|
Ghommie
|
c01499b5a0
|
Ports in radials for reagent grinders, alt click to eject beaker and beaker swapping.
|
2019-06-23 04:32:39 +02:00 |
|
Sishen
|
2276f65c02
|
holy shit it actually works
|
2019-06-22 14:27:08 -04:00 |
|
Ghommie
|
d50afb9275
|
frickkkkeroni pepperoni garlic.
|
2019-06-22 17:58:42 +02:00 |
|
Ghommie
|
45109776e1
|
Ports in "Liver removal/failure now also stops passive reagent effects"
|
2019-06-22 17:05:08 +02:00 |
|
Sishen
|
94b8b33efa
|
Update medicine_reagents.dm
|
2019-06-22 00:41:52 -04:00 |
|
Sishen
|
0a43036eae
|
hugboxing slimepeople one thing at a time
|
2019-06-21 20:01:19 -04:00 |
|
Fermi
|
fec1df2098
|
Rephrasal for understanding.
|
2019-06-19 00:52:45 +01:00 |
|
Thalpy
|
1cc0724519
|
Merge branch 'master' into Dwarf
|
2019-06-17 12:09:55 +01:00 |
|
Ghommie
|
50dd512be7
|
Ports system for randomized semi-persistent chem reactions.
|
2019-06-17 10:50:40 +02:00 |
|
Ghommie
|
1c93c43e20
|
Fixes roffle waffle, mushroom halluginogen and some invalid reagent.
|
2019-06-17 09:16:45 +02:00 |
|
kevinz000
|
67a00c9141
|
Merge pull request #8614 from Ghommie/Ghommie-cit44
Portin "Fix chem dispensers starting with an extra power cell"
|
2019-06-16 19:31:08 -07:00 |
|
Fermi
|
17403bd059
|
Non-functioning EMP code for review (revert before merging.)
|
2019-06-13 00:58:54 +01:00 |
|
Ghommie
|
a7bbfe46ac
|
Fix chem dispensers starting with an extra power cell
|
2019-06-10 14:55:17 +02:00 |
|
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 |
|
Thalpy
|
84c3c104cd
|
Pointed out that a message could be misinterpreted as lewd.
|
2019-06-08 06:32:12 +01: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 |
|
Fermi
|
42d0ab4825
|
Comment cleanup.
|
2019-06-08 01:31:21 +01:00 |
|
Fermi
|
c6c98b539d
|
Minor bug fix.
|
2019-06-08 01:22:43 +01: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 |
|
Fermi
|
fd22dbfc0d
|
More fixes. Need to check over merging math.
|
2019-06-02 03:59:52 +01:00 |
|
Fermi
|
0fa445c153
|
Fixes and test.
|
2019-06-02 03:24:01 +01:00 |
|
Fermi
|
3cf3268c76
|
New non-harmful medicinal darts.
|
2019-06-01 22:52:03 +01: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 |
|