shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,303 Commits 5 Branches 0 Tags
b3afed69f44f6b8564951ebeef06f7acf8beefaf
Commit Graph

184 Commits

Author SHA1 Message Date
Ghom
1c3bfa623f Merge pull request #12175 from Detective-Google/snaxi2 
Adds a New map, Snow Taxi (A vgstation13 map port)
 2020-06-02 23:48:50 +02: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
d03d20d570 Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-22 13:52:56 -05:00
MrJWhit
bc148ad39f Space diner location 2020-05-12 01:52:47 -04: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
bd7b1b1193 fixes 2020-04-30 01:23:21 -07:00
Detective Google
71be8ed2fc ports all the tg junk for icemoon, not yet changed to make it all compile 2020-04-24 00:02:03 -05:00
Ghommie
ac662a46c1 Extra support for bussed/lateloaded holodeck maps. 2020-04-18 03:15:05 +02:00
Ghommie
523672b6a5 fix for my relatively minuscule backend refactor for holodeck. 2020-04-18 02:32:10 +02:00
Ghommie
983f369357 Little Holodeck refactor. 2020-04-12 01:49:25 +02:00
nik707
09c8bd40ec Merge pull request #11575 from EmeraldSundisk/coggers 
as of yet unfinished, being added in the background for ease of further development
 2020-04-04 13:18:07 -05:00
Timothy Teakettle
b51dd7dc70 make the new holodeck an option 2020-03-28 22:24:47 +00:00
EmeraldSundisk
bc6b217565 minimapfix 2020-03-19 15:27:54 -07:00
EmeraldSundisk
6855d2d9a4 Let's try this again. 2020-03-18 14:29:34 -07:00
kevinz000
14b22f0b67 Merge remote-tracking branch 'citadel/master' into minimaps 2020-03-11 17:32:15 -07:00
kevinz000
02a488f507 Merge pull request #11340 from Ghommie/Ghommie-cit605 
Porting movespeed modifiers code updates.
 2020-03-07 03:26:48 -07:00
Kraseo
87773343c1 marks area/ruin/space as outdoors so it's not a valid dropoff location 2020-03-06 12:08:32 +01:00
Ghommie
0c4af362bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605 2020-03-06 04:00:36 +01:00
Ghommie
e484f72d7b Ports movespeed modifiers code updates. 2020-03-06 03:35:56 +01:00
Ghom
d78cdb9b37 Merge pull request #11130 from BlackMajor/SpaceRuins 
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
 2020-03-04 23:46:10 +01:00
kevinz000
8923b7e72d minimaps 2020-03-04 01:21:16 -07:00
ancientpower
12ba71f588 paramedic tweaks 2020-02-27 23:23:44 -06:00
BlackMajor
be740ba690 Merge branch 'master' into SpaceRuins 2020-02-26 20:58:46 +13:00
BlackMajor
6624155e3d Hey you know this is probably a smarter way to go about ruin spawning in station space. 2020-02-25 02:21:28 +13:00
Persi
4af2eee9dd Haha, okay... this will break Kilo 
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ohHeyKilo
 2020-02-23 02:28:18 -05:00
Persi
c4b4a90bd8 Oh hey it's KiloStation 
Trying to make Kilo open...

Finally, the work begins!

Kilo added!

Kilo Station!
 2020-02-20 00:58:54 -05:00
kevinz000
dc3e5e24fd Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-25 19:36:06 -07:00
Ghommie
b1a4cc0406 renormalize 2020-01-20 21:17:06 +01:00
Ghommie
5644617786 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2020-01-20 20:59:38 +01:00
kevinz000
5d485a95c3 Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-19 20:25:51 -07:00
Detective Google
2c4daf3a99 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-01-13 16:32:18 -06:00
kevinz000
8f5d4a0a49 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-12 18:27:03 -08:00
Detective Google
6589065c38 scream 2020-01-12 15:25:51 -06:00
Detective Google
97c26c704d Update Space_Station_13_areas.dm 2020-01-12 15:24:51 -06:00
Detective Google
81d3225819 ? 2020-01-12 15:23:45 -06:00
Detective Google
99ba77ce01 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 2020-01-12 15:23:05 -06:00
Detective Google
c7dcd0c8a3 grug hates merge conflicts 2020-01-12 15:19:44 -06:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Detective Google
d5b227a0ca adds the POOL to box station 
F in chat for dorms 7.
 2020-01-11 23:34:07 -06:00
kevinz000
8e1affa1f5 nightshift changes 2020-01-02 23:56:40 -08:00
Ghommie
80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
Ghommie
93fbc17428 ports "Standardize obj/updateicon() and update_icons() to update_icon()" 2019-12-16 17:58:50 +01:00
Ghommie
e1998e1bab set the sub areas fire var before the fire alarms update their icons. 2019-12-12 23:16:06 +01:00
Ghommie
7a3cb3bd58 Oversight. 2019-12-11 19:17:44 +01:00
Ghommie
e35db533fe ready. 2019-12-11 17:48:54 +01:00
Ghommie
bafd03bc19 Mapping. 2019-12-11 12:11:09 +01:00
Ghommie
8ed21b47b6 Grammar and something. 2019-12-10 16:20:57 +01:00
Ghommie
19a3aca619 I fear for my powernet 2019-12-10 15:33:15 +01:00