shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,317 Commits 5 Branches 0 Tags
7dda2ba76a7c52bd3e48ec8eeb58f8727aaadcf4
Commit Graph
1385 Commits
Author SHA1 Message Date
silicons 72c5c2234e ok 2020-07-12 05:15:55 -07:00
LinandGitHub 955d9fa0cc Merge pull request #12624 from Citadel-Station-13/policy 
policy configuration & support hooks for clone memory disorder
 2020-07-11 16:40:38 -05:00
siliconsandGitHub 00867c064c Merge pull request #12715 from HeroWithYay/Drinkable_Telecrystals 
Drinkable and Sell-able Telecrystals
 2020-07-11 00:49:15 -07:00
Putnam a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
HeroWithYay bed6f4ac91 Adds "Telecrystal Dust" a useless, red waste of syndicate resources that can be obtained by grinding raw telecrystals in a blender. 
Also makes it so you can sell raw telecrystals at cargo 1000 points each which is also a considerable waste of TC.
 2020-07-09 16:32:14 +12:00
siliconsandGitHub 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
siliconsandGitHub 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
Sonic121xandGitHub ea7fed0c8e givme that pilltype button 
Fix pill type button
 2020-07-02 22:30:28 +08:00
siliconsandGitHub e2975a44a1 Merge branch 'master' into policy 2020-07-02 01:23:19 -07: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
GhomandGitHub b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes 
big batch of spelling/grammar corrections
 2020-06-29 21:13:06 +02:00
silicons 1d4a54d880 log 2020-06-26 23:47:16 -07:00
silicons 0df5aa083b policies and code hooks 2020-06-26 23:41:44 -07: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
Linzolle b873f244c9 finally 2020-06-19 22:46:31 -05:00
kevinz000andGitHub 118ac1a775 Merge pull request #12548 from timothyteakettle/more-events 
ports several tg events including fugitives
 2020-06-17 20:10:04 -07:00
SmArtKarandGitHub 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
GhomandGitHub 77a6511cc7 Fixing two issues. (#12481) 2020-06-09 03:26:19 -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
GhomandGitHub 07df0102f8 Demodularizing a few reagents, a client var, the rest hud button. (#12329) 2020-05-24 13:21:14 -07:00
GhomandGitHub 0a6b755eff Apotechary chem dispenser nerf. (#12292) 
* Apotechary chem dispenser nerf.

* Spelling and build_path.
 2020-05-24 13:20:32 -07:00
GhomandGitHub 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
LinandGitHub 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
kevinz000andGitHub 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
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 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
kappa-samaGitHubGhom
 		fc0ac23eed slight modifications to soda/booze dispenser emag reagents (#12174) 
* these

* coom.

* move

* Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-14 04:27:19 +02:00
Putnam 86afd889f1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-12 22:39:32 -07:00
kevinz000andGitHub 4aca1e8f62 Update medicine_reagents.dm (#12233) 2020-05-13 04:20:05 +02:00
Putnam 8458f97692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-12 13:34:31 -07:00
kevinz000andGitHub 395d434e6e Merge pull request #12200 from Ghommie/Ghommie-cit738 
nutrition adjustment wrapper procs from tg.
 2020-05-12 12:28:02 -07:00
Putnam e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
Ghommie 667c12d413 nutrition adjustment wrapper procs. 2020-05-10 21:41:50 +02:00
Putnam3145andGitHub c20c7f0698 Removes crocin, hexacrocin from emagged booze dispenser; makes crocin no longer "roofies" (??) (#12177) 
* Removes crocin, hexacrocin from emagged booze dispenser

* what. what. what. what. what.
 2020-05-09 14:34:30 +02:00
TrilbySpaceClone 5d6da47db7 Merge branch 'master' into medical-witchcraft 2020-04-27 07:25:18 -04:00
kevinz000andGitHub a533906f73 Merge pull request #11992 from Ghommie/Ghommie-cit703 
reagents value nerf and standardization.
 2020-04-25 16:54:14 -07:00
kevinz000andGitHub 4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700 
Movespeed modifiers refactor port.
 2020-04-25 16:51:14 -07:00
Ghommie a97c2f66a5 Putnam's suggestions. 2020-04-24 03:44:12 +02:00