8f44cf1305
PR TIME WOOO
2020-05-09 00:59:40 -05:00
9f25759aa8
Citsnow -> final name (Snaxi) , fixes arrivals
2020-05-09 00:53:04 -05:00
375375d67e
brig
2020-05-08 18:19:29 -05:00
78e1fcc772
I can't feel my toes
2020-05-08 03:31:36 -05:00
4e84b92e2e
Merge remote-tracking branch 'upstream/master' into snaxi2
2020-05-08 01:13:12 -05:00
504b1762f4
more map
2020-05-08 00:57:42 -05:00
5b6229d1e0
more stuff
2020-05-07 22:10:59 -05:00
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
eaf486dbaa
more epic progress
2020-05-06 16:17:05 -05:00
2ce118f851
MetaStation atmos update ( #12099 )
...
* Finishes up meta station atmos
* Update MetaStation.dmm
2020-05-04 05:05:27 +02:00
f812cddf93
unfucks this and makes it use the icebox framework
2020-05-03 20:04:20 -05:00
e197513bcc
fixes lone ops and ninjas
2020-05-03 01:22:18 -05:00
bad9e76e50
Fixes pirates, ops, the mining base, and gives pirates and ops drills
2020-05-03 00:28:28 -05:00
a5c3e3ff2b
Oh god please let this be the final boxstation update ( #12089 )
2020-05-03 03:53:44 +02:00
6db5655ceb
Merge branch 'master' into 91-files-changed-fml
2020-05-02 17:16:18 -05:00
ea831677a1
Merge pull request #11961 from Ghommie/Ghommie-cit697
...
toylathe copypasta removal and preparations for economy public lathe nerf.
2020-05-01 14:52:29 -07:00
54e76e8ffb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697
2020-05-01 21:49:52 +02:00
6b4747d5fe
Meta station atmos opening up ( #12047 )
...
* Spawning area fix.
Part one of many
* Finishing up atmos
* Haha final fixes
* Security camera update
* Haha whoops, thanks lilly
2020-05-01 21:26:36 +02:00
5bdafb78c1
Minor updates to pubby for fixing ( #12059 )
...
* updates to pubby
* Dear justin, double check something BEFORE publishing it
2020-05-01 18:56:40 +02:00
836cf17a5b
fixes the SM up
2020-05-01 11:40:43 -05:00
2832b86e11
some map fixes, fixes the station_ruin loader shitting out errors this commit took 2 hours of my fucking life
2020-05-01 01:17:56 -05:00
9c049ef02b
more mapping fixes
2020-04-30 21:02:31 -05:00
e0fe368560
Merge branch '91-files-changed-fml' of https://github.com/Detective-Google/Citadel-Station-13 into 91-files-changed-fml
2020-04-30 20:25:54 -05:00
d0024575e7
fixes the non matching turf atmos (hopefully)
2020-04-30 20:25:51 -05:00
270f5ed168
fix
2020-04-30 18:15:43 -07:00
8cd5b4ff4a
fixes solars + removes the space tiles in the toxins burn chamber
2020-04-30 19:21:53 -05:00
c146c898c0
Merge branch 'master' into 91-files-changed-fml
2020-04-30 18:42:38 -05:00
41d1dd1763
fixes the maps
2020-04-30 18:13:02 -05:00
52b7086876
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ilowkeydespiseatmospherics
...
# Conflicts:
# _maps/map_files/BoxStation/BoxStation.dmm
2020-04-30 13:48:48 -04:00
f028672e3c
Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml
2020-04-30 01:00:08 -07:00
619609f5ff
Merge pull request #12020 from bunny232/master
...
Box pool/bar holopads+ scrubbers (that lead to space) in xenobio pens
2020-04-29 12:01:11 -07:00
1d12aa5779
Merge pull request #12006 from Trilbyspaceclone/kiloton-of-errors
...
Kilo station improvements
2020-04-29 11:59:26 -07:00
22d6ac78e1
i actually despise coding
2020-04-28 12:26:33 -04:00
c5107f8fe0
i actually despise coding
2020-04-28 12:25:48 -04:00
041d7ce4bc
i have committed warcrimes
2020-04-28 02:56:38 -04:00
40f7472410
i actually despise coding
2020-04-28 02:47:28 -04:00
8dc130175d
i actually despise coding
2020-04-28 02:46:46 -04:00
39e460d795
Kevs request
2020-04-27 07:16:00 -04:00
6ff9d54e4f
Merge pull request #11947 from MrJWhit/vg-atmos-box
...
Ports /vg/ atmos map for boxstation
2020-04-25 17:01:34 -07:00
a245741f3e
Update BoxStation.dmm
2020-04-25 07:58:08 -04:00
0c1c879fb4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697
2020-04-25 02:49:59 +02:00
a831b3b623
Merge pull request #11995 from MrJWhit/fixes-to-pubby-engine
...
Quick fixing up of pubbystation things
2020-04-24 21:29:32 +02:00
a3379089a6
Decal delete
2020-04-24 11:26:21 -04:00
71be8ed2fc
ports all the tg junk for icemoon, not yet changed to make it all compile
2020-04-24 00:02:03 -05:00
cc9d3b485a
Removes putnam upsetti mixer
2020-04-24 00:47:11 -04:00
100d7cffd2
Also fix that one maint door to be a maint door
2020-04-23 19:20:43 -04:00
037ea6e073
fixing up the engine
2020-04-23 18:26:39 -04:00
a621474ae7
Adds a missing wire and a second SMES to the AI sat
2020-04-23 18:10:56 -04:00
c8b3032087
Merge branch 'master' into cube-world
2020-04-23 02:04:56 -04:00
8e7728c216
Reduce atmos suits, add pump to waste from mix, turn off air to waste pump
2020-04-22 14:18:00 -04:00
Detective Google