Commit Graph

70 Commits

Author SHA1 Message Date
kevinz000
eff86a449f wew 2020-01-14 16:45:22 -07:00
r4d6
383e09651f Suggestions 2019-12-21 14:55:37 -05:00
r4d6
22d89a9435 Add the stuff to seed the station with rooms 2019-12-19 15:26:43 -05:00
Ghommie
3e6a298a6d one line shuttle fix port 2019-11-16 17:18:26 +01:00
Ghommie
17e794bd59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-31 01:43:44 +01:00
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
2019-10-29 21:42:32 -07:00
Ghommie
4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
deathride58
39794a1dd8 150 hours of testing 2019-10-23 15:21:18 -04:00
deathride58
68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
Ghommie
28d3747c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-06-24 16:55:10 +02:00
Ghom
2845428c03 ports "Improve efficiency of SSmapping init" (#8651) 2019-06-17 11:18:28 -07:00
Ghommie
ba3a2c00bb ports in the Hilbert's Hotel. 2019-06-16 10:50:59 +02:00
Ghommie
b5e3da68bd Ports "areas_in_z after start population fix" 2019-06-16 08:45:37 +02:00
deathride58
5d9e3e0092 realistic transit turfs - transit turfs will now physically throw you out of the transit area instead of simply teleporting you 2019-02-21 01:38:18 -05:00
Poojawa
bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa
09512a6001 Controllers 2018-09-11 02:04:10 -05:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
63013f8964 everything to controllers 2018-07-02 00:10:31 -04:00
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130)
* Transit space refactor

* Update bitfields.dm
2018-06-18 11:51:02 -07:00
KorPhaeron
4b38136d79 Only load Reebe during clock cult (#38156)
* Only load clock cult during clock cult

* Return FALSE
2018-06-03 09:02:55 -05:00
Jordan Brown
da2ea729ee Merge pull request #37561 from AnturK/customloadingfix
Fixes loading custom aways.
2018-04-30 21:19:05 -05:00
Poojawa
e5f9765d2a datums/controller stuff 2018-04-23 00:02:42 -05:00
AnturK
54ef24b75a Adds a note if the loaded away is custom or not in the logs. (#37305) 2018-04-22 19:17:05 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
deathride58
57f0cc35b5 Update mapping.dm 2018-04-06 20:54:12 -04:00
AnturK
0efb82be90 Logs the load away mission verb. 2018-04-06 00:44:06 -05:00
Tad Hardesty
6402912a32 Allow configuring ruin/empty space level count - #36191
Allows map configs to set how many ruin levels (def. 7) and how many empty levels (def. 1) that will be created. Most useful for landlocked stations, event/one-off stations with unusual composition, or testing situations such as RuntimeStation.
2018-03-07 01:48:13 -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
ShizCalev
c0b4dd9cc5 Adds /area/asteroid/nearstation to blacklist (#34726) 2018-01-22 12:00:43 -06:00
deathride58
28751ba370 Merge pull request #5001 from Citadel-Station-13/upstream-merge-34633
[MIRROR] Refactor weather to use Z traits, assorted related cleanup
2018-01-21 22:42:53 +00:00
Tad Hardesty
4451aca2e8 Refactor weather to use Z traits, assorted related cleanup (#34633)
* Add a proc for getting the station center

* Add a couple of comments to ZTRAIT defines

* Remove unused global_map list

* Refactor weather to use the trait system

* Un-hardcode the transit z-level

* Use Z traits to determine Portal Storm event areas

* Fix loading away missions containing anything that reads traits
2018-01-21 13:34:04 -06:00
Jordan Brown
8dead1da6a Config dir again except this time it works 2018-01-21 12:32:29 -06:00
Jordan Brown
f706605227 Low memory mode 2018-01-19 09:12:37 -06:00
deathride58
0c56db4f9b Merge pull request #4764 from Citadel-Station-13/upstream-merge-34090
[MIRROR] Replace hardcoded z-level numbers with a trait system
2018-01-12 17:41:28 +00:00
Tad Hardesty
72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
Jordan Brown
d8c3157741 Fixes error if next_map.json is missing (#34222) 2018-01-11 07:39:22 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
Leo
521277292d Revises the_station_areas list 2017-11-24 14:12:53 -06:00
swindly
3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
Emmett Gaines
6f940baa0a New ambience for ash storms (#32213)
song name?
2017-10-30 15:22:23 -05:00
LetterJay
04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
KorPhaeron
d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
kevinz000
93647d77ad [DNM] Fixes the codebase (#2556)
* fixes stuff

* goddamnit flags
2017-08-30 00:08:40 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458)
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
ca2d03a082 Moves transit space to separate z level. (#1696) 2017-06-30 20:56:45 -07:00