shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,317 Commits 5 Branches 0 Tags
4fc30ce8ae92c22ddbb0fecea72d8b00a9ec9c68
Commit Graph

404 Commits

Author SHA1 Message Date
SandPoot
2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Solaris-Shade
0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
silicons
4cd8753a23 Merge pull request #15543 from timothyteakettle/floor-tile-moment 
spraypainting a stack of floor tiles makes the placed tile the same colour!
 2022-03-10 16:51:18 -07:00
Timothy Teakettle
59451d9088 Update plating.dm 2022-03-07 19:45:58 +00:00
Timothy Teakettle
1f00f61380 Update plating.dm 2022-03-07 19:45:27 +00:00
Solaris-Shade
2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update 
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
 2022-03-06 15:20:23 -05:00
SandPoot
45a49c6106 Upload files 2022-03-05 13:49:26 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
TripleShades
226a299aff Update dirt.dm 2021-12-19 17:29:01 -05: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
DeltaFire
7d2ff194d1 this WILL fail CI 
hnnnngh
 2021-11-14 20:48:41 +01:00
silicons
ac0fd70b0b Update misc_floor.dm (#15140) 2021-09-14 02:24:15 +02:00
TripleShades
dfff5339c9 Update water.dm 2021-07-31 00:23:09 -04:00
TripleShades
652ffe22a2 Update water.dm 2021-07-30 23:58:11 -04:00
TripleShades
7d7525825d deco waterrrr 2021-07-30 23:51:57 -04:00
Putnam
e580c504fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-05-21 18:52:16 -07:00
silicons
5601badbff deterministic explosion system (#13392) 
* wae explosions

* okay

* changes

* fixes

* fix

* ok

* ok

* kills more dead code

* okay

* fix

* ok

* tiles

* ok

* okay

* woops

* ok

* fix

* okay

* mob damage

* fixes

* insanity

* more

* more

* fixes

* more

* woot

* don't commit that

* YES

* fix
 2021-05-12 05:44:53 -05:00
silicons
47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
Letter N
935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
Putnam
cc360288bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-08 14:46:46 -08:00
Putnam
f07a9c13fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-02 01:44:58 -08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
Putnam
d8e408d1f1 Fixed some major incompetency from 2018. 
// If someone will place 0 of some gas there, SHIT WILL BREAK. Do not do that.
LINDA_turf_tile.dm, line 16.
 2021-01-24 13:26:47 -08:00
Putnam
158dd11d8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-19 17:52:40 -08:00
DeltaFire
05f7991981 snap 2021-01-09 20:37:24 +01:00
silicons
a6ae0fe5c2 ok 2020-12-26 20:56:48 -08:00
silicons
bfb3d087c3 ok 2020-12-26 20:50:28 -08:00
silicons
d3414a4d23 ok 2020-12-26 20:47:50 -08:00
silicons
6044086de0 changes 2020-12-26 20:29:52 -08:00
Putnam
d1277ad7b2 Updated auxmos (see desc) 
1. All callbacks are now auxmos-side, using new auxcallbacks.
2. Heat processing is now paused for and has been optimized by making it have fewer callbacks.
 2020-12-10 12:03:28 -08:00
Putnam
30fb673670 Superconductivity is gone. Only rustmos now. 2020-11-17 02:35:10 -08:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Detective Google
98703e6ad6 Merge remote-tracking branch 'upstream/master' into arcade-carpets 2020-10-01 13:41:10 -05:00
Detective Google
643421bc23 adds arcade carpets 
yay
 2020-09-28 14:43:03 -05:00
ItzGabby
b97b595f6f Three new wooden floor types 2020-09-26 18:29:46 -04:00
silicons
700c129c21 Update walls.dm 2020-09-10 11:51:34 -07:00
Putnam
febd4a47c1 I can probably afford to have these higher, really. 2020-09-04 08:23:53 -07:00
Putnam
d6ee54c77d Makes superconducting work for the first time ever. 2020-09-04 08:22:54 -07:00
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb 
[READY] ports plumbing (no more waiting for tgui4)
 2020-08-20 21:32:26 -07:00
silicons
f611945b34 Merge pull request #13180 from Detective-Google/glass-floors 
ports multiz glass floors (tgstation/tgstation#50831)
 2020-08-17 03:14:15 -07:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons
83e72b4f96 Merge branch '13164' 2020-08-16 18:51:36 -07:00