shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,832 Commits 5 Branches 0 Tags
ce2bb9ff844de95cf760cdcb3de1042cb22ea7d2
Commit Graph

358 Commits

Author SHA1 Message Date
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Trilbyspaceclone
106fb6496e Update hypospray.dm 2020-05-06 05:30:54 -04:00
Ghommie
b2a20d5438 reducing some prices as training wheel. 2020-05-03 05:37:04 +02:00
Ghommie
b383066e57 Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS. 2020-05-02 00:00:49 +02:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Trilbyspaceclone
f8147e5a85 Ports over Mortars and Pestles (#11546) 
* 2 ports for the commit of 1!

ports -[ready]ghetto grinder
#43600
ports - Mortar and Pestle Fixes #48086
Links -
https://github.com/tgstation/tgstation/pull/43600
https://github.com/tgstation/tgstation/pull/48086

* what if we didnt have that...

* Apply suggestions from code review

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-24 14:03:31 +01:00
Trilbyspaceclone
888f67c4bc Update borghydro.dm 2020-03-13 18:21:12 -04:00
Ghommie
59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
Ghom
f24c7fb142 Merge pull request #11222 from Trilbyspaceclone/ashwalkers 
Ashwalkers now can make a well, got their livestock back and more!
 2020-03-06 13:48:03 +01:00
Ghom
b80acdfaa6 Update glass.dm 2020-03-06 05:39:18 +01:00
Ghom
0b5481f9b9 Merge pull request #11237 from kevinz000/reagent_logging_3 
reagent logging pr attempt 3 but it works
 2020-03-03 21:27:17 +01:00
Ghom
9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ 
Bloodsucker external blood gain rebalancing
 2020-03-02 16:36:22 +01:00
Arturlang
97c5aa1e24 Maintainer suggestions 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-01 16:48:49 +02:00
Artur
b536c061fb Reviewer suggestion and co 2020-02-26 16:26:57 +02:00
kevinz000
5144e45ba9 it works now :D 2020-02-24 15:32:46 -07:00
kevinz000
bbcc9cf4e5 never ever webeditor 2020-02-24 15:15:21 -07:00
kevinz000
5cece42c1a Update glass.dm 2020-02-24 14:20:40 -07:00
kevinz000
77edc602dc Update glass.dm 2020-02-24 13:59:27 -07:00
kevinz000
d4657df9f5 Update glass.dm 2020-02-24 13:58:51 -07:00
kevinz000
1668bc598a Update glass.dm 2020-02-24 13:55:44 -07:00
TrilbySpaceClone
525cedf16a this just works 2020-02-24 11:45:47 -05:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Artur
35aecac620 Disgust mood for bloodsuckers being disgusted, and blood bag inneficency 2020-02-20 12:50:25 +02:00
Ghom
f94f997cc2 Merge pull request #11080 from kevinz000/surubatons 
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
 2020-02-20 11:09:46 +01:00
kevinz000
49279086b7 Merge pull request #11113 from CameronWoof/biogeneratin' 
Adds diethylamine and saltpetre to the biogenerator
 2020-02-19 19:03:35 -07:00
kevinz000
d04126226b Merge pull request #11082 from Hatterhat/preservahyde 
preservahyde, alt title "what if i didnt die from having shit rng and a single epipen"
 2020-02-18 02:21:37 -07:00
Cameron!
a9f103fb34 removes unused bottle, kicks travis? 2020-02-17 15:28:10 -08:00
CameronWoof
14e41e8d68 adds diethylamine and saltpetre to the biogenerator 2020-02-16 03:52:07 -08:00
kevinz000
7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569 
Something about the in operator and spaceDMM version update.
 2020-02-15 12:17:37 -07:00
Ghommie
4a621fb1aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560 2020-02-14 19:39:53 +01:00
Hatterhat
1276453dc4 initial commit - preservahyde 2020-02-13 21:01:28 -06:00
kevinz000
e8ccf4b6d7 fix 2020-02-13 16:25:43 -07:00
Winter Flare
ac55d1d25d Merge branch 'master' into tinytweaks-2-9-20 2020-02-13 03:34:44 -05:00
Artur
ce2ab532d9 Maintainer suggestion 2020-02-11 11:23:56 +02:00
Artur
af95921155 Goddamnit 2020-02-10 15:20:22 +01:00
Ghommie
c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
Winter Flare
bb641fecf8 Sprites, Tweaks, and Snacks 
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.

Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
 2020-02-09 23:07:32 -05:00
Ghommie
0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
Ghom
cd14f13d0d Merge pull request #10917 from Arturlang/Hyposprays_QOL 
Removes the hypospray verb for toggling spray/inject mode and makes it into an Alt click proc.
 2020-02-06 20:31:46 +01:00
Arturlang
23834ce3f5 Parent call 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-05 22:54:01 +02:00
Artur
5602289013 Parent call 
Failed to get in the previous commit for some reason.
 2020-02-05 20:25:04 +01:00
Artur
9951f291fd Reviewer suggestions 2020-02-05 20:14:35 +01:00
Artur
8b5e3e6004 Removes the shitty verb 2020-02-05 14:55:47 +01:00
Ghommie
5dc1de1d04 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-05 04:34:54 +01:00
Hatterhat
fe717597da fuck fermichem 2020-02-04 18:35:26 -06:00
Ghommie
fedb05b3be A PR about runtime errors 2020-02-02 05:43:38 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00