shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,781 Commits 5 Branches 0 Tags
ab12f2eef9fb1c3642e4e95ffbeddeb2d6339a13
Commit Graph

2275 Commits

Author SHA1 Message Date
SandPoot
760ed48476 Upload files 2022-02-02 00:45:32 -03:00
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
Lin
2379a2a342 Merge pull request #15370 from Putnam3145/genericized-plasma-trit 
Total fire overhaul + new atmos stuff + uh oh stinky toxins nerf + sauna buff + ??
 2022-01-03 22:31:40 +00:00
Putnam3145
c97d09c0ad Fixes bluespace pipes (I think) (#15437) 2022-01-01 19:48:03 +01:00
LetterN
fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
Putnam3145
0ef0991d65 another tweak to it, for good measure 2021-11-26 22:49:30 -08:00
Putnam3145
2558789015 Adjusted bomb numbers 2021-11-26 20:18:47 -08:00
Lin
d5c17f0d84 Merge pull request #15376 from SandPoot/double 
Double beds
 2021-11-24 17:38:10 +00:00
LetterN
8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
Lin
4e407ffeb6 Merge pull request #15371 from DeltaFire15/unintended-devastation 
Devastation level explosions no longer delete organs of gibbed humans
 2021-11-17 16:19:23 +00:00
LetterN
fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08:00
DeltaFire
0e93bd84f8 no funky relay decon and wackyness 2021-11-16 02:22:12 +01:00
LetterN
cca584b2df should finally fix dragging other people into cryo 2021-11-16 08:37:48 +08:00
Putnam3145
1da28b8ec6 Chem gas tweaks, + toxins rebalance 2021-11-15 16:29:30 -08:00
SandPoot
5b85c260a7 Upload files 2021-11-15 01:34:30 -03:00
LetterN
01ebc25f7f fixes vending BSOD and reverts cryopod regressio 2021-11-15 10:37:10 +08:00
DeltaFire
88789e1bbe one 2021-11-14 22:06:52 +01:00
DeltaFire
6224da71a3 contents_explosion 
at least this one had less overrides.
 2021-11-14 21:41:42 +01:00
DeltaFire
6aa906395c not a gaius reference 
hhhh let me just replace all the ex_acts missing some args and adjust them
 2021-11-14 21:34:59 +01:00
LetterN
8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
LetterN
4ec1f216ff cryofix 2021-11-12 08:48:24 +08:00
Putnam3145
7df63ed6f5 Nerf chonker/temper 2021-11-10 16:20:43 -08:00
LetterN
9a24f89780 THE fix 2021-11-10 10:33:15 +08:00
silicons
a32eabb7ae fix 2021-10-29 22:44:01 -07:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
LetterN
a057139c33 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-10-30 11:54:20 +08:00
LetterN
99019166e4 i think it works 
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
 2021-10-30 11:45:50 +08:00
LetterN
f7b898a2a9 frontend 2021-10-28 17:34:52 +08:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
silicons
679189cb3d Merge pull request #15277 from Hatterhat/autoloom 
i've been sitting on this a while but here have the AUTOLOOM
 2021-10-27 05:13:40 -07:00
silicons
d6d037de43 Merge pull request #15232 from Putnam3145/minesweeper-removal 
Removes minesweeper
 2021-10-27 05:11:48 -07:00
Hatterhat
7e7a5af53a brought to you by neilcic - Floor Corn 2021-10-16 05:00:15 -05:00
SandPoot
437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
Hatterhat
c7b57109c7 wip dnm 2021-10-07 16:42:03 -05:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
silicons
f5e52f810d I HATE YOU 2021-10-03 13:54:58 -07:00
silicons
715251dea1 wack 2021-10-03 13:25:30 -07:00
silicons
31467420d7 Merge pull request #15221 from SandPoot/colormate 
Colormate tgui + minor tgui updates
 2021-10-03 08:51:51 -07:00
Putnam3145
dc22e02a1b Removes minesweeper 2021-10-01 23:08:08 -07:00
Putnam3145
a0a9089ce0 Removes "play on same board" from minesweeper (#15217) 2021-09-29 18:52:05 +02:00
SandPoot
b23b88524d Upload files 2021-09-28 22:03:17 -03:00
zerothebigboy
c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-09-19 15:23:52 -04:00
silicons
c04f0cb953 Merge pull request #15154 from qweq12yt/test 
[Fix] Fixes Space Heater behavior
 2021-09-19 11:06:15 -07:00
qweq12yt
781a414c38 fix space heaters 2021-09-15 18:16:04 -03:00
Lin
d536d22100 Merge pull request #15109 from Citadel-Station-13/silicons-patch-11 
fixes airlocks not unshocking themselves
 2021-09-14 01:09:22 -05:00
Lin
4cdee473a4 Merge pull request #15132 from Citadel-Station-13/silicons-patch-17 
[03:37:30] Runtime in recycler.dm, line 185: Cannot execute null.forceMove().
 2021-09-14 01:08:15 -05:00
silicons
85659a297f Merge pull request #15071 from Putnam3145/remove-bomb-research-cap 
Remove arbitrary bomb research cap + tweak formula a little
 2021-09-13 15:09:28 -07:00
silicons
fcac5fa3c0 Update recycler.dm 2021-09-12 20:40:25 -07:00