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

33916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Detective Google 70094fb1cf empty commit to reroll bots 2020-05-12 21:33:53 -05:00
Detective Google 6e5e1b249f Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-12 18:38:28 -05:00
Detective Google 4f75358ab3 maint bar barricades no longer take 50 years to break 2020-05-12 17:17:12 -05:00
Detective Google 948081fdce outdoor lights, rad protection 2020-05-12 17:13:23 -05:00
kevinz000 ffc7211444 Update _wires.dm (#12199) 2020-05-12 22:02:40 +02:00
kevinz000 81424914e6 Merge pull request #12215 from Trilbyspaceclone/patch-377 
Adds more ballmer lines
 2020-05-12 12:35:05 -07:00
kevinz000 5364666d0c Merge pull request #12212 from Trilbyspaceclone/patch-376 
Buffs and corrects organ storage box
 2020-05-12 12:34:45 -07:00
kevinz000 e0f1b65785 Merge pull request #12209 from MrJWhit/moving-fire-alarm-in-boxstation-chemistry 
Moves fire alarm in box station in the chem department
 2020-05-12 12:28:41 -07:00
kevinz000 6ddd0ffa77 Merge pull request #12207 from Ghommie/Ghommie-cit743 
Fixed several item action buttons not using their own states
 2020-05-12 12:28:24 -07:00
kevinz000 ff2158b20b Merge pull request #12206 from Ghommie/Ghommie-cit742 
Porting tg's icon for that plant-speak language.
 2020-05-12 12:28:08 -07:00
kevinz000 395d434e6e Merge pull request #12200 from Ghommie/Ghommie-cit738 
nutrition adjustment wrapper procs from tg.
 2020-05-12 12:28:02 -07:00
kevinz000 40d2d35ffa Merge pull request #12205 from Ghommie/Ghommie-cit741 
A few runtimes, fixed.
 2020-05-12 12:27:45 -07:00
kevinz000 afbbde610a Merge pull request #12201 from Ghommie/Ghommie-cit740 
Purging unused dogborg items.
 2020-05-12 12:27:26 -07:00
kevinz000 cd46bce126 Merge pull request #11890 from Ghommie/Ghommie-cit685 
Porting Goofconomy & co.
 2020-05-12 12:25:12 -07:00
Ghommie 84af9d9d40 wtf 2020-05-12 21:12:17 +02:00
Ghommie 757706653d Map paths. 2020-05-12 21:01:34 +02: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
Arturlang 0b03958136 Makes The syndi outpust tanks work (#12228) 2020-05-12 18:31:33 +02:00
kevinz000 90d4f213bf Update preferences.dm (#12230) 2020-05-12 17:39:37 +02:00
Detective Google 2edfcada4c adds a medlathe 2020-05-12 05:03:41 -05:00
Detective Google 10cd4320a7 gaytway 2020-05-12 04:40:18 -05:00
Detective Google ad1a03d679 chem unfuckery 2020-05-12 02:04:12 -05:00
Detective Google 8f06ae3c56 Q-pads and disposals tune ups 2020-05-11 22:53:32 -05:00
Detective Google dc931490fd disposals needs a recycler 2020-05-11 21:38:49 -05:00
Detective Google 88f87a444d spare out of locker 2020-05-11 21:09:29 -05:00
Detective Google bcd30a9838 more requested fans 2020-05-11 21:06:20 -05:00
Detective Google 7cb79695c5 first round of testing fixes 2020-05-11 21:04:46 -05:00
Detective Google bfde367c4e Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-11 20:56:42 -05:00
Trilbyspaceclone 95330e4baf Update life.dm 2020-05-11 17:17:04 -04:00
Trilbyspaceclone c14197bd1b Update life.dm 2020-05-11 17:16:10 -04:00
Trilbyspaceclone 0df3483d6f Update life.dm 2020-05-11 17:15:29 -04:00
Trilbyspaceclone 8fa1a0ba58 Update life.dm 2020-05-11 15:48:01 -04:00
Trilbyspaceclone 720abbf1c5 Update life.dm 2020-05-11 15:21:49 -04:00
Trilbyspaceclone 1e5cce73d9 Update life.dm 2020-05-11 15:19:39 -04:00
Trilbyspaceclone db87da599c Update firstaid.dm 2020-05-11 08:41:03 -04:00
Trilbyspaceclone 3c87647fd2 Update firstaid.dm 2020-05-11 08:32:36 -04:00
kappa-sama 78004a7b73 kek (#12208) 2020-05-11 13:57:42 +02:00
kevinz000 0ed3b17d28 Merge pull request #12179 from Putnam3145/fix-atmos 
Brings back the gas archive
 2020-05-11 04:19:50 -07:00
kevinz000 657a4831b4 Merge pull request #12182 from kappa-sama/patch-25 
you can now mass produce electrochromatic kits
 2020-05-11 04:18:48 -07:00
kevinz000 f1ba2ae8e4 Merge pull request #12196 from Citadel-Station-13/Ghommie-patch-1 
bumps up savefile version cause horns/wings
 2020-05-11 04:18:29 -07:00
kevinz000 0646f16377 Merge pull request #12085 from Citadel-Station-13/Ghommie-patch-2 
makes the uranium mat two times less radioactive
 2020-05-11 04:15:07 -07:00
kevinz000 992905846d Merge pull request #12160 from Linzolle/cold-mining 
Explorer's gear gives full-body cold resistance
 2020-05-11 04:08:17 -07:00
kevinz000 2d225540fa Merge pull request #12185 from Detective-Google/this-is-why-we-can't-have-nice-things 
Nerfs multiple ice ruins
 2020-05-11 04:07:46 -07:00
kevinz000 8cbe44f20c Merge pull request #12192 from Ghommie/Ghommie-cit737 
Reorganizing techweb nodes into a subfolder.
 2020-05-11 04:07:16 -07:00
Detective Google 4bac8befd2 atmos TEG needs a sparker 2020-05-11 00:28:30 -05:00
MrJWhit b5a18ccba5 should be good??? 2020-05-11 00:09:25 -04:00
Lin 5a6b48cdfb Merge pull request #12191 from Ghommie/Ghommie-cit736 
Fixing IPCs and synth lizard antennas not showing up.
 2020-05-11 03:40:39 +00:00
Lin d9cd4f37f2 Merge pull request #12157 from Ghommie/Ghommie-cit731 
Fixing some runtimes and issues.
 2020-05-11 03:34:04 +00:00
kevinz000 f292d4047c Adds OOC notes (#12067) 
* ooc notes

* fixes

* repath

* ok

* This SHOULD compile, or else...

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-11 01:35:48 +02:00
Trilbyspaceclone b019915d10 Removes alien crate adds ape crate (#12178) 
* Update science.dm

* Update snacks_meat.dm

* Update science.dm

* Apply suggestions from code review

kinda didnt want to just take tg's ape cubes but what ever

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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-11 01:10:45 +02:00