shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,990 Commits 5 Branches 0 Tags
cdbd585f4de7db52f7cc7b751e22e243b7d7e207
Commit Graph

210 Commits

Author SHA1 Message Date
silicons
a77aa8bd41 Merge pull request #14766 from Linzolle/cultfix 
Fix cult area shenanigans, cult can do stuff in maint again.
 2021-06-09 11:22:26 -07:00
MrJWhit
2db540aae3 Update holodeck.dm 2021-06-04 20:53:34 -04:00
Linzolle
46833abf0b add cult_permitted area flag 2021-05-27 19:34:00 -05: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
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Putnam3145
5cde6e0157 Merge pull request #13871 from silicons/debris 
Merry Christmas - GIVING JANITORS A JOB
 2021-01-08 00:26:52 -08:00
EmeraldSundisk
291c0a0a22 Update Space_Station_13_areas.dm 2021-01-01 22:46:36 -08:00
EmeraldSundisk
b1f76a8566 Update Space_Station_13_areas.dm 2020-12-29 11:38:07 -08:00
EmeraldSundisk
0707f6ecfc Update Space_Station_13_areas.dm 2020-12-29 10:56:58 -08:00
EmeraldSundisk
6af5d180d0 Update Space_Station_13_areas.dm 2020-12-29 10:29:28 -08:00
silicons
6044086de0 changes 2020-12-26 20:29:52 -08:00
silicons
45af2360ad changes 2020-12-26 11:35:47 -08:00
Letter N
98ff0a080e ImmursionAudio(TM) 2020-12-21 19:47:11 +08:00
silicons
0d63fc9cf4 Update shuttles.dm 2020-12-12 19:02:56 -07:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07: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
EmeraldSundisk
a41963fa13 Update space.dm 2020-09-29 13:03:11 -07:00
EmeraldSundisk
41d263da84 Update space.dm 2020-09-29 12:43:40 -07:00
EmeraldSundisk
633da981e2 Update space.dm 2020-09-28 23:01:31 -07:00
EmeraldSundisk
0f88f93f59 4now 2020-09-28 22:51:59 -07:00
silicons
17b21d29f3 helpers 2020-09-16 00:07:33 -07:00
silicons
07e2423c22 regarding malf ais, apcs, space, and engineering cyborg grippers (#12933) 
* Update areas.dm

* Update apc.dm

* Update apc.dm
 2020-08-09 15:57:53 +02:00
silicons
53dd4fc857 Update areas.dm 2020-07-18 20:50:28 -07:00
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events 
ports several tg events including fugitives
 2020-06-17 20:10:04 -07:00
SmArtKar
46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
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