Commit Graph

107 Commits

Author SHA1 Message Date
deathride58
64ab4a32a3 Fixes centcom zlevel hyperspace not instantly teleporting mobs out of the z-level (and also fixes the title screen while im at it) 2019-03-04 21:38:34 -05:00
Tupinambis
0b097338fa Please for the love of fuck remove cit map files or triple gay. 2018-10-06 21:26:19 -05:00
Tupinambis
10a887995f Makes the nuke op base cooler and more immersive and such. Enjoy 2018-10-06 19:56:25 -05:00
Poojawa
d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa
c836a7e5ea Cleans up map errors
Knowing my fucking luck it ain't all of 'em
2018-09-20 04:28:02 -05:00
Poojawa
b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -05:00
Poojawa
fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
deathride58
8d8035950e Fixes centcom titlescreen resolution, finally 2018-07-05 04:23:12 -04:00
deathride58
db2a15d42d maps, tools, goon folder, icons, sounds, and strings. everything except code 2018-07-01 23:54:31 -04:00
Cw 3040
011d5691ed Ninja Holding Area Change (#7088)
bathroom's turfs changed from /turf/.../plasteel/airless/white to
/turf/.../plasteel/white like they should be
2018-06-14 09:57:01 -07:00
LetterJay
3b498f2288 map fix 2018-06-02 05:41:31 -05:00
Cruix
9c4f4ce17f AI Multicamera mode (#37695)
* Added multicamera mode for AIs

* Minor multicamera fixes

* Cameras near an AI multicamera eye now light up red

* Disabled AI multicamera mode without admin intervention

* Fixed AIs being able to use multicamera mode when they should not
2018-05-31 22:41:48 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
oranges
e0c31c2b3a Merge pull request #37984 from AutomaticFrenzy/patch/thunderdome
Fix entertainment monitors viewing the wrong Thunderdome
2018-05-23 05:15:46 -05:00
GrayRachnid
a7196f0d4c Unlocks the booze locker 2018-05-07 12:29:36 -04:00
GrayRachnid
e22259a77d mapmerger 2018-05-06 16:37:44 -04:00
GrayRachnid
41ce1b1e5b Now ready for all your ERP needs. 2018-05-06 16:20:49 -04:00
pigeons
2702788dac Removes stock market 2018-05-02 17:48:55 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa
b1d64e221a core maps updated. Lavaland mining base now has cryo 2018-04-23 04:30:03 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
CitadelStationBot
1d6d8b454c [MIRROR] Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE (#6017)
* Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE

* FUCK (#36483)

F A L S E
semicolon be gone
2018-03-19 21:12:46 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
deathride58
7b9dac0a47 Makes the titlescreen properly positioned for widescreen again (#5874)
* Makes the titlescreen properly positioned for widescreen again

* Appeases Pooj, requests knot
2018-03-13 18:38:49 -05:00
CitadelStationBot
227b09860e [MIRROR] Makes the assault pod docking port non-timid (#5742)
* Makes the assault pod docking port non-timid (#36045)

* Makes the assault pod docking port non-timid
2018-03-02 18:32:12 -06:00
ShizCalev
d2ba2bf0c1 [s] Cameranet fixes (#35733) 2018-02-21 07:31:27 -06:00
Poojawa
7d488e8f4c Citadel'd Maps from #5523 (#5551)
* #5523 commit + sanity upload

* reee

* Syncs home brew CItadel changes

* updates cit_map_files

* reee.
2018-02-17 18:04:28 -06:00
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
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
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
Poojawa
56232d5d60 Maps and misc 2018-01-31 06:20:26 -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
MMMiracles
521e309da4 baseturf editors on syndicate base (#34815) 2018-01-24 15:43:33 -06:00
oranges
c9afc3e53d Merge pull request #34319 from ShizCalev/travis-maps
Fails travis on common mapping mistakes
2018-01-16 14:37:26 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
deathride58
a8154d102a Merge pull request #4531 from Citadel-Station-13/upstream-merge-33777
[MIRROR] Arena shuttle teleport fix
2017-12-28 02:53:47 +00:00
Tad Hardesty
9a14a721c2 Improve parts of CentCom's appearance slightly (#33832)
- Fixed missing icon_states on indestructible windows, so they appear
  properly in the editor.
- Increased the symmetry of the Syndicate Infiltrator's areas.
- Pointed a few more computers in the correct direction.
- Removed unused keys so future changes will go more smoothly.
2017-12-26 13:51:13 -06:00
Emmett Gaines
a1ec5538a6 Arena shuttle teleport fix (#33777) 2017-12-25 19:12:20 -06:00
WJohn
6cfd346bdd Tweaks the syndicate infiltrator so it's no longer lopsided. (#33731) 2017-12-22 10:35:47 -06:00
Armhulen
8a0aa32335 Mi-go 2017-12-17 04:11:01 -06:00
deathride58
d6573f602d Merge pull request #4313 from Citadel-Station-13/upstream-merge-33148
[MIRROR] Allowed shuttle docking ports to be hidden from some shuttle docking computers
2017-12-10 23:50:20 +00:00
Cruix
746e57bd86 Allowed shuttle docking ports to be hidden from some shuttle docking computers 2017-12-10 14:23:08 -06:00
Ashe Higgs
0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
kevinz000
66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
ShizCalev
1b094a4374 Fixes deleted turfs 2017-11-22 22:01:05 -06:00
ShizCalev
8a83b50113 Stacked turf cleanup (#32933) 2017-11-21 22:28:48 -06:00
WJohn
e8ddae5d98 Cleans up floors.dmi a bit and adds new turf decals. 2017-11-20 20:48:06 -06:00
deathride58
fb62491701 manual map syncs + manual missed pr mirrors 2017-11-17 21:34:49 -05:00
ACCount
a3783943a7 Internal map improvements (#32310)
* Internal map improvements

* More map sheet fixes

* PubbyStation fix

* More map fixes
2017-11-02 01:23:30 -05:00
deathride58
930f6405b2 Map syncs 1 - initial commit, hard sync with TG 2017-10-23 12:47:38 -04:00