Commit Graph

648 Commits

Author SHA1 Message Date
Tad Hardesty
5b30b29a4b Support stations with multiple z-levels (#35339)
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
2018-02-15 10:39:08 -06:00
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045
TG Sync #4985279348672983476
2018-02-14 04:11:44 +00:00
deathride58
5bf11ca6d5 Merge pull request #5477 from Citadel-Station-13/upstream-merge-35506
[MIRROR] Assblasts some power creep in circuit labs
2018-02-14 04:10:32 +00:00
deathride58
e0eb4999fe Merge pull request #5476 from Citadel-Station-13/upstream-merge-35610
[MIRROR] Cleans up turf underneath fridges
2018-02-14 03:51:44 +00:00
Dax Dupont
98c9e0948f Assblasts some power creep in circuit labs (#35506)
* Circuit printers no longer start upgraded.

* Replaces roundstart upgraded printer with regular printer

* Replaces roundstart upgraded printer with regular printer w\ key remap
2018-02-13 21:09:35 -06:00
Jordan Brown
38fdf92660 Merge pull request #35610 from ShizCalev/fridge-cleanup
Cleans up turf underneath fridges
2018-02-13 21:00:14 -06:00
ExcessiveUseOfCobblestone
745ca227c3 Fixes Battlecruiser Turrets and Improves Turret's Faction Capabilities (#35427)
* Update portable_turret.dm

* Update portable_turret.dm

* Update portable_turret.dm

* f
2018-02-13 20:47:14 -06:00
deathride58
a11b073139 this shuttle got the axe for being too fun, comrade 2018-02-12 23:13:19 -05:00
deathride58
e3ad2643b2 maps first 2018-02-12 20:30:05 -05:00
Jordan Brown
ebd82bfe50 Merge pull request #35518 from ShizCalev/ACCESS-FIXES-MK2
Actually fixes broken accesses
2018-02-11 15:48:40 -06:00
Jordan Brown
5fca9331f6 Merge pull request #35509 from DaxDupont/too-much-assblast
Removes duplicate air alarm on meta.
2018-02-11 11:36:36 -06:00
MoreRobustThanYou
73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
MMMiracles
2d499b938c adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free (#35168)
* adds a space ruin for where dad tells you they sent your pet catperson to live on a farm where they can be free and chase all the grayshirts they want

* dirty vars

* Vars

* changes windoor to proper subtype, removed extra circular saw

* area/space to area/ruin/unpowered, added gps tag

* in area/space nobody can hear you scream

* Update mrow_thats_right.dmm

if i scream, scream, scream, about a good man's life, would you ever stop and listen, would you open up your eyes

* cat
2018-02-07 20:23:32 -06:00
CitadelStationBot
717da969a6 [MIRROR] Var cleanup and map fixes (#5359)
* Merge pull request #35429 from ShizCalev/snowdin-cleanup

Var cleanup and map fixes

* Var cleanup and map fixes
2018-02-07 20:04:04 -06:00
Dax Dupont
0f8b7da2a1 Adds the saltmine shuttle. (#35369)
* Adds the saltmine shuttle

* Adds an orange, makes the revolver a reverse one

* henk

* honker

* pay me

* more cat and cat accessories

* memes

* Crybabies jeeez

* Salt is expensive

* There now it's an easter egg shuttle

* nani
2018-02-07 07:17:50 -06:00
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
CitadelStationBot
b6c4bd6e01 [MIRROR] Fixes bloodpack sprite issues (#5333)
* Fixes bloodpack sprite issues

* Update packs.dm

* fuck this godamn map
2018-02-06 18:24:51 -06:00
Poojawa
4be9acea1d Snowdin pixel_x bugs 2018-02-05 21:39:21 -06:00
deathride58
d29477f4a8 Merge pull request #5322 from Citadel-Station-13/upstream-merge-35305
[MIRROR] Fixes crematorium on meta/box.
2018-02-06 02:44:12 +00:00
Dax Dupont
1cc06510ec Fixes crematorium on meta/box. (#35305) 2018-02-05 11:01:57 -06:00
MMMiracles
4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
CitadelStationBot
92212cdcb6 [MIRROR] Moves the spare ID inside the captain's locker (#5291)
* Moves the spare ID inside the captain's locker (#35219)

* Places captain's spare inside the locker

* Removes captain's spare from the map

* Added a missing (src)

* Moves the spare ID inside the captain's locker
2018-02-05 05:36:09 -06:00
CitadelStationBot
65f026c3ee [MIRROR] Mark pirate ship docking port non-timid (#5306)
* Mark pirate ship docking port non-timid

* Update pirate_ship.dmm

* Update pirate_ship.dmm
2018-02-05 05:35:17 -06:00
CitadelStationBot
98d18ee7e3 [MIRROR] Removes tripai landmark (#5280)
* Removes tripai landmark

* Update landmarks.dm
2018-02-05 04:44:31 -06:00
CitadelStationBot
fa38b8a2f3 [MIRROR] Readds the syndicate comms officer (#5290)
* Readds the syndicate comms officer

* Update listeningstation.dmm
2018-02-05 03:19:54 -06:00
CitadelStationBot
5385333a64 Fixes some broken accesses (#5287) 2018-02-05 02:25:16 -06:00
CitadelStationBot
c2f14117c4 [MIRROR] Lava map slights (#5273)
* Lava map slights (#35201)

* Updates a few maps a tad on lavaland

* Adds two freezers to syndicate lavaland for some chefing

* Lava map slights
2018-02-05 02:09:45 -06:00
CitadelStationBot
ec127471e8 Makes departemental lathes easier to access. (#5274) 2018-02-05 02:09:16 -06:00
CitadelStationBot
5aec2724c1 [MIRROR] The firelock on Box's circuit lab no longer covers up the room's airlock (#5270)
* Moves the circ. lab firelock down a tile (#35217)

* The firelock on Box's circuit lab no longer covers up the room's airlock
2018-02-04 23:02:01 -06:00
CitadelStationBot
799038ab26 [MIRROR] blasts away a double stacked blast door in atmosia (#5240)
* blasts away a double stacked blast door in atmosia

* blasts away a double stacked blast door in atmosia
2018-02-04 22:20:26 -06:00
CitadelStationBot
ba06d1cb97 [MIRROR] Listening fix (#5231)
* Removes ghost spawner from Syndicate listening ruin (#35083)

* Does what Kor says

* Other part of the fix if Kor wants it

* Does what KorPhearon wants

* Listening fix
2018-02-04 22:09:38 -06:00
CitadelStationBot
450fda474a [MIRROR] Corrects space tiles on Abandoned Teleporter (#5224)
* Corrects space tiles on Abandoned Teleporter

* Corrects space tiles on Abandoned Teleporter
2018-02-04 22:06:04 -06:00
deathride58
30ab115665 Makes Cit widescreen by default (#4374)
* updates title screen to be WIDESCREEN

* increase default size of view window

* widescreen fullscreen overlays

* and finally, the switch can be hit

* Update skin.dmf

* readds splitter=75, the main screen breaks without it
2018-02-04 21:29:48 -06:00
deathride58
09436512b4 Merge branch 'master' into TG-sync-testing 2018-02-03 01:52:44 +00:00
Zna12
5e06583dad What a mess. (#5238)
This should fix the issue of having the minerals and output coming out of the wrong sides of the ORM.
2018-02-01 06:20:43 -08:00
Poojawa
faccc43461 fucking github REEEEEEEEEEE 2018-01-31 18:33:46 -06:00
Poojawa
ebf5366e73 Delta was apparantly a github copy/paste wtf 2018-01-31 18:23:42 -06:00
Poojawa
ab0e0667f2 Makes Travis happy 2018-01-31 18:11:19 -06:00
Poojawa
cf537cd417 Removing abandon map. 2018-01-31 11:18:41 -06:00
Poojawa
d7659ac6b2 sync with master 2018-01-31 07:02:55 -06:00
Poojawa
56232d5d60 Maps and misc 2018-01-31 06:20:26 -06:00
LetterJay
391e317451 Merge pull request #5220 from Citadel-Station-13/upstream-merge-35113
[MIRROR] Morgue and Crematorium Repositions
2018-01-31 04:14:27 -06:00
LetterJay
3fa1dbb721 Merge pull request #5168 from Zna12/Cargo-ORM-Security
Cargo orm security
2018-01-31 03:02:48 -06:00
LetterJay
eb49ebcce5 Merge pull request #5158 from Citadel-Station-13/upstream-merge-35073
[MIRROR] Fixes bad APC name on Boxstation
2018-01-31 03:02:19 -06:00
LetterJay
a45e8527db Merge pull request #5121 from Citadel-Station-13/upstream-merge-34935
[MIRROR] OH GOD HOW DID THE MAPS GET SMALLER?
2018-01-31 03:02:10 -06:00
Jittai
f8bf40e7cc Morgue and Crematorium Repositions 2018-01-31 02:21:45 -06:00
Poojawa
a24788842b dogborg tweaks, so fuggin DUMB (#5202)
* apparantly you need shuttles, who knew

* some tweaks

Sprites need adjustments
Janidogs need adjustments in UI

* Hm, maybe a fix. Revert attempt to rename sprites

* [MIRROR] Better Chat Squashing (#5193)

* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing

* [MIRROR] Sexy Solar Sprites (#5191)

* replaced solar panel sprites with better ones

* Sexy Solar Sprites

* Automatic changelog generation for PR #5191 [ci skip]

* [MIRROR] New Coffin Sprite (#5190)

* coffins have a new sprite (#34995)

* New Coffin Sprite

* Automatic changelog generation for PR #5190 [ci skip]

* [MIRROR] Makes fire colorful and anime (#5187)

* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime

* Automatic changelog generation for PR #5187 [ci skip]

* [MIRROR] Expand Cyborg (#5183)

* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg

* Automatic changelog generation for PR #5183 [ci skip]

* [MIRROR] Cosmic Bedsheet (#5170)

* adds cosmic space bedsheet

* Cosmic Bedsheet

* [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174)

* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires

* Fuck this I'm done with it
2018-01-30 15:17:46 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Zna12
1a337792e6 Whoops.
Used the wrong flooring under the windows I added.
2018-01-28 22:39:27 -06:00
Zna12
a4cdb47aa7 Pubby Station ORM Security 2018-01-28 21:09:15 -06:00