Commit Graph

616 Commits

Author SHA1 Message Date
SkyratBot
e0f514671e [MIRROR] Creates offstation variants of the protolathe and circuit imprinter for offstation and ghost roles. (#3825)
* Creates offstation variants of the protolathe and circuit imprinter for offstation and ghost roles. (#57367)

* Creates offstation variants of the protolathe and circuit imprinter for offstation and ghost roles.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-03-04 01:02:30 +00:00
SkyratBot
6e1f80f43d [MIRROR] Lavaland clownplanet ruin no longer kills clowns (#3812)
* Lavaland clownplanet ruin no longer kills clowns (#57347)

The floors of the lavaland clown ruin now all contain normal gasmix so that the clowns defending the entrance won't die, also stopping unwanted miasma generation sources
closes #55448

* Lavaland clownplanet ruin no longer kills clowns

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-03-03 18:37:12 +00:00
SkyratBot
2b7905e6e1 [MIRROR] Fixes Lavaland ruin turf generation and round start active turfs (#3799)
* Lavaland ruin turf generation fixes (#57227)

A bunch of ruins were using the wrong areas which caused turf generation to fail when these ruins were used.

The xeno hive ruin also had several incorrect base turfs inside non-generated areas, which created round start active turfs.

Fix areas in lavaland ruin elite tumor
Fix areas in lavaland ruin surface puzzle
Fix areas in lavaland ruin random ripley
Remove template_noop from non-genned turfs on xeno hive (causes roundstart ATs)
Fixes xeno have having space as a base turf (more ATs)

* Fixes Lavaland ruin turf generation and round start active turfs

Co-authored-by: Maurukas <66576896+Maurukas@users.noreply.github.com>
2021-03-03 13:07:24 +00:00
Tom
7340f8c3db [SEMI-MODULAR] [READY] Space Hotel Rework (#3409)
* a

* :hhh:

* reworks hotel

* iron repath eee

* modularize

* arcade

* cables

* fills unused areas

* does this fix it 🤔

* pipe

* plants and office touchup

* bruh

* manager role

* adds a little carpet

* door access reqs

* original hotel revert

* gitkraken hates me

* swaps out flooring, adds some more lights

* plating

* modularisation

Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2021-03-03 05:00:11 +00:00
SkyratBot
438ce50872 [MIRROR] Fixes the Ratvar ruin on Lavaland (#3780)
* Fix ratvar ruin generation issues (#57233)

Creates a ruin area for the dead ratvar ruin map and remaps to it

* Fixes the Ratvar ruin on Lavaland

Co-authored-by: Maurukas <66576896+Maurukas@users.noreply.github.com>
2021-03-03 02:02:20 +00:00
SkyratBot
a05f7e863a [MIRROR] Fully implements the ID Card design document (#3729)
* Fully implements the ID Card design document

* Oh fuck that hurt.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-03 01:54:25 +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
SkyratBot
71a1936ecf [MIRROR] Fixes free buffers in reaction chambers (sorry!) (#3382)
* Fixes free buffers in reaction chambers (sorry!) (#56887)

* Fixes free buffers in reaction chambers (sorry!)

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
2021-02-15 15:19:51 +00:00
SkyratBot
6212496321 [MIRROR] Fixes the lavaland syndie base air injector (#3314)
* Fixes the lavaland syndie base air injector (#56835)

Fixes the air injector by making it part of an actual area in the syndie base, adds a plating on the tile the injector is on.
Creates a plating subtype with the lavaland atmos.
Replaces all var-edited platings in the lavaland syndicate base with the mentioned subtype.

* Fixes the lavaland syndie base air injector

Co-authored-by: SgtHunk <68669754+SgtHunk@users.noreply.github.com>
2021-02-12 12:53:33 +00:00
Gandalf
3cfd853bf3 MAJOR: Non-modular map hardset 09.02.2021 (#3219)
* Major map forcedate 09.02.21

* a
2021-02-09 00:50:46 +00:00
SkyratBot
cc9ef500c7 [MIRROR] repaths plasteel tiles to iron (#3155)
* repaths plasteel tiles to iron

* Update robot_modules.dm

* a

* fuck me

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:29:36 +00:00
SkyratBot
e83e1b7d41 Standardizes area paths and area-based nomenclature (#3125)
Co-authored-by: Son-of-Space <63861499+Son-of-Space@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 22:59:05 +00:00
SkyratBot
699cd1e412 [MIRROR] renames metal sheets to iron sheets (#3116)
* renames metal sheets to iron sheets

* Merge branch 'master' into upstream-merge-56643

* yay metal

* Update DeltaStation2_skyrat.dmm

* a

* Update CentCom_skyrat_z2.dmm

* a

* a

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 22:09:50 +00:00
SkyratBot
f4fd38b1a8 [MIRROR] Aquarium fish improvements (#3069)
* Aquarium fish improvements (#56573)

Co-authored-by: coiax <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>

* Aquarium fish improvements

* Update mapping_helpers.dm

* Update packs.dm

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-04 19:36:20 +00:00
SkyratBot
f18f2ad02f [MIRROR] Pipeguns: Elitism Edition (#3054)
* Pipeguns: Elitism Edition

* fixes

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-04 16:25:10 +00:00
Cheshify
d8b3ce1c63 Update to Abandoned Ship Ruin (#3018)
* Update to Abandoned Ship Ruin

Updates the whiteshipruin_box to whiteshipruin_box_skyrat, a more modern take on the outdated space ruin.

* Whoops, Fixed Spacing

removed some minor shitcode

* Embarrassing Myself With Indentations Pt2

One single space now removed.
2021-02-03 15:01:50 +00:00
SkyratBot
695bec646c [MIRROR] Redoes the atmos layering on Oldstation (#2895)
* Redoes the atmos layering on Oldstation (#56356)

* pipe dream

* broken pipes actually broken

* missed a scrubber

Co-authored-by: Cosmo <cosmo.rader@ yandex.com>

* Redoes the atmos layering on Oldstation

Co-authored-by: Potato-Masher <33107541+Potato-Masher@users.noreply.github.com>
Co-authored-by: Cosmo <cosmo.rader@ yandex.com>
2021-01-26 00:23:04 +00:00
SkyratBot
f79e91462c [MIRROR] LINDA Reforged (#2573)
* LINDA Reforged

* Update airlock.dm

* Update biohazard_blob_controller.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-08 18:52:35 +01:00
SkyratBot
d7f054b035 [MIRROR] Refactors monkeys into a species (#2379)
* Refactors monkeys into a species

* aaa

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-31 21:08:07 +01:00
SkyratBot
286dbbc937 [MIRROR] removes all dirty map var edits from the codebase and reverts pixel_x/y grep (#2294)
* removes all dirty map var edits from the codebase and reverts pixel_x/y grep (#55256)

* Revert "grep for pixelx/y = 0 varedits (#54845)"

This reverts commit 311b9da86b.

* part1

* part2

* part3

* Delete PubbyStation.dmm

* removes all dirty map var edits from the codebase and reverts pixel_x/y grep

Co-authored-by: Fikou <piotrbryla@onet.pl>
2020-12-24 00:40:41 +00:00
SkyratBot
0c53462374 [MIRROR] Refactors the procedural generation of lavaland and turf/closed/mineral (#2131)
* Refactor the procedural generation of lavaland and turf/closed/mineral (#54915)

This replaces lavaland's old diagonal tunnel gen which was really
horrendously jammed into asteroid floor code (?????) with Cellular
Automata which runs in rust (PR for that here:
https://github.com/tgstation/rust-g/pull/57 ). The new code is a bit
cleaner, but also looks better.

VID: https://streamable.com/a45ke2

Things to do:
- Make an icemoon version
- Fix the roundstart atmos adjacency issues

I asked AnturK if this was an acceptable PR for this month; he said it
was okay as long as I didn't add new areas, which I don't plan to do.
But if anyone thinks this PR breaks the spirit of the month I'll open
it again in december.

* Refactors the procedural generation of lavaland and turf/closed/mineral

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-12-11 06:10:38 +01:00
SkyratBot
2913364658 [MIRROR] Kills oldfood, Puts newfood on top. (#2041)
* Kills oldfood, Puts newfood on top. (#55160)

Slays the last of old-food, making new-food the new normal.

Co-authored-by: MrMelbert <kmelbert4@ gmail.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>

* Kills oldfood, Puts newfood on top.

* Update collars.dm

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: MrMelbert <kmelbert4@ gmail.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-04 16:46:26 +01:00
SkyratBot
c08400b0af [MIRROR] grep for pixelx/y = 0 varedits (#1978)
* grep for pixelx/y = 0 varedits (#54845)

Co-authored-by: Jordan Brown <Cyberboss@ users.noreply.github.com>

* grep for pixelx/y = 0 varedits

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Jordan Brown <Cyberboss@ users.noreply.github.com>
2020-11-30 23:01:57 +00:00
SkyratBot
2cf928b280 [MIRROR] Init sanity unit test (#1980)
* Init sanity unit test (#55147)

https://github.com/tgstation/TerraGov-Marine-Corps/pull/5326
Stemming from
https://github.com/ParadiseSS13/Paradise/pull/14770

Basically it just checks for bad initialize calls

* Init sanity unit test

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2020-11-30 23:01:45 +00:00
SkyratBot
65368300d2 [MIRROR] Refactors Pastries into newfood. (#1824)
* Refactors Pastries into newfood. (#54996)

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Floyd <Floydje123@ hotmail.com>

* Refactors Pastries into newfood.

* Update collars.dm

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Floyd <Floydje123@ hotmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-11-25 01:02:00 +00:00
SkyratBot
7d653f1f6b [MIRROR] Moves grown food to newfood (#1794)
* Moves grown food to newfood (#55040)

Moves grown food to newfood
Gives trash element support for callbacks for item creation override

* Moves grown food to newfood

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-11-23 22:35:35 +00:00
SkyratBot
89a8cb991a [MIRROR] moves misc food to newfood code (#1725)
* moves misc food to newfood code (#54788)

misc food is now using newfood code

* moves misc food to newfood code

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-11-19 07:21:23 +01:00
SkyratBot
bc8432243d [MIRROR] Fixes bathhouse ruin walls (#1681)
* Fixes bathhouse ruin walls (#54896)

* Fixes bathhouse ruin walls

Co-authored-by: wesoda25 <37246588+wesoda25@users.noreply.github.com>
2020-11-11 18:32:32 +01:00
SkyratBot
6b1e0272bb [MIRROR] Adds a few walls and airlocks to the big derelict space ruin to keep atmos diffs down when entered. (#1614)
* Adds a few walls and airlocks to the big derelict space ruin to keep atmos diffs down when entered. (#54749)

* Oh right the commit

* Removes snowflake pathing for alien resin window.

* Missed one.

* Actually this whole map is just a var-edit hell

* Adds a few walls and airlocks to the big derelict space ruin to keep atmos diffs down when entered.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-11-07 22:05:46 +00:00
SkyratBot
94fe50294d [MIRROR] Fixing GBJ cases where the disposal holder is forcemoved outside a pipe. (#1602)
* Fixing GBJ cases where the disposal holder is forcemoved outside a pipe. (#54643)

Title. Also turned movable/pipe_eject() into a comsig, since it was used only for gibs.

* Fixing GBJ cases where the disposal holder is forcemoved outside a pipe.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-11-07 05:06:41 +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
59f9a1700a [MIRROR] Gives the icebox hermit spawn a bucket (#1459)
* gives the icebox hermit spawn a bucket (#54559)

This PR gives the icebox hermit spawn a bucket.

* Gives the icebox hermit spawn a bucket

Co-authored-by: 81Denton <32391752+81Denton@users.noreply.github.com>
2020-10-25 11:10:13 +01:00
SkyratBot
5cbd4e7d77 [MIRROR] Fixes broken var-edited walls (#1260)
* Fixes broken var-edited walls (#54276)

* Fixes broken var-edited walls

* mistake

* no diagonal syndicate walls

* Fixes broken var-edited walls

Co-authored-by: Rob Bailey <actioninja@gmail.com>
2020-10-12 06:45:33 +02:00
SkyratBot
bba021046c [MIRROR] Converts Pizza to use the new food component. (#1205)
* Converts Pizza to use the new food component. (#53641)

pizzas now use processing component

* Converts Pizza to use the new food component.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2020-10-08 17:30:13 +02:00
SkyratBot
1143fe312b [MIRROR] Hilbert's Hotel Bag of Holding is now a raw bluespace anomaly core with an accompanying inert bag. (#1192)
* Hilbert's Hotel Bag of Holding is now a raw bluespace anomaly core with an accompanying inert bag. (#54194)

Swaps out Hilbert's Hotel Bag of Holding with a raw bluespace anomaly core with a matching inert bag of holding.

Tweaks various pixel_x and pixel_y values to place items more aesthetically on the tables.

* Hilbert's Hotel Bag of Holding is now a raw bluespace anomaly core with an accompanying inert bag.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-10-07 23:24:58 +02:00
SkyratBot
c4e85d51ae [MIRROR] Completely FIX Hilbert's Hotel and its associated ruin to the game. (#1111)
* Completely FIX Hilbert's Hotel and its associated ruin to the game. (#53830)

Reverts the removal in #53790.
Broken in #53586.

Because turfNumber++ must be incremented on turf, not on every ATOM it
EVERY TURF, and anyway it don't trigger since first turfs don't have
atoms in it.

Fix #53794, Hilbert's Hotel peephole runtime.
Fix #53795, hhmysteryRoomNumber generates only once.

* Completely FIX Hilbert's Hotel and its associated ruin to the game.

Co-authored-by: Dennok <Deneles@yandex.ru>
2020-10-02 14:56:57 +02:00
SkyratBot
9b5e36fcb7 [MIRROR] fixes a few map issues (#1081)
* Merge pull request #54055 from Fikou/randommaps

fixes a few map issues

* fixes a few map issues

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2020-09-30 18:29:51 +02:00
SkyratBot
ada67ac929 [MIRROR] Ports soup, snacks, icecream, salads and meat to newfood (#1074)
* Ports soup, snacks, icecream, salads and meat to newfood (#54028)

Ports soup, snacks, icecream, salads and meat to newfood

* Ports soup, snacks, icecream, salads and meat to newfood

* Update true_changeling.dm

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-09-30 14:37:15 +02:00
SkyratBot
b96909fb02 [MIRROR] [READY] Refactor icon smoothing to use 8-bit bitmasking (#1053)
* Merge pull request #53906 from Rohesie/smoothing

[READY] Refactor icon smoothing to use 8-bit bitmasking

* [READY] Refactor icon smoothing to use 8-bit bitmasking

Co-authored-by: nemvar <47324920+nemvar@users.noreply.github.com>
2020-09-29 22:55:58 +01:00
SkyratBot
e738ffa370 [MIRROR] Fixes for Syndicate Forgotten Ship (#1025)
* Fixes for Syndicate Forgotten Ship (#53832)

* Fixes missing implant on Syndicate Ship Captain:
  Syndicate Ship Crew Members have their implants. There are 2 boxes of syndicate firing pins in captains locker, but captain can't use them. This change fixes that. Captain had implant initially, but it was removed accidentally in #50597

Fixes spare magazines spawned in lockers:
  Captain has 2 mags for APS instead of 9mm mags in their locker.
  Crewmembers have 9mm mags instead of 10mm mags.
  10mm ammoboxes replaced with 9mm.
  Why do we even have 10mm mags, if crew spawns with makarov and captain spawns with APS.

* Fixes for Syndicate Forgotten Ship

Co-authored-by: antropod <antropod@gmail.com>
2020-09-28 18:11:08 +02:00
SkyratBot
dfb34d55ba [MIRROR] Fixes mapstart and random arcade machines (#1011)
* Fixes mapstart and random arcade machines (#53958)

Randomly generated arcade machines were getting random boards and initing properly, but they weren't re-built as the appropriate subtype.

This oversight has been remedied. A new subtype has been created for random arcade machines which exists purely to pick a random circuit then create a machine from that circuit's build path before returning that it should be qdel'd.

This new subtype has been appropriately regex find-and-replaced into all maps.
* Objectify

* Fixes mapstart and random arcade machines

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-09-27 19:18:44 +02:00
SkyratBot
13b96bfe01 [MIRROR] Rebalances space loot and space exploration (#981)
* Rebalances space loot and space exploration (#53916)

* Rebalances space loot and space exploration

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-09-25 14:34:13 +02:00
SkyratBot
7075bc3352 [MIRROR] Random ruins map templates fixes (#909)
* Random ruins map templates fixes (#53848)

* fix golem ship propulsion dir

* vaporwave tweak

replace space to noop, anchor statues

* spacehotel tweak

replace area to noop, place lattice under grille

* creahedship tweak

replace space to noop, remove  asteroid area from space

* vaporwave replace to noop

* replace turf space to noop

* replace space area and turf on shuttles

* replace space area and turf on teplates

* Random ruins map templates fixes

Co-authored-by: Dennok <Deneles@yandex.ru>
2020-09-21 18:28:09 +02:00
SkyratBot
3eb4b68b60 [MIRROR] Completely removes Hilbert's Hotel and its associated ruin from the game. (#881)
* Completely removes Hilbert's Hotel and its associated ruin from the game. (#53790)

The Hotel is a runtime machine. When it swaps rooms, its turfs runtime. When people are actively using it, things in it constantly runtime. It's half broken, half buggy. Turfs don't remember contents. Sometimes blank rooms spawn. Sometimes nothing at all.

It's not worth the time and effort to fix or maintain it.

I'm opening this PR to completely remove it.

* Completely removes Hilbert's Hotel and its associated ruin from the game.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-09-20 00:36:15 +01:00
SkyratBot
7847364fc2 [MIRROR] s-s-s-spaghetti to newfood (#818)
* s-s-s-spaghetti to newfood (#53574)

🆑 Qustinnus
code: Moves spaghetti to new food
fix: Fixes some more size problems on food
fix: Fixes organs having wrong params
/🆑

fixes #53482 fixes #53572

* s-s-s-spaghetti to newfood

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-09-16 03:41:02 +01:00
SkyratBot
0796bf7cd4 [MIRROR] Random whiteship selection (#789)
* Random whiteship selection (#53603)

Breaks shit if the deprecated map pr is merged before/after without me fixing it so only merge one of those

* Random whiteship selection

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2020-09-13 13:19:10 +02:00
SkyratBot
e60b9706b5 [MIRROR] Remove references to old singularity machines (#744)
* Remove references to old singularity machines (#53509)

Removes the singularity generator and the particle accelerator. The former had no sprite, and the latter only existed because of a leftover type path. This does not affect gameplay at all.

Removes the "Start Singularity" verb that was only intended for debug use.

Fixes #53508.

* Remove references to old singularity machines

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-09-11 23:15:33 +02:00
SkyratBot
8ae8bf1876 [MIRROR] Fixes the meat sprites on the crashed ship (#695)
* Fixes the meat sprites on the crashed ship (#53475)

* Fixes the meat sprites on the crashed ship

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-09-09 08:12:41 +02:00
SkyratBot
39c1a99020 [MIRROR] Moves over cakes to newfood and transfers reagents when crafting (#688)
* Moves over cakes to newfood and transfers reagents when crafting (#53316)

* Moves over cakes to newfood and transfers reagents when crafting

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
2020-09-09 08:09:36 +02:00
SkyratBot
24ebb910f3 [MIRROR] Expand number of pipe layers from 3 to 5 (#617)
* Expand number of pipe layers from 3 to 5

* Hardsyncs MetaStation

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-09-06 05:00:20 +02:00