shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,142 Commits 5 Branches 0 Tags
9828d6fe85e255ea46ca6485332af549506fcbef
Commit Graph

1769 Commits

Author SHA1 Message Date
silicons
0c0bf46f7f Merge pull request #12696 from Chiirno/emichemmastertweak 
increased the amount of stuff the chem master can dispense from 10 to 20
 2020-07-06 17:34:50 -07:00
Cirno
45d97b2251 increased the amount of stuff the chem master can dispense from 10 to 20 2020-07-05 11:17:37 -03:00
silicons
e9c4ac8c3c Merge pull request #12658 from timothyteakettle/okay-its-bad 
slightly tweaks the cooking oil damage formula
 2020-07-04 00:11:09 -07:00
silicons
d85edbf8fb ok 2020-07-03 02:15:06 -07:00
Sonic121x
ea7fed0c8e givme that pilltype button 
Fix pill type button
 2020-07-02 22:30:28 +08: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
Letter N
b35e3f2b93 fix: R&D Console, Vending, and chem master 2020-07-01 19:07:03 +08:00
timothyteakettle
0f0e0298e5 newline at end of file 2020-07-01 03:34:17 +01:00
timothyteakettle
d1f92da74a 20 is fine if we edit volume 2020-07-01 03:29:22 +01:00
timothyteakettle
4865831b6e alright this is a bad meme 2020-07-01 03:28:37 +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
Ghom
b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes 
big batch of spelling/grammar corrections
 2020-06-29 21:13:06 +02:00
timothyteakettle
76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
Timothy Teakettle
9c9868438c some fixes 2020-06-26 22:49:43 +01:00
Timothy Teakettle
334d55bef3 add support for custom blood colours 2020-06-26 20:29:40 +01:00
silicons
ac06f037e5 Merge pull request #12575 from dapnee/meme 
Wataur Bottle
 2020-06-24 08:44:08 -07:00
Linzolle
15be6217bd Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into chemmaster 2020-06-23 20:49:12 -05: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
Linzolle
b873f244c9 finally 2020-06-19 22:46:31 -05: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
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events 
ports several tg events including fugitives
 2020-06-17 20:10:04 -07:00
SmArtKar
170a38a3a7 Porting sutures and meshes from /TG/ (#12532) 
* Porting sutures and meshes from /TG/

* Recipes fix
 2020-06-16 16:22:56 -07:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
The0bserver
08be1292cd It's Mad Funny when everything breaks! 
And even funnier still when you have to start all over again!
 2020-06-11 15:02:17 -04:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Ghom
77a6511cc7 Fixing two issues. (#12481) 2020-06-09 03:26:19 -07:00
Trilbyspaceclone
81070b8ada New fermi chem Zeolites! (#12428) 
* Zeolites!

* No loner hs debug numbers...
 2020-06-09 03:25:40 -07:00
DeltaFire
1a6bfeb0f1 Switch man bad 
ifs in switch segments ONLY support constant expressions, NOT vars
 2020-06-04 18:32:41 +02:00
coldud13
17d4c99b25 alt click to remove containers from reagent grinder and biogenerator 2020-06-02 19:10:41 +10: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
07df0102f8 Demodularizing a few reagents, a client var, the rest hud button. (#12329) 2020-05-24 13:21:14 -07:00
Ghom
0a6b755eff Apotechary chem dispenser nerf. (#12292) 
* Apotechary chem dispenser nerf.

* Spelling and build_path.
 2020-05-24 13:20:32 -07:00
Ghom
6756b564b7 Removing that one keg. (#12333) 2020-05-24 13:07:53 -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
Lin
8ca1bcd237 Merge pull request #12315 from DeltaFire15/styp-silsulf-OD-fix 
Fixes Styptic Powder & SilverSulf OD effects
 2020-05-21 19:22:28 +00:00
kevinz000
dfcbee5045 Update pandemic.dm (#12318) 2020-05-21 02:34:09 +02:00
DeltaFire
761d014f6f fixes silver sulf and styptic OD effects 
:)
 2020-05-20 18:52:20 +02:00
Ghom
08280a853e Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' (#12282) 
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'

* Ok, signals.
 2020-05-17 17:04:15 -07:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -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