Commit Graph
4357 Commits
Author SHA1 Message Date
6937b72f39 [MIRROR] Removes capitalisation from stasis bed name (#1528)
* Removes capitalisation from stasis bed name (#54680)

About The Pull Request

Makes the name of the lifeform stasis unit lowercase like all other improper nouns.
Why It's Good For The Game

Consistency, I guess

* Removes capitalisation from stasis bed name

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
2020-11-01 11:26:59 +01:00
a188fb6194 [MIRROR] Minor Fixes to Deltastation (A Minor Map Fixes Spinoff) (#1527)
* delta redux (#54696)

* Minor Fixes to Deltastation (A Minor Map Fixes Spinoff)

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
2020-11-01 11:26:36 +01:00
45fe5aefe4 [MIRROR] Assistants no longer spawn in the chapel on Pubby (#1515)
* Assistants no longer spawn in the chapel on Pubby #54674

Assistants no longer spawn in the chapel on Pubby

* Assistants no longer spawn in the chapel on Pubby

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2020-10-30 02:34:40 +00:00
84c4032cea [MIRROR] Removes doubled up table and duplicate holopad on meta (#1497)
* Removes doubled up table and duplicate holopad on meta (#54624)

* Removes doubled up table and duplicate holopad on meta

Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
2020-10-27 22:52:13 +00:00
5e5af7c1a9 [MIRROR] Replaces var edited mass driver machinery with subtypes (#1489)
* Replaces var edited mass driver machinery with subtypes (#54557)

This PR replaces var edited mass driver machinery with proper subtypes.
It also fixes the Pubby toxins pod door toggle. Turns out the mass driver control range was a few tiles too short.

* Replaces var edited mass driver machinery with subtypes

Co-authored-by: 81Denton <32391752+81Denton@users.noreply.github.com>
2020-10-27 09:08:58 +00:00
44568d35d1 [MIRROR] Fixes EVA windoors requiring bridge access (#1466)
* Fixes EVA windoors requiring bridge access (#54443)

* fixes windoors and shutters requiring bridge access

* revert shutter access

* Fixes EVA windoors requiring bridge access

Co-authored-by: tattlemothe <66640614+dragomagol@users.noreply.github.com>
2020-10-26 09:09:14 +01:00
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
9e70e38cea [MIRROR] Removes duplicate chair on Meta (#1456)
* Removes duplicate chair on Meta (#54555)

Co-authored-by: Denton <d@ ent.on>

* Removes duplicate chair on Meta

Co-authored-by: 81Denton <32391752+81Denton@users.noreply.github.com>
Co-authored-by: Denton <d@ ent.on>
2020-10-25 11:05:33 +01:00
1536a524d4 [MIRROR] Arconomy: Civilian Bounty Redux and full replacement of cargo bounties. (#1429)
* Arconomy: Civilian Bounty Redux and full replacement of cargo bounties.

* a

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-10-23 12:49:18 +02:00
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
56c3c19634 [MIRROR] Anonymizes chapel intercom, so chaplain doesn't know who's talking. (#1402)
* Anonymizes chapel intercom, so chaplain doesn't know who's talking. (#54476)

Adds support for radio's that anonimize the user, and adds one to every chapel.
It adds a new layer of immersion, and the option to anonizmie the speaker adds new options for mappers.

* Anonymizes chapel intercom, so chaplain doesn't know who's talking.

Co-authored-by: EdgeLordExe <42111655+EdgeLordExe@users.noreply.github.com>
2020-10-21 07:07:19 +02:00
717c31d40c [MIRROR] Adds the New-and-Improved Training Machine, Training Toolbox! (#1345)
* Adds the New-and-Improved Training Machine, Training Toolbox! (#54133)

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@ gmail.com>

* Adds the New-and-Improved Training Machine, Training Toolbox!

Co-authored-by: Emmanuel S <mrdoomboyo@gmail.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@ gmail.com>
2020-10-17 00:39:34 +01:00
eb92ea9cb8 [MIRROR] adds more cursed animal masks (#1335)
* adds more cursed animal masks (#53539)

Animal masks refactor

* adds more cursed animal masks

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2020-10-15 22:12:00 +01:00
ae61b17587 [MIRROR] Shuttle tweak and fix (#1330)
* Shuttle tweak and fix (#54395)

Fix lavaland podding
Make lavaland pod destinations hidden
Removed unused variables from connect_to_shuttle() proc
Shuttle consoles remove old custom port id from possible destinations when connects to new shuttle
Custom ports keeps clear from unwanted numbers.
Now shuttle machinery property connects to additional loaded shuttles.
Add some docking_port register logging and safety.

* Shuttle tweak and fix

Co-authored-by: Dennok <Deneles@yandex.ru>
2020-10-15 22:09:49 +01:00
5ee92c9e75 [MIRROR] Gives the BYO Shuttle an emergency shuttle console (#1312)
* Gives the BYO Shuttle an emergency shuttle console (#54247)

* Gives the BYO Shuttle an emergency shuttle console

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2020-10-15 08:36:51 +02:00
8e3e25f823 [MIRROR] Allows Main Pubbystation cargo doors to be opened with EITHER cargo or mining access (#1280)
* Allows Main Pubbystation cargo doors to be opened with EITHER cargo or mining access (#54256)

* Allows Main Pubbystation cargo doors to be opened with EITHER cargo or mining access

Co-authored-by: tattlemothe <66640614+dragomagol@users.noreply.github.com>
2020-10-13 02:16:05 +02:00
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
af10aaa419 [MIRROR] Fixes Holodeck Carpets + the Lounge Carpet Area (#1251)
* Fixes holocarpet smoothing + fixes holodeck lounge carpet area (#54295)

* Fixes Holodeck Carpets + the Lounge Carpet Area

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2020-10-11 23:06:49 +01:00
04855c4e2a [MIRROR] Fixes pods not docking at centcomm (#1218)
* Merge pull request #54228 from msgerbs/podsnowork

Fixes pods not docking at centcomm

* Fixes pods not docking at centcomm

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2020-10-09 18:29:33 +02:00
d40d455d68 [MIRROR] Fixes a map board that was oriented the wrong way (#1211)
* Fixes a map board that was oriented the wrong way (#54180)

* Update Lavaland.dmm

* REE SPELLING

* Fixes a map board that was oriented the wrong way

Co-authored-by: FloranOtten <38219334+FloranOtten@users.noreply.github.com>
2020-10-08 22:14:29 +01:00
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
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
f86ec85ac9 [MIRROR] Fixes cold room and freezer air alarms (#1182)
* Fixes cold room and freezer air alarms (#54210)

Cold room air alarm no longer wants to be at -60C, now has more reasonable temp thresholds set for the -14C default freezer temp (only meta uses this currently). Also replaces the meta medbay freezer with the cold room air alarm subtype.

Air alarms going off by default is bad.

* Fixes cold room and freezer air alarms

Co-authored-by: msgerbs <msgerbs@users.noreply.github.com>
2020-10-07 15:57:29 +02:00
df8ba346b7 [MIRROR] Brings back the Disco Inferno shuttle, but as an admin-only shuttle (#1178)
* Brings back the Disco Inferno shuttle, but as an admin-only shuttle (#54003)

* Brings back the Disco Inferno shuttle, but as an admin-only shuttle

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2020-10-07 06:17:12 +02:00
e3f8b4c96c [MIRROR] Adds tank holders (#1177)
* Merge pull request #54048 from nicbn/tank-frames

Adds tank holders

* Adds tank holders

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2020-10-07 01:11:16 +02:00
7028fe6a34 [MIRROR] Zeta Shuttle Stasis Update (#1176)
* Zeta Shuttle Stasis Update (#54187)

* Zeta Shuttle Stasis Update

Co-authored-by: Hulkamania <39933245+JetBrody@users.noreply.github.com>
2020-10-07 00:15:21 +02:00
cab50f9c52 [MIRROR] Adds Shuttle 667 as a buyable shuttle for dispelling a cult rune (#1150)
* Adds Shuttle 667 as a buyable shuttle for dispelling a cult rune (#53975)

* Adds Shuttle 667 as a buyable shuttle for dispelling a cult rune

* Add stasis beds

* Fix forcefields going away, leading to hull breaches

* Use set instead of list

* Use subtype for forcefield walls

* Adds Shuttle 667 as a buyable shuttle for dispelling a cult rune

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-10-04 15:24:15 +02:00
5f428c16f0 [MIRROR] Adds Uncle Pete's Rollerdome, a replacement for Disco Inferno (#1144)
* Adds Uncle Pete's Rollerdome, a replacement for Disco Inferno (#54145)

* Adds Uncle Pete's Rollerdome, a replacement for Disco Inferno

* Adds Uncle Pete's Rollerdome, a replacement for Disco Inferno

Co-authored-by: TheVekter <TheVekter@users.noreply.github.com>
2020-10-03 21:43:13 +02:00
c75a246324 [MIRROR] Minor Pubby Map Fixes (#1130)
* Merge pull request #54112 from Maurukas/pubbyfixes1

Minor Pubby Map Fixes

* Minor Pubby Map Fixes

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2020-10-03 13:58:16 +02:00
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
6aaa259b1e [MIRROR] Some minor fixes to Meta's permabrig. (#1095)
* Some minor fixes to Meta's permabrig. (#54088)

* fixes up Meta's permabrig

* replaces the station intercom in the garden with a prison intercom

* Some minor fixes to Meta's permabrig.

Co-authored-by: sergeirocks100 <31294280+sergeirocks100@users.noreply.github.com>
2020-10-01 12:25:19 +02:00
dd39e6f07e [MIRROR] Adds separate aux base access (#1084)
* Merge pull request #54049 from kriskog/auxbase

Adds separate aux base access

* Adds separate aux base access

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2020-09-30 18:47:21 +02:00
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
523ccb9b47 [MIRROR] IceBox Fixes for RD and Xeno (#1080)
* Merge pull request #54024 from nightred/rdconsole

IceBox Fixes for RD and Xeno

* IceBox Fixes for RD and Xeno

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2020-09-30 17:55:04 +02:00
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
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
5bd9367689 [MIRROR] Medbay Rework and Plumbing for Pubbystation (#1060)
* Medbay Rework and Plumbing for Pubbystation  (#53936)

* plumbing for pubby

Rework of pubby's medbay to include plumbing

* final fixups

* replace viro pen vents for xenos + cameras

Adds back vent/scrubbers to the viro monkey pen for xenos/ventcrawlers
Fixes duplicate camera name

* requested tweaks and decal cleanups

move runtime, clean up decals, add medbay door control, society saved with warning posters

* travis is unhappy - fix monkeys

* Medbay Rework and Plumbing for Pubbystation

Co-authored-by: Maurukas <66576896+Maurukas@users.noreply.github.com>
2020-09-29 22:53:35 +01:00
40584fc021 [MIRROR] Fixes supermatter shutters on pubby (#1050)
* Merge pull request #54016 from MIC132/fix-supermatter-shutters

Fixes supermatter shutters on pubby

* Fixes supermatter shutters on pubby

Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
2020-09-29 13:47:03 +02:00
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
GandalfandGitHub 15b5236d85 Removes skyrat maps. (#1015)
* Removes the skyrat maps, they're causing issues.

* Update icebox.json
2020-09-28 01:06:37 +02:00
GandalfandGitHub 3ea925ffee map quick fix (#1014) 2020-09-27 23:40:15 +02:00
898d0139ed [MIRROR] Icebox the Xeno update (#1013)
* Icebox the Xeno update (#53789)

* Multiz Xeno

* Doubled Cables

* better exterior

* wording and touchup

* fixed up merge conflict

* merged in changes

* merged in ya

* got the areas wrong

* forgot markers

* Cleaned up some issues

* rd clean up

* Icebox the Xeno update

Co-authored-by: NightRed <nightred@gmail.com>
2020-09-27 23:36:23 +02:00
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
686dad17b4 [MIRROR] Removes Disco Inferno (#1005)
* Removes Disco Inferno (#53982)

* Removes Disco Inferno

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-09-27 11:30:23 +02:00
3944f770b1 [MIRROR] Shifts lower public mining three tiles to the right (#993)
* EEK! (#53985)

THE ELEVATORS AND LADDER DON'T LINE UP!

* Shifts lower public mining three tiles to the right

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2020-09-26 10:43:07 +02:00
16835e1e9e [MIRROR] Gives Public Mining on Icebox an Elevator, and just a TON of lift fixes so they're viable to map with. [MULTI-BEE] [:pslime: in the chat] (#986)
* Gives Public Mining on Icebox an Elevator, and just a TON of lift fixes so they're viable to map with. [MULTI-BEE] [:pslime: in the chat] (#53728)

add: Icebox now has an elevator! I just took the trousers of every shaft miner to batter town, word.

* Gives Public Mining on Icebox an Elevator, and just a TON of lift fixes so they're viable to map with. [MULTI-BEE] [:pslime: in the chat]

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2020-09-26 01:25:46 +01:00
e67d1c2bb3 Fixed the multi z pipe adapter (#985)
Co-authored-by: nicbn <nicolas.nattis@gmail.com>
2020-09-26 00:43:52 +01:00
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
63b7f5c8e2 [MIRROR] Cleans up Icebox wires, pipes, atmos turfs (#963)
* Cleans up Icebox wires, pipes, atmos turfs (#53873)

Removed far to many doubled or even tripped wires, a hidden scrubber, special turf with custom atmos out of place, and far to many /obj items just hanging around in science.

* Cleans up Icebox wires, pipes, atmos turfs

Co-authored-by: NightRed <nightred@gmail.com>
2020-09-24 20:32:42 +02:00
043fd0affb [MIRROR] Chess, Sofas & Shutters - Furniture Update (#956)
* Chess, Sofas & Shutters - Furniture Update (#53861)

About The Pull Request
A series of changes bulked together to give players and mappers a little more freedom in their builds to make things look nicer.

Chess:
• Introduces a bunch of jumbo chess pieces that are craftable in-game. Sprites are my own.

Shutters
• Defines 100 integrity for the shutters and gives them an armor block so they don't inherit their stats from blast doors. This means shutters will no longer be just a reskinned blast door.
• Redid the sprites for the shutters. They now animate much smoother and look like normal slanted shutters. Their blinking light once animating is also easier to see.
• Added the window shutter; this is a normal shutter with a window so you can always see past it. I've used it in prisons and on armouries in the codebase I'm from to allow officers to see into the areas shutters are protecting, giving the area additional protection of having someone being able to look into it.
• Added radiation shutters. Maintainers feel free to question this. Through extensive experimentation, any rad insulation value between 0 and 1 does pretty much nothing to radiation. Numbers higher than 1 start multiplying it, negative numbers start reducing it. This will stop the radiation from a supermatter irradiating you only if you stand behind it. If you're not covered by the shutters or the shutters are open, they won't protect you at all. They also have their own sprite with a radioactive hazard symbol.
• Added the rad shutters to in-rotation maps on their supermatter engines and the windowed shutters to Metastation armoury.

Sofas
• Introduces the corporate sofa. A sleek grey sofa. The original sprite I ported from Hyperstation's files. I'm not sure where they got the sofa but I was told it was Eris. I didn't see it there but I didn't look super hard. I've updated the sprites on it to work with armrest sprite overlays.
• Ports the sofa sprites from Cit and the armrest sprite overlays. They look nicer than awkwardly floating over the sofa. The sofas are the same, they're just moved a little for the armrest to work.
• Makes the new corporate sofa craftable.

* Chess, Sofas & Shutters - Furniture Update

Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2020-09-24 20:27:56 +02:00