shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,821 Commits 5 Branches 0 Tags
570fa0cd3b7d73300a4f59fe5b24d2e4affae69e
Commit Graph

674 Commits

Author SHA1 Message Date
kevinz000
6944725cfb Merge pull request #8824 from Ghommie/Ghommie-cit109 
Ports "Fixes damp rag not smothering people"
 2019-07-07 02:31:26 -07:00
Ghommie
3c2e03c247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58 2019-07-04 23:46:04 +02:00
Ghommie
37cf41a3bb Ports "Fixes damp rag not smothering people" 2019-07-04 22:06:16 +02:00
kevinz000
bce4ce31ab Merge pull request #8778 from Ghommie/Ghommie-cit97 
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
 2019-07-03 13:47:04 -07:00
Ghommie
1fd50cc15a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96 2019-07-03 04:52:57 +02:00
Ghommie
ad3b709c40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97 2019-06-29 06:39:21 +02:00
Ghommie
0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
kevinz000
c495a2aa47 Merge pull request #8739 from Sishen1542/makinggolemsgreatagain 
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
 2019-06-28 20:32:15 -07:00
kevinz000
a6caf4c63f Merge pull request #8729 from Ghommie/Ghommie-cit79 
Ports "Removes SSreligion"
 2019-06-28 20:30:44 -07:00
Ghommie
3291b9c47a Porting in donut fixes, beepsky smash and Neurotoxin reworks. 2019-06-28 23:17:12 +02:00
kevinz000
d4b9b52f10 Merge pull request #8728 from Sishen1542/JESUSFUCKFIXDISPENSERSALREADYGODDAMN 
Dispensers now act like tg counterparts! Tweak to available chems in chem/soda/booze dispensers.
 2019-06-28 10:16:25 -07:00
Sishen
92f530eed1 left the , for diethyl when i removed saltpetre whoops 2019-06-28 08:34:35 -04:00
Sishen
84e60b1cd2 Update chem_dispenser.dm 2019-06-28 08:32:56 -04:00
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
Sishen
a74712eef2 Update toxins.dm 2019-06-23 15:33:16 -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
Sishen
bfa212f43e Update toxin_reagents.dm 2019-06-23 04:38:58 -04:00
Sishen
13363ab16f Update drink_reagents.dm 2019-06-23 04:36:54 -04:00
Sishen
b63453a7f0 Update drink_reagents.dm 2019-06-23 04:36:12 -04:00
Sishen
a2a440a92c golem gang golem gang golem gang golem gang 2019-06-23 04:27:50 -04: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
Ghommie
38bc8a4efd Ports "Removes SSreligion" 2019-06-23 01:45:21 +02:00
Sishen
410c960f79 Update chem_dispenser.dm 2019-06-22 18:35:04 -04: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
Ghommie
1323ace579 Peanuts, peanut butter, and sandwiches. 2019-06-17 05:17:24 +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