Commit Graph

31 Commits

Author SHA1 Message Date
SkyratBot
48cf7ee691 [MIRROR] Spinward Threat Advisory: Making Dynamic Threat Announcements Make More Sense [MDB IGNORE] (#15345)
* Spinward Threat Advisory: Making Dynamic Threat Announcements Make More Sense (#68754)

* Spinward Threat Advisory: Making Dynamic Threat Announcements Make More Sense

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
2022-08-01 20:30:36 -07:00
Gandalf
a3e90a91f0 Automapper - IMPORTANT, READ ME [MDB IGNORE] (#14679)
* wew

* Update area_spawn_subsystem.dm

* Update area_spawn_subsystem.dm

* Update area_spawn_entries.dm

* wew

* Update area_spawn_entries.dm

* Update area_spawn_entries.dm

* Update area_spawn_entries.dm

* Update summon_beacon.dm

* yeees

* Update area_spawn_entries.dm

* qwqw

* e

* Update area_spawn_entries.dm

* Update area_spawn_entries.dm

* yes

* Update area_spawn_entries.dm

* Update area_spawn_entries.dm

* Update area_spawn_entries.dm

* Update area_spawn_entries.dm

* Update area_spawn_entries.dm

* automapper

* mmkay

* wew

* science post

* Update DeltaStation2_skyrat.dmm

* fc

* starting on delta

* Update metastation_science_post.dmm

* better loading system, metastation, delta, better file system

* unit tests, bugfixes, multiz support

* Update automapper.dm

* Update _compile_options.dm

* Kilo and tramstation

* wew

* Update area_spawn_entries.dm

* Update automapper_config.toml

* Update automapper_subsystem.dm

* Update Skyrat_Map_Reset.dmm

* remove redundant maps

* Update _basemap.dm

* wew

* Update automap_template.dm

* guard outposts no need

* wew

* NTR offices

* e

* Update area_spawn_entries.dm

* Update area_spawn_entries.dm

* Update icebox_ntrep_office.dmm

* 0

* iucebox arrivals fix

* Update area_spawn_entries.dm

* Update automap_template.dm

* Update readme.md
2022-07-06 15:24:57 +01:00
SkyratBot
84c8b1867e [MIRROR] Fixes centcom announcements referring to icebox as a station in orbit [MDB IGNORE] (#14104)
* Fixes centcom announcements referring to icebox as a station in orbit (#67528)

Fixes #67467

* Fixes centcom announcements referring to icebox as a station in orbit

Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
2022-06-06 00:07:01 +01:00
SkyratBot
f9171bc2ff [MIRROR] Fixes Cook CQC + job change config fixes [MDB IGNORE] (#13592)
* Fixes Cook CQC + job change config fixes

* Update _job.dm

* Update jobs.dm

* Update department_guards.dm

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-05-20 14:45:47 +01:00
Gandalf
cd45c0f943 Icebox reset (#13413)
* wew

* wew

* Update BlueShift_upper.dmm

* Update BlueShift_middle.dmm

* fff
2022-05-08 02:23:31 +01:00
SkyratBot
bca6a53e8e adds new z-level trait to disable parallax (#66637) (#13353)
* first push woohoo

* more stuff

* Update code/datums/components/z_parallax.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>

* mothblockification

* fuck

* fuck 2

* uh

* uh yeah style stuff ig

* more changes

* last changes

* fuck

* fuck 2

* i hate potatopotato

* i hate potato * 2

* a

* god

* woops

* Update code/modules/mapping/space_management/traits.dm

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>

* Update code/modules/mapping/space_management/traits.dm

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>

* Update code/modules/mapping/space_management/traits.dm

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>

Co-authored-by: magatsuchi <88991542+magatsuchi@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-05-07 22:14:14 +01:00
SkyratBot
702e8b5e88 [MIRROR] Makes the third level of icebox count as station [MDB IGNORE] (#13144)
* Makes the third level of icebox count as station (#66463)

Makes the third level of icebox function as a station level.

There are pros and cons to making the third level a station, but there were many reports from confused players that accidentally teleported the disk, lost their revolutionary rounds, etc., because we have station-esque structures on the third level but don't count it as a station.

While this fix does not completely solve the problem, it was requested so that we would remove the confusion and hopefully adopt a stronger solution in the near future.

* Makes the third level of icebox count as station

Co-authored-by: Son-of-Space <63861499+Son-of-Space@users.noreply.github.com>
2022-04-27 00:18:58 +01:00
Gandalf
7a5f0af503 Full SK map reset (#12493)
* Delete IcemoonUnderground_Above.dmm

* Revert "Delete IcemoonUnderground_Above.dmm"

This reverts commit e0f40c1c85d627d5f830a0658ff97e4eccd94309.

* Update _basemap.dm

* Delete IcemoonUnderground_Above.dmm

* reset

* Update _basemap.dm

* e

* tram

* Update _basemap.dm

* fex

* Update NSSJourney.dmm

* more fixes

* e
2022-04-02 09:53:39 +01:00
OrionTheFox
67e7ebdfaa [Semi-Modular] Advanced Shuttles Revamp, and new Advanced Shuttles! (#9951)
* clean up closets

* add new closets back

* it didnt use dir lights!?!?!

* bye bye

* name can be shorter reee

* com press

* HERE THEY COMEEEEE

* largemine/labor

* consign my love

* h

* tweakingsies

* better miining

* these look nice

* oops

* fix the evac shuttle tiles a bit (i still hate it)

* hngh

* i coulda sworn..

* exodus

* apostraphe

* area

* name

* clozet

* color consistency

* backwards ship moment

* fix my oops with the vents

SUS??

* this is cleaner

* typo moment

* note

* note, no-sell in cockpit, wall lockers

* jsons for crago

* oh hey thats broken cool

* map moment

* totally unrelated fix that I just wanna do here bc no one remembers it

* this doesnt actually work. Yet.

* ferry and readme fixes

* this doesnt work and I cant be bothered to fix it this second. Dunno how

* double period moment

* dir was wrong, oops

* map conversion moment

* CI fail moment

* h

* pain
2021-12-13 11:08:42 +00:00
cheapcents
763bc8773f New brig for Icebox :) (#8482)
* New brig for Icebox :)

* Fixes many many bugs

Undoes rollbacked changes to Icebox.
Fixes multiple APCs.
Wires on exterior reinforced windows.
Fixes all lights in sec.
Fixes all cameras in sec.
Removes basketball court as it blocks access to the library.
Fixes curtain buttons and their access, so only security can open them from the outside.
Changes TV into arcade machine.
Adds condimaster.
Adds breath masks.
Puts showers on the walls.
Moves techfab to office.
Returns office tables into something conference-style.
Fixes disposals from being broken.
Fixes mail sorting from being broken.
Fixes escape pods with incorrect area.
Fixes escape pod door having an rwall in it.

* Additional security

The brig has exterior windows electrified, same for the prison.
The courtroom, as it is an escape route for prisoners, has windows electrified.
Reinforces all exterior walls outside prison maint. Escape is now a little more difficult.
Maint doors outside the prison start bolted, and some planked up.
Adds a bit more loot in the maint outside the prison.
Re-adds xenoarch content in a much more subtle manner.
Adds disposals for the mining base, since I assume xenoarch needs a trash sy stem.

* Fixes more issues

Adds exit to space in courtroom.
Fixes missing fire alarms.
Fixes duplicate doors/lights.
Adds a fryer to prison kitchen.
Makes showers a little smaller so a curtain can be added.
Removes firelocks on maint doors.
Fixes turnstile IDs.

* mapmerge is hanging up

it's erroring on an issue that's been fixed.

* Create IcemoonUnderground_Above_skyrat.dmm

* one roundstart atmos difference yeeted

Co-authored-by: Kat <evesovereign@hotmail.co.uk>
2021-09-30 17:38:09 +01:00
Gandalf
8fe50110dc Reverts NTF roles and the NTF Cargo system pending OVERMAP. (#8342)
* EEEE

* Update CentCom_skyrat_z2.dmm
2021-09-23 01:17:59 +01:00
Gandalf
04b6a4f94a [MDB Ignore] TG AND SKYRAT MAP RESET 14/09/21 (#8143)
* RESET

* Update all_nodes.dm

* EEE
2021-09-14 01:33:28 +01:00
jjpark-kb
b7a5535922 modular icebox, xenoarch (#7603) 2021-08-17 18:48:32 +01:00
Gandalf
a43b8c5fc4 Nanotrasen Fleet Command Expansion (#7418)
* A

* Update centcom_computers.dm

* a

* Update CommandReportConsole.js

* commandreporter

* Update command_report_computer.dm

* a

* FEET COMMAND

* a

* e

* e

* Update departments.dm

* F

* a

* a

* Update new_player.dm

* Update new_player.dm

* AAAAAA

* Update zombie.dm

* Update zombie.dm

* aaaaaaa

* 0

* a

* Update CentCom_skyrat.dmm

* aa

* Update nsstitan.dmm

* A

* Update station_goal_computer.dm

* Update station_goal_computer.dm

* Update bridge_officer.dm

* Update CentCom_skyrat.dmm

* Update pda.dm

* Revert "Update pda.dm"

This reverts commit fbe1823726f9edb7f7c3ba03c2d34b08b46ae294.

* logic

* cargo system

* 0

* Update import_console.dm

* Update cargo_skyrat.dmm

* noob coder

* Update cargo_shuttle_console.dm

* a

* Update deck_crew.dm

* Update export_console.dm

* Update deck_crew.dm

* 0

* Update CentCom_skyrat_z2.dmm

* AAAA

* 0

* Update CentCom_skyrat_z2.dmm

* Update cargo_shuttle_console.dm

* Update CentCom_skyrat_z2.dmm

* a

* SELLING CREW IS BAD.

* a

* Update supply.dm

* Update CentCom_skyrat_z2.dmm

* Update supply.dm

* A

* a

* a

* Update zombie.dm

* Update modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-08-17 18:43:19 +01:00
SkyratBot
d8afc03274 [MIRROR] removes icebox having more prisoner slots (#4882)
* removes icebox having more prisoner slots (#58298)

* removes icebox having more prisoner slots

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-04-13 11:43:47 +01:00
SkyratBot
9fe97850b2 [MIRROR] stations name their respective celestial bodies (#4881)
* stations name their respective celestial bodies (#58168)

* stations name their respective celestial bodies

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-04-13 11:43:19 +01:00
Gandalf
8d015d6610 TG MAP RESET - MAPPERS READ THIS (#4695)
* aaaa

* aaaaaaaaa

* Update tilecoloring.dm

* aaa

* fuck this

* Delete outpoststation.json

* Delete whiteship_outpost.dmm

* Update whiteship_ship.dmm

* Update CentCom_skyrat_z2.dmm
2021-04-06 13:23:12 +01:00
SkyratBot
d950f4e22f [MIRROR] Fixes broken CQC area on Icebox (#4329)
* Fixes broken CQC area on Icebox (#57876)

#57593 added CQC whitelists to each map, but the whitelisted area on Icebox (/area/service/kitchen/tourist_seating_area)... doesn't exist. This changes that area to the actually used area.

* Fixes broken CQC area on Icebox

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
2021-03-22 17:54:12 +00:00
SkyratBot
8257a81855 [MIRROR] Moves chef's CQC area whitelist into the mapping config and better balances chef CQC as a result. (#4113)
* Moves chef's CQC area whitelist into the mapping config and better balances chef CQC as a result.

* a

* a

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-14 00:35:48 +00:00
Gandalf
1dd44a9c33 Map reset and Blueshield fix (#4029)
* a

* Update security.dm
2021-03-10 12:12:47 +00:00
SkyratBot
fc2fc8db6b [MIRROR] Icebox QoL minus features (#3459)
* Icebox QoL minus features (#56472)

* Icebox QoL minus features

Co-authored-by: Whoneedspacee <yougotreallyowned@gmail.com>
2021-02-21 22:02:33 +00:00
BluBerry016
58dcb5b01f Modularizes Icebox's underground (#2900) 2021-01-28 22:39:59 +00:00
Gandalf
3b84246d4d Modular Maps (#2890)
* Modular Maps

* Update readme.md
2021-01-25 20:53:33 +01:00
SkyratBot
dda3c0ac80 [MIRROR] icebox's second level counts as station too (#1590)
* icebox's second level counts as station too (#54779)

* icebox's second level counts as station too

Co-authored-by: Fikou <piotrbryla@onet.pl>
2020-11-07 00:31:55 +00:00
SkyratBot
30fc6c78ac [MIRROR] Turns transparency for turfs into an element, and gives it to datum materials. (#1567)
* Turns transparency for turfs into an element, and gives it to datum materials. (#54250)

* Turns transparency for turfs into an element, and gives it to datum materials.

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-11-04 00:33:49 +00:00
SkyratBot
ed99a59ae9 [MIRROR] Out of repo maps part 1: JSON Improvements (#1432)
* Out of repo maps part 1: JSON Improvements (#53663)

Replaces the map job changes code system with a JSON based one.
Added map versioning to the config JSON.
Formats map config JSONs.

* Out of repo maps part 1: JSON Improvements

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-10-23 05:08:50 +01:00
Gandalf
3ea925ffee map quick fix (#1014) 2020-09-27 23:40:15 +02:00
SkyratBot
541fd986f6 [MIRROR] Icebox multi-z mining now obeys the laws of gravity. (#951)
* Icebox mining now obeys the laws of gravity. (#53590)

* Icebox multi-z mining now obeys the laws of gravity.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-09-24 20:23:03 +02:00
Azarak
bb7d31d992 maintained modular maps moment (#890)
* weh

* Update _basemap.dm
2020-09-20 03:04:52 +01:00
Useroth
c5935de7df Initial modularization of the maps. (#487)
* Let's modularize the big 4 maps.

* Let's add a z-level for all our off-station stuff.

* Let's format this to conform to the original

* Rename PubbyStation_Skyrat.dmm to PubbyStation_skyrat.dmm

* did a fucky wucky while renaming maps

* removed unnecessarily changed newline
2020-08-24 03:24:05 +01:00
Whoneedspacee
8af93a638b Icebox Station (#51090)
* there was an attempt

* adds ice moon map

adds config options for choosing mining maps

areas now have options that affect random generation on them

weather now has an option to not target indoor areas

adds base for icemoon ruins

turns many 1's into booleans

adds ice chasms

adds ztraits for weather stuff

* fixes up ice ruins to be ice moon compatible

adds lower z level to the ice moon mine

ice chasms now have a smoothed icon

megafauna only spawn in the underground portion of ice moon now

* openspace fixes

* adds new areas and underground specific ruins

* Adds the abandoned village ruin for Ice Moon

* adds abandoned village ruin and fixes some area and tile stuff to work with ice moon

* random mining maps are no longer picked in the config

you can no longer change the mining map before setup is complete

* adds above and below ground ruin as a test

* adds debug functionality for ice moon ruins

fixes a bug where multiz was impossible unless there were shared areas because of whitelisted areas

adds multiple whitelist areas for ruin placement in a list

all underground areas are now outdoors

underground plasma lava rivers are now only spawned in unexplored areas so ruins don't get destroyed by them

* adds unique spawners to icemoon to replace tendrils

adds 2 new mobs to icemoon the polar bear and wolf

adds a clothing flag for shoes that dont slip on ice

modifies mining site to be ready except for the boss

adds the ability for tunnel width to be a specification, ice moon can have 1 tile wide tunnels and rarely 2 wide tunnels

adds a no caves mineral for ice moon ruins

* wolves no longer run into lava or chasms

bears now enrage sooner

bear spawners can now actually be created

adds base for ice moon atmospherics

adds base for a new boss and achievements / score

really bad coder icon for ice boots added

* ice moon now has it's own planetary atmos! (thank god)

* new frost miner stuff

megafauna recovery time can now be tailored to have different cooldowns to ranged or melee attacks
by default sets both of them, with two arguments the first is ranged cooldown and the second is melee cooldown

* converts a bunch of lavaland maps to be compatible with ice moon

adds tendrils from lavaland to the bottom of ice moon with the other megafauna

* updates mob drops for ice moon mobs

updates config entry default value for ice moon

updates ice moon map to have new gulag

* updates station parallax for icemoon

removes extra lavaland ported ruins

updates to demonic frost miner

adds ladder to icemoon map near station

* updates ice moon map to have the ladder inside the mining base

plant flora dont spawn on the lower z level of ice moon now

you get sand from mining rocks now

buncha demonic frost miner changes holy cow

* adds the buried library

* improves map, fixes comment

* make this crap work with the station cause i have to lol it is pretty cool though and now i understand the mapping crap better

* updates ice ruin blacklist

* ice moon stop being too cold thanks

icebox changes, now actually has its own z level that can spawn ruins and such instead of just being openspace

tunnel width is now not stupid

* fixes a demonic frost miner bug where orbs werent exploding after death

atmosphere temp is now correct

fixes library ruin for icemoon

polar bear range is now fixed, only aggros in a short range and follows further than 3 tiles

reverts necropolis chest change

* Adds a new ruin: bathouse, barebones edition

* adds many new ruins

fixes a bug with tunnel creation that caused it to enter no tunnel allowed areas

finishes the frost miner and adds loot to him

you can now force a wabbajack option

* main z level now always has gravity for ice box

* hopefully the hot springs arent the buggiest thing in the world anymore

protects areas near the station from having openspace

* icebox takes less players

fixes the ladder positioning on every icemoon map

* snowstorms now only occur on the station level

fixes some issues with the icebox z level having openspace over the lower level mining base

* Update code/datums/map_config.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/datums/ruins/lavaland.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/game/objects/structures/lavaland/necropolis_tendril.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/game/turfs/closed/minerals.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/game/turfs/open/chasm.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/game/turfs/open/floor/plating/asteroid.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* Update code/modules/ruins/icemoonruin_code/hotsprings.dm

Co-Authored-By: spookydonut <github@spooksoftware.com>

* fixes areas on the lust ruin

polar bears now drop a goliath plate equivalent

wolfs now drop a watcher sinew equivalent

adds snow legions

adds a crusher trophy for the demonic frost miner that prevents movement

fixes a bug with asteroid mobs where the aggro icon would never show

adds ice to the snow cave tunnel generation

* starts work on the wendigo megafauna

* replaces snowball machine gun with more miner useful content

adds gentle var for knockback to prevent stunning on hit

polar bears move slower now

new icon for phase 2 demonic miner now

* fixes lust ruin areas

fixes whitespace

fixes nesting issues

adds underground specific mobs

* name / location fixes

demonic frost miner doesnt stun on knockback now

ice demons move faster

* fixes icebox having the wrong baseturf

* adds achievement defines to the wendigo

snowstorm for the lower z level again

adds a new helper for ranged target turfs

theres now a specific subtype for rivers

fixes a bug where ice and spawners spawned with rocks and other flora on top of them

adds indestructible ice rock turf

fixes a bug with ice demons teleport distance being incorrect

adds the start of wendigos attacks

* Apply suggestions from code review

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Update code/modules/mapping/ruins.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Fixes a dumb bug with ruins from a webedit review

The syndicate shuttle can now land on mineral turfs

* the final commit, all that im going to change after this is documentation for procs lol

makes both ice moon z levels below the station underground, and makes it so they generate rivers of their baseturf

* adds nice animation to wendigo scream

* small fixes

* finishes autodoccing everything i could find

* ok im done for real now

* adds anywhere ruins

does review stuff

* review stuff

* ok it removes the stuff now

* fix removal

* fixes from the git

* adds surroundings to the asteroid and lavaland sites

adds butchering gloves to wrath ruins

the lower icebox levels are no longer station levels

fixes capitals on blood drunk and frost miner boss medals

adds engineering outpost ruin by trollbreeder

adds boxstation job changes to icebox

polar bear transformation no longer has immunity to lavaland mobs

fixes ice whelp spelling mistake

* fixes engi outpost atmospherics

fixes missing plating on solar panels

changes slowdown for icemoon turfs

* fixes ruins areas so tunnels can spawn into some of them

adds lights to icebox below area

openspace turfs mine the thing below them now

* fixes wall boundings on asteroid and lavaland domes

* ur lame armhulen

* adds public mining area to icebox

adds computer vendors to icebox

* minor fixes

* fixes map type error

* removes slowdown entirely

increases ore chances

fixes openspace on main map

fixes a ton of active turfs at roundstart

modifies demonic frost miner loot to be cooler and more useful since the boss was hardly killed during tests

tunnels are wider underground now

openspace now deletes itself if it spawns above a ruin

* improve da ruins

* tries to fix multiple atmos issues with ruins

removes bz from the planetary atmos since it could cause unstoppable chain reactions which would cause massive lag

demonic frost miner drill now automatically scans everywhere around you

fixes tunnel generation issue

makes it so randomly generated turfs inherit their no_ruins flags

Co-authored-by: Jonathan Church <jchurch093@gmail.com>
Co-authored-by: s <wesoda24@gmail.com>
Co-authored-by: spookydonut <github@spooksoftware.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-05-22 02:17:15 -07:00