shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,353 Commits 5 Branches 0 Tags
d0d6bc37a6788ed3d6ae3cc2d9401ac48dcf70e6
Commit Graph

714 Commits

Author SHA1 Message Date
kevinz000
25eba5829d Merge pull request #8980 from Ghommie/Ghommie-cit159 
Fixes hypovials unable to dump liquids and chem master unable to dispense in pill bottles.
 2019-07-29 04:44:08 -07:00
kevinz000
3713533c18 Merge pull request #8983 from Ghommie/Ghommie-cit161 
One liner fix for the most useless feature of the year.
 2019-07-29 04:41:23 -07:00
kevinz000
e79bf3ab07 Merge pull request #8969 from Sishen1542/hypofix 
chemmaster now spits out 60u hypovials
 2019-07-27 21:54:36 -07:00
Ghommie
acc338378d One liner fix for the most useless feature of the year. 2019-07-27 19:44:17 +02:00
Ghommie
911f148003 Fixes hypovials unable to dump liquids and chem master unable to dispense in pill bottles. 2019-07-27 03:48:21 +02:00
Sishen
a1a626ba29 hypovial shit 
iddqd
 2019-07-25 19:11:58 -04:00
Ghommie
c06c1d9b60 typo. 2019-07-21 12:11:18 +02:00
Ghommie
ce4e86279c Further improvements. 2019-07-21 11:58:58 +02:00
Ghommie
5504fb6a6a Alt click examine string. 2019-07-21 11:27:26 +02:00
Ghommie
2f46b68e11 switching to non combat mode attack_self() and AltClick(), less clunky. 2019-07-21 11:22:19 +02:00
Ghommie
1a47fedade More intuitive, way less weird edge cases. 2019-07-21 10:26:16 +02:00
Ghommie
fc78d02242 Fixing towels and improving them. 2019-07-21 09:58:54 +02:00
kevinz000
c657244d9b Merge pull request #8920 from Ghommie/Ghommie-cit149 
Towels.
 2019-07-20 12:06:54 -07:00
kevinz000
ab3c5acb0e Merge pull request #8829 from BurgerLUA/NO-MORE-FETISH-CONTENT 
Changeling Transformation Sting (transforming others) is now temporary, just like this server's love for transformation fetishes
 2019-07-20 11:59:05 -07:00
Ghommie
44063e523d missing flag. 2019-07-18 02:14:00 +02:00
Ghommie
4e6554076c item flags, not clothing flags. 2019-07-18 00:16:14 +02:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
deathride58
adaac8322c Merge pull request #8589 from Citadel-Station-13/kevinz000-patch-47 
buffs pepperspray to hardstun (knockdown + drop items) for 0.1 ds because for some reason we don't have a standalone knockdown without hardstun when are we porting the /tg/ mobility flags that I made?
 2019-07-17 17:53:39 -04:00
BurgerLUA
03ef2c5257 Merge branch 'master' into NO-MORE-FETISH-CONTENT 2019-07-17 14:17:33 -07:00
kevinz000
c06d495731 Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC 
REMOVE #C8A5DC. COLOR STRONG.
 2019-07-14 14:48:49 -07:00
kevinz000
2259ea2e1c Merge pull request #8874 from Ghommie/Ghommie-cit132 
Ports the Chem Master choose your pill PR plus post-improvements
 2019-07-14 03:33:37 -07:00
kevinz000
280aa9da08 Merge pull request #8860 from Trilbyspaceclone/Zelus_oil 
Zelus oil - CWC gear
 2019-07-12 07:41:28 -07:00
BurgerLua
5bd2f28d69 Removed #C8A5DC 2019-07-12 01:02:43 -07:00
Ghommie
d36bae06a7 Ports the Chem Master choose your pill PR plus post-improvements 2019-07-12 07:39:17 +02:00
Trilbyspaceclone
27a8876e99 I dont care anymore, It works in testing to function fine 
I dont see a problem is this, kinda would like citation on were Clockies will get added in the last else claim.
 2019-07-11 01:15:39 -04:00
Trilbyspaceclone
146276014c Update other_reagents.dm 2019-07-10 20:42:12 -04:00
Trilbyspaceclone
48e15307c5 Update other_reagents.dm 2019-07-10 19:14:57 -04:00
Trilbyspaceclone
ac9c672fa8 I guess this is better 2019-07-10 18:56:32 -04:00
Trilbyspaceclone
ed89ac874b this was fine 2019-07-10 18:44:14 -04:00
Trilbyspaceclone
baf4529e52 Update other_reagents.dm 2019-07-10 18:32:10 -04:00
Trilbyspaceclone
d53d11de6b Apply suggestions from code review 
Grammer and such

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-07-10 18:21:03 -04:00
Trilbyspaceclone
c9e13f8d62 better wording* 2019-07-10 02:43:18 -04:00
TrilbySpaceClone
54c28b19af Zelus indeed 2019-07-10 02:29:42 -04:00
Trilbyspaceclone
e1ed96f419 Update other_reagents.dm 2019-07-09 23:08:11 -04:00
Trilbyspaceclone
b03c197d0e forgot the var 2019-07-09 22:58:13 -04:00
Trilbyspaceclone
6240222ed7 Update other_reagents.dm 2019-07-09 21:58:22 -04:00
deathride58
42cee552fe Merge pull request #8709 from Trilbyspaceclone/Fel_port_1 
Ports "Fixes every issue in the slimes milestone. #44450"
 2019-07-08 18:10:46 -04:00
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
BurgerLua
f4307f919b Nerfed changeling transformation string by making it temporary. 2019-07-05 16:49:02 -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