shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,271 Commits 5 Branches 0 Tags
0b98b0409b08ef44308cf23cb4122563abf32581
Commit Graph

369 Commits

Author SHA1 Message Date
Ghommie
65ffadaa18 Few issues, solved. 2020-06-28 04:51:02 +02:00
Lin
2cd18f3dba Merge pull request #12557 from silicons/life 
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
 2020-06-21 18:32:58 -05:00
Ghommie
29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
kevinz000
1b5ea90c8f sigh 2020-06-18 08:16:05 -07:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
SmArtKar
46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
Ghommie
ad6b835e8b Linter. 2020-06-08 08:12:29 +02:00
Ghommie
495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
Detective Google
6e5e1b249f Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-12 18:38:28 -05: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
Detective Google
424133c48a adds the actual snow taxi to snaxi 2020-05-09 22:20:26 -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
kevinz000
5c5fc37959 Introducing noitatsxoB (#12073) 
* okay

* ok

* ok

* ok

* ok

* why am i doing this

* WHY DID I DO THIS

* mirror doesn't work

* compile

* shuttles should work

* fix engine

* fix engine

* off by 1

* ok

* adds proccall to write next map

* haha post processing funny

* fixes

* Update code/modules/mapping/map_template.dm

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

* Update code/modules/mapping/map_template.dm

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

* Update code/modules/mapping/map_template.dm

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

* Update code/modules/mapping/map_template.dm

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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-06 17:50:50 +02:00
kevinz000
c1436c4c7b Maptick lag minimization port (#12066) 
* extools.dll

* backend

* queued pipenet builds

* oh yeah we don't have that

* wow

* Update air.dm
 2020-05-03 03:34:33 +02:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
kevinz000
d7f38faab9 Merge pull request #11971 from Putnam3145/fix-story-storyteller 
More dynamic tweaks
 2020-04-25 17:05:38 -07:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Putnam
95d1a25df7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller 2020-04-24 16:07:38 -07:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Putnam
44925da1d8 Various dynamic tweaks 2020-04-21 20:52:33 -07:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
kevinz000
0791f22b62 Merge pull request #10702 from Ghommie/Ghommie-cit528 
Hey, do you remember that wizard round where everyone tried arming up the nuclear bomb and we all went DELTA RED DELTA RED DELTA RED DELTA ?
 2020-03-10 17:24:48 -07:00
kevinz000
e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612 
Porting "Further update_icon splitup"
 2020-03-10 05:58:17 -07:00
Ghom
f1d6360b70 Shuttle timer display seconds fix 2020-03-09 01:31:39 +01:00
Ghommie
59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
kevinz000
f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000
a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
Ghom
0f8f6e417b Merge branch 'master' into Ghommie-cit528 2020-02-21 02:40:22 +01:00
kevinz000
d7403b3436 john doe 2020-02-19 22:26:10 -07:00
kevinz000
2dd5a0cfb8 Merge branch 'master' into hijack 2020-02-19 22:25:31 -07:00
kevinz000
0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghommie
0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
kevinz000
6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Ghommie
a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
kevinz000
fb0f12520c Update emergency.dm 2020-02-02 16:23:54 -07:00
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghommie
7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Ghommie
2adb981832 Welp. 2020-01-26 22:04:46 +01:00
Ghommie
9b149244b0 Ok here we go. 2020-01-26 21:56:31 +01:00
Ghommie
a89cd796d4 emergency shuttle console spam limiter. 2020-01-26 21:33:36 +01:00
kevinz000
40a2698b55 Update emergency.dm 2020-01-23 19:22:00 -07:00
kevinz000
289bb590cf changes 2020-01-23 19:20:35 -07:00
kevinz000
e7bf1738cd ok putnom 2020-01-23 18:00:33 -07:00
Artur
255f2ce449 Testmerge Conflict fix? 2020-01-22 20:17:42 +01:00
kevinz000
c4475b1dda variables 2020-01-22 05:39:16 -07:00
kevinz000
ccb5d32ab2 varnames 2020-01-22 05:38:09 -07:00