shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,805 Commits 5 Branches 0 Tags
b0940456f5fd7629f8d15a15d94de4a38b3dccb5
Commit Graph

201 Commits

Author SHA1 Message Date
Letter N
935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +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
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
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
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
Lin
d287f44d9a Merge pull request #13045 from silicons/coggers 
ports bronze (fake clockwork) airlocks and windows
 2020-08-16 20:20:03 -05:00
Detective Google
44e024a62f specification 2020-08-16 18:44:05 -05:00
Detective Google
0e1586f24d adds a construction path to glass floors 2020-08-16 18:21:29 -05:00
Detective-Google
f41c412cb9 material -> mineral 2020-08-14 23:41:29 -05:00
Detective-Google
76bfd9b3a6 ? 2020-08-14 16:09:49 -05:00
Detective Google
81f7307575 yeah 2020-08-14 15:38:27 -05:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
lolman360
6c57dce54e WX 2020-08-09 23:52:21 +10:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
silicons
13c9954f74 fix 2020-08-07 17:00:27 -07:00
silicons
815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
lolman360
17d1fd0692 fixes 2020-07-22 12:42:46 +10:00
silicons
526d257410 fix 2020-07-20 11:48:08 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -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
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Trilbyspaceclone
6db076c42f Lowers the slowdown on snow tiles (#12404) 
* Update fancy_floor.dm

* Update fancy_floor.dm
 2020-06-04 15:52:30 -07:00
Ghom
f572fe4607 Revert "Framework for (hopefully) reducing memory usage by replacing thousands of decals with turfs that look visually identical (#12383)" (#12387) 
This reverts commit ab86d669a7.
 2020-05-30 14:06:38 -07:00
KathrinBailey
ab86d669a7 Framework for (hopefully) reducing memory usage by replacing thousands of decals with turfs that look visually identical (#12383) 
* yeah don't worry trilby I have the 'sprites'

* conflict
 2020-05-28 23:30:34 -07:00
Rohesie
2857a13933 nested (#12381) 2020-05-28 14:12:58 +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
Detective Google
806966cd75 fixes the second level not spawning any rocks (and therefore no glass) while I have a PR open 2020-05-09 17:51:45 -05:00
Detective-Google
bd37d45334 Ports TG Icemoon framework and map (#49680) (#12002) 
* ports all the tg junk for icemoon, not yet changed to make it all compile

* fixes

* fixes

* fixes

* fixes

* fixes

* new stuff

* whew

* fixes

* it compiles, now to fix the maps

* fixes the maps

* fixes solars + removes the space tiles in the toxins burn chamber

* nukes the SpawnTerrain proc used for tg geysers

* linter fix

* fix

* fixes the non matching turf atmos (hopefully)

* more mapping fixes

* dmm2tgm

* unfucks changeturf for the more_caves

* fixes the volanic subtypes of the other thing

* fixes the stupid fucking tile placing list

* some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life

* fixes a bunch of mismatch atmos in ruins

* fixes wendigo cave having no air

* backwards couch backwards couch

* fixes the SM up

* wendigos can't runtime when butchering if you can't butcher them 😎

* makes the wendigo fight have the same atmos as the surrounding icemoon

* Tweaks atmos mixture from o2=22;n2=82;TEMP=180 to o2=18;n2=63;TEMP=180, making lavaland weapons actually work

* makes the wendigo screech shake not completely aids

* fixes snowlegion portals dropping proper legions instead of skeles

* brings the engioutpost ruin over as well

* whoopps

* empty commit to reroll bots

* Fixes pirates, ops, the mining base, and gives pirates and ops drills

* fixes lone ops and ninjas

* fixes the snowed plating getting fucked when tiles are placed on it

* removes some OP junk from the wabbajack pool (aka removes non-antag headslugs again)

* more bug fixes

* empty commit to reroll bots

* hopefully finally kills the active turfs on the library ruin

Co-authored-by: kevinz000 <2003111+kevinz000@users.noreply.github.com>
 2020-05-07 14:46:16 +02:00
KathrinBailey
adeb61180c big floof 2020-04-06 01:09:25 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
kevinz000
68a0eddeaf Merge pull request #10285 from Ghommie/Ghommie-cit491 
[s] Fixes singularity pulls duping rods out of engine floors.
 2020-01-08 13:31:31 -08:00
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Lin
f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478 
Brings in some mapping code updates.
 2020-01-03 00:01:54 +00:00
Ghommie
60134ea8ae [s] Fixes singularity pulls duping rods out of engine floors. 2019-12-25 03:34:42 +01:00