shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,029 Commits 5 Branches 0 Tags
dcd2c11f4e6e47ddbedd34dcd7e4bbc76328baff
Commit Graph

382 Commits

Author SHA1 Message Date
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
Kraseo
7094649881 don't like this 2020-07-19 11:30:55 +02:00
Timothy Teakettle
1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
timothyteakettle
7714fcfaba more changes 2020-07-18 01:26:38 +01:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Ghom
ef60068f1c Merge pull request #12666 from timothyteakettle/more-blood-fixes 
More blood fixes
 2020-07-02 14:52:39 +02:00
Timothy Teakettle
84d60a455e wow its still spelt wrong 2020-07-01 21:53:34 +01:00
Timothy Teakettle
1cb1b4d7e6 oh my god its not even defined right 2020-07-01 21:29:10 +01:00
Timothy Teakettle
311e149562 fix bloodpacks 2020-07-01 21:00:01 +01:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800 
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
 2020-06-29 12:44:33 -07:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
dapnee
e63f6aed42 Merge remote-tracking branch 'upstream/master' into meme 2020-06-22 15:15:28 -06:00
dapnee
0f15b0ce84 hey look, I'm finished with a single meme item 
hahaha
 2020-06-21 18:49:58 -06:00
dapnee
cfff6677b4 wataur 
hahaha, imagine if this worked
 2020-06-21 18:14:34 -06:00
silicons
99a7c49e52 Merge pull request #12561 from shellspeed1/Ports-kyro-chems 
Ports IV bags from TG
 2020-06-21 14:11:10 -07:00
shellspeed1
b490f02c78 Ports IV bags from TG 
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
 2020-06-18 02:30:58 -07:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Trilbyspaceclone
81070b8ada New fermi chem Zeolites! (#12428) 
* Zeolites!

* No loner hs debug numbers...
 2020-06-09 03:25:40 -07:00
Ghom
48b327ea74 chemistry/bio bags nerf and little pill volumetric tweak. (#12392) 
* chemistry bag nerf and little pill volumetric tweak.

* Yea, sure why not?

* hey.

* Kevinz review.
 2020-05-31 00:54:28 -07:00
Ghommie
e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
Ghom
85186a9714 Porting updates related to material datums. (#12317) 
* Porting updates related to material datums.

* art_type

* oh oh
 2020-05-25 14:21:00 -07:00
Ghom
ba3151bf1e Pills and pill bottles are now volumetric. (#12332) 2020-05-24 13:07:35 -07:00
Ghom
ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -07:00
Ghom
7c7147cb3e Field of Vision component. (#12075) 
* Hopeless WIP for vision cones.

* Core component and hooks done

* Removing clutter.

* linter bashing me for using statements as args.

* Ok.

* continue

* bring back the macro

* Configs and openspace filter.

* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.

* view, viewers and spoopy ghosts.

* Renamed component, admin fun button and snowflakes robots.

* Whoopsie.

* Yikes

* test merge tweak.

* radial yaketi sax.

* Fixed tgui UIs, some messages not displayed to the target.

* Documentation and a little bugfix.

* Pulling QoL, seventh plane made in this PR.

* Fix.

* Tweaks and improvements.

* Update randomverbs.dm
 2020-05-15 15:25:04 -07:00
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