Commit Graph

4501 Commits

Author SHA1 Message Date
Son-of-Space
222e0138e2 Add the PubbyStation Monastery as a purchasable shuttle (#56234)
This commit will add a slightly modified version of Pubbystation's
Monastery to the list of available emergency shuttles, becoming the
most expensive shuttle to buy at 250 times the crate price (Defaults
around 50,000cr)

This shuttle will cause significant damage and fully showcase the
absurdity of the Monastery's size by providing an up close and
personal, interactive comparison. PubbyStation's monastery will be
forever preserved.
2021-02-01 17:16:35 +00:00
RaveRadbury
744e12d13a ice box toilet locks (#56468) 2021-01-31 04:35:11 +01:00
RaveRadbury
f44a2c7ee8 Adds locks to Deltastation Toilets (#56467)
* Adds locks to Delta Toilets

* Removes two weird heat capacity edits

I do not know how or why they are here. EOB said I should bounce em.
2021-01-31 04:34:13 +01:00
cacogen
9ee723a337 Adds training bomb to security offices on Delta and Kilo (#56410)
Apparently people use this
2021-01-31 04:32:42 +01:00
Zytolg
00878df9ad Metastation Science Redo Part 2 - Gloopy Bluberoo (Brand New Xenobiology) (#56354)
* Switches out the Xenobiology Satellite for a brand new Model

* Adds a Newscaster, Holopad, Request Console, and Properly wire Disposals

* Fixes Disposals Again

* Scaffolds and Names

Gives Nanner's that goopy name back.
Adds scaffolding to the Xenosat in order to make Space Traversal more approachable.

* Adds a Pump to Carbon Tank

* Fixes Conflicts / Redefines Scaffolding

Solves conflict caused by #56275
Adjusts scaffolding to be more in line with the new surrounding areas

* Xenomaint Edit

Adds a cute cobweb to the Maint APC room on xenomaint

* Removes duplicate lattice
2021-01-31 03:51:07 +01:00
Kylerace
98f58208c8 Refactors Holodeck to Use Map Templates, Again! Black Magic OOM Crashing No Longer Included (#55645)
Refactors the holodeck to use map templates instead of copy_contents_to, which every maintainer seems to have complaints about.

Fixes #41485 because the matches become part of the spawned list created by ssatoms
Fixes #54789 because the holodeck area no longer has the NO_TELEPORT flag
Fixes #55676 because the map templates cant be changed midround unlike the program copies in the centcom z level
Fixes #49318 because the holodeck no longer creates new areas like the original did

This pr also changes initTemplateBounds to be a /datum/map_template proc instead of a parsed_map proc. This was mainly so I wouldn't have to duplicate vars between map_template and parsed_map. It's also nice because there's no longer a parsed_map proc inside the map_template file, especially when it didn't need to be a parsed_map proc.

The holodeck sims wont take up space in the centcom z level any more (which allows for more possible programs in the future), and map templates are more heavily tested. This is also a chance to future proof the holodeck against bugs. Holodeck also seems more responsive. This should allow for a second custom holodeck in some future ruin as well, although that of course will not be in play for the near future because of the offstation content ban. Also I documented the fuck out of the holodeck
2021-01-30 11:56:29 -03:00
Putnam3145
c96ede586c Fixes some awful, awful initial gas mixes. (#56403)
Best not to have shitty, broken code that should've kept a PR from being merged in 2018 that never got fixed around, right?
2021-01-30 00:05:01 -05:00
Potato-Masher
1ed243bf16 Redoes the atmos layering on Oldstation (#56356)
* pipe dream

* broken pipes actually broken

* missed a scrubber

Co-authored-by: Cosmo <cosmo.rader@yandex.com>
2021-01-26 00:36:47 +01:00
Son-of-Space
5f6671b838 Removes directional windows stacked on machinery on KiloStation (#56271) 2021-01-26 00:34:48 +01:00
Son-of-Space
4b3c22ef66 Restores Maintenance Botany on Meta & Redoes SE Solars (#56275)
* Restores Maintenance Botany on Meta

* Readded a pipe and fixes an old bad pipe.

* Removes resupply canister and embershroom seeds

* Removes extra vent, readds supply canister

* Added a few gross decal spawners.

* Removed someone's bad window job (Windows are fixed in solars maint)
2021-01-26 00:33:32 +01:00
Son-of-Space
653955ce2f Standardizes Delta APCs (#56324) 2021-01-25 01:59:41 -08:00
Son-of-Space
41d53b5ef0 Standardizes KiloStation APCs (#56326) 2021-01-25 01:59:27 -08:00
Maurukas
ccae6e34c7 Replaces disposals pipe in Kilo Robotics (#56299)
Missing disposals pipe in Kilostation's robotics lab is replaced
Missing sci-drobe added to R&D
2021-01-25 00:29:17 -08:00
ArcaneMusic
1478b2231d Fixes camera name on icebox genetics. (#56328)
Quick little map fix, the camera in icebox genetics was still called the experimentation lab.
2021-01-25 00:28:03 -08:00
dragomagol
d0929177ac adding brig area to the medieval shuttle (#56334) 2021-01-24 16:41:52 +01:00
小月猫
326cf91916 moved table metasci (#56362)
allow access to a table
2021-01-24 16:40:32 +01:00
Maurukas
51138611b5 Icebox Electrical Repairs and roundstart active turf fixes (#56308)
* Icebox rewiring + AT fixes

replace all apcs with auto-name apc
kill all remaining maint APCs that power other areas
remove dup apcs
significant rewiring of Icebox
fixes roundstart ATs - genturf failure related to incorrect area -
fixes roundstart ATs - updates areas so genturf no longer breaches mining base

* Replaces some high cap APCs that were missed.

Co-authored-by: Carty <capttlasky@gmail.com>
2021-01-24 13:26:05 +01:00
Son-of-Space
df726de1a9 Gives plushes on IceBox names (#56281) 2021-01-21 02:27:55 +01:00
Son-of-Space
40b7c48a4a Gives plushes on KiloStation names (#56280) 2021-01-21 02:27:44 +01:00
Son-of-Space
2c180fc9d7 Gives plushes on DeltaStation Names (#56279) 2021-01-21 02:27:23 +01:00
Son-of-Space
bc4e475302 Gives plushes on MetaStation Names (#56278)
* Renames the therapy plush in isolation on Meta to "Therabee"

All plushies must have a name

* Gave the rest of the plushes names
2021-01-21 02:27:02 +01:00
coiax
aec060e4d4 Readd festive paper hat in Metastation (#56235)
The recent Brig map overhaul lost a precious festive party hat near
security maintenance. It has been readded in one of the lockers.
2021-01-19 19:48:28 +01:00
小月猫
4157a6bbf7 fixes some things on metasci (#56209)
* Update MetaStation.dmm

ok so, shutters to toxins storage
spare mechbay button deleted
added a pump to the cytology gas chamber pipe ✔️
added a sci hall side desk for robotics
replaced a wall next to rnd door in sci hall side with a window
fixed dir for the mechfab
mutadone bottle in genetics
deleted a random spare wire in xenobio maint

* removed genetics space cleaner

start of precedent, the only places that need space cleaner is surgery rooms and medical to stay clean for operations, nowhere else should have space cleaner as they should be calling the janitor instead

* Update MetaStation.dmm

rearranged robotics a bit, added a few missing items

* Update MetaStation.dmm

removed siding, it was too much

* addes random anomly cores to toxins
2021-01-18 20:45:54 +01:00
Arkatos1
8bc8ae9869 Moonlight Greatsword var cleanup (#56224)
## About The Pull Request

Currently, there are 2 "Moonlight Greatsword" variants placed on a station maps - Delta and Kilo. Delta has varedited nullrod variant, and Kilo has varedited baseball bat variant. Neither of these are ideal - Delta variant is getting rushed every other round for it's antimagic properties, and Kilo variant is quite odd choice for a sharp greatsword. Additionally, them being directly varedited in the map does not help their case either.

Thats why I have replaced both with a new item to solve all these issues - a new sharp weapon with no antimagic and stats of a slightly stronger knife.

## Why It's Good For The Game

Less direct map varedits and no more cheap antimagic.
2021-01-18 12:21:39 -05:00
小月猫
708b6cecd1 Fix metasci area (#56189)
* Fix metasci area

Fixed a space tile to science tile

* Bump bot
2021-01-17 02:43:41 +01:00
Time-Green
7646d3916a Adds database tracking to maintenance pills (#56179)
I originally added maintenance pills, and while already perfect, I felt like polishing them a bit. I didn't do much, just:

- Maintenance pills now track a players score. Gotta eat em all to get that leaderboard highscore!
- More names and decriptions for maintenance pills, most of them suggestions from the old PR
- Renamed floorpill to pill/maintenance in code because that's what they are, no idea why I didn't originally do it

I've also polished the sprite a little bit, because it always looked a bit _too_ shady
![image](https://user-images.githubusercontent.com/7501474/104741899-19624880-574a-11eb-8211-65d89d8d36c4.png)
(Below is old sprite, above is new sprite)
2021-01-16 14:09:30 -05:00
小月猫
31eed45ef6 Redone Metastation Science (#55867)
* fixed conflicts

updated the branch and pasted in all the changes again, conflicts and all roundstart turf diffs should be gone now

* Update MetaStation.dmm

Opened up the cytology lab directly to xenobio, its all one room, with shutters to lockdown cytology in case of an emergency - Nari

* Update MetaStation.dmm

softened some internal walls on xenobio sat, they dont need to be reinforced, added a small weakpoint to xenobio sat, its not a secure area and doesnt need to be a roundstart gigafort, removed the windows the buttons were on for the slime pens, buttons directly on windows looks bad, replaced with a table - Nari

* Remove minor tweak

remove the biobag and labcoat tweak from this branch

* Update MetaStation.dmm

tile under a door had a random disposals pipe, but missing a wire. fixed - Nari

* Update MetaStation.dmm

fixed merge conflict

* Update MetaStation.dmm

why???

* Update MetaStation.dmm

fix?

* Update MetaStation.dmm

cant fix sorry

* Update MetaStation.dmm

trying a fix

* fixed conflicts?

i think this fixes it?? - Nari

* Update MetaStation.dmm

Added experimentor - Nari
re-tiled sec post -Nari
rearranged mech bay so it actually works - Nari
re-did the connection between xenobio and the cytology area - Nari
added a few requests consoles - Nari
added a sci drobe - Nari
removed one of the extra deliveries areas - Nari

* Update MetaStation.dmm

fixed the department request consoles departmentType and name - Nari

* Update MetaStation.dmm

fleshed out the support line for the bomb site - Nari

* Update MetaStation.dmm

removed lattices under catwalks, hopefully this fixes

* Update MetaStation.dmm

fix
2021-01-15 23:18:01 +01:00
dragomagol
217be3270b Icebox Xenobio maint fixes (#56139)
Fills in a hole in Icebox lower Xenobio maint causing active turfs and replaces a magic locker that I'm told is unintentional with a regular one.
2021-01-14 23:35:49 -03:00
Cartographer-D
bbb0df2b75 [READY] Changes MetaSec Offices Layout, lathe location, and adds walls to maintenance by upload. (Attempt 2) (#55971)
* Try 2

* Missed the edits by Upload

* Someone threw the sec couch out the airlock.

* Added a few officer spawns

* Junk commit for mergability testing

* Yet another junk commit

* lathe moved.

* That gosh darn sec lathe has been moved with prejudice. Tricksy lathe.
2021-01-13 01:58:45 +01:00
EgorDinamit
aac5fb53c5 Fixes double catwalks on Delta Station. (#56110)
Removes double and triple catwalks from DeltaStation map.
2021-01-12 16:58:06 -03:00
LemonInTheDark
0a7e6380dd Removes the firealarm from the meta freezer, it activated at roundstart due to the cold. (#56106) 2021-01-12 14:42:52 +01:00
LemonInTheDark
823044ad60 Removes the gen_turfs from icebox arrivals, they don't god damn do anything because they are literally just placeholders for areas, and they aren't in the right fucking area. Also gets rid of some dumb plating that makes the area looks worse imo (#56107) 2021-01-12 14:39:33 +01:00
coiax
ced0258db6 Add nanite lab to Runtime Station (#56044)
Doing any testing of new nanite stuff involves spawning in a bunch of
machinery and equipment, so including it on Runtime helps with
development.
2021-01-11 15:24:40 -03:00
ArcaneMusic
92902a798e Adds a new security bounty and tweaks existing security bounties. (#55952)
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2021-01-09 11:23:30 -08:00
Sparkezel
f0501a9014 Fixes disconnected pipes in atmos and replaces vacuum floors in atmos for walls (#56010)
Basically distro in the incerinator room was disconnected from rest of the station, because of that you couldn't cycle the airlocks there properly, also replaces vacuum floors on request of LemonInTheDark (maintainer).
Distro is now fixed on delta so people won't be stuck in the turbine there again, also you can use if for flooding again. I also replaced vacuum floors in atmos room for walls.
2021-01-09 13:45:53 -03:00
LemonInTheDark
6d1cb94ffb LINDA Reforged (#55604)
Speeds up gas movement significantly
Documents the intent and finer details of the atmos system (Thanks dunc)
Fixes excited groups constantly rebuilding, this broke 4 years ago
Fixes superconductors just straight up not working
Allows turfs to sleep while inside an excited group
Adds a new subprocess to SSAir to support rebuilding in this state
Most heat based behavior no longer relies on being inside a fire
Adds a new element to support doing this cleanly
Adds a new subprocess to SSAir to support doing this while a turf is asleep
Refactors air_update_turf to allow for finer control
Makes apcs take damage in heat to prevent infinite plasma fire diffs
Cleans up immutable gas mixtures to make them work properly when the mix has gas in it
Planetary turfs no longer create a new copy of themselves each time they process. We instead use a global
immutable mix
Cleans up a typed for loop in reactions
Canisters will take damage from outside heat now
Speeds up excited group dismantle
Increases the superconductor threshold by 200k
Cleans up some roundstart ATs on some ruins
Uses /turf/open/var/excited to track if a turf is actively processing, preventing a |=
Prevents openspace from trying to melt
Tweaks a canister examine line
Makes planetary turfs reset to base when broken down as part of an excited group
Makes it impossible for planetary turfs to rebuild, just like space tiles
Fixes closed turfs not activating their replacement when destroyed by moving closed -> open turf activation to
the adjacent air subsystem. They were activating and then going back to sleep before adjacent air got a chance
to tick.
Fire alarms will trigger when the area gets too cold for humans
2021-01-08 08:14:08 +01:00
dragomagol
1efabd508d Area-based escape condition checking (#55677)
It turns out that checking if a traitor is in custody for their objectives checks if they're on a red plasteel or plastitanium floortile. This is pretty unintuitive, and one of our newer shuttles (the nature emergency shuttle) didn't have these floortiles in their brig. This changes the checking of a traitor's turf to their area.
I've also gone through all of our existing shuttles that have clear brigs (didn't touch things like the hyperfractal and disco inferno) and changed their areas to this new one.
2021-01-07 22:02:56 -03:00
dragomagol
3ffa2b0eaf Small mapping fixes to each station (#55857)
* small fixes to each station

* kilo arcades

* fixes goonplaque

* bellissimo

* gulag coats

* merge conflicts

Co-authored-by: Erin <edesaulniers96@live.ca>
2021-01-05 23:51:36 +01:00
Dex
9ef4bc766e Open Add missing ORM firelock on Meta (#55942)
This adds a missing firelock on top of ORM in cargo on Meta
2021-01-05 17:23:16 -05:00
tralezab
1fd0485206 [READY] Hark! The Medieval Reality Simulation Dome Emergency Shuttle! (+speech mutation, NOTELEPORT fixes and teambuilder improvements) (#55424)
* HARK! THERE ARE SOME MAIDENS THAT NEED SAVING!

* claymores, chairs

* mapmerge, price increase, no losing the flag, no teleporting in, other small stuff

* oldworld language, medieval mutation, reviews

* see desc for full changelog

huge improvements to how medieval speech feels, CTF now fully lit, json beautified, bugs squashed and more NOTELEPORT exploits also quashed. (I NEED TO UNDO THIS FOR ATOMIZATION)

* removes my fixes? also bugfixes and CTF separation

* dumb json mistake, starting work on reality simulators

* BOWS ARE BROOOOOOOOOOOOOOOOOKEN

* br

* getting closer to working

* well, mostly everything now.

* finally ready

* removes languages stuff as it is buggy and does not work, fixes more bugs, fixes more bugs, fixes more bugs

* conflict fix

* linting

* more lint

* bow buff, speech fix, TON of ctf fixes

* oh fuck year

* NO MORE INSTA DELETING CREW

* whoops

* review handled

* pooosh

* conflict fix
2021-01-05 00:49:53 -08:00
Jordan Brown
fcdd269aef Merge pull request #55932 from Cartographer-D/KiloWhiteShipFix
Fixes door names on Kilo Whiteship
2021-01-05 01:10:46 -05:00
tralezab
651d2abc0a Maintenance Space Huts (#55925)
Each map has a space hut, it's a nice little room only accessible from an airlock + catwalks.

Each one has a different theme per map:
Metastation: Moved the nice romantic maint-dinner onto the hut, with a mass driver for dumping your bodies.
Deltastation: A space observatory that will get completely obliterated by even the lightest of meteor storms. (+Space Lizard Plush!)
Icebox: A quaint little broken down cabin. You'll have to break through barricades to get in, but the fireplace will make it quite cozy.
Kilo: A very, VERY hidden little plasma-friendly environment to hang out in without your suits on. No oxygen, so no worries about starting a fire! (+Plasmamen Plushies!)
2021-01-05 01:04:04 -05:00
81Denton
720385d0f0 Merge pull request #55904 from Avunia/fix-metastation-maint-starboard
Fix single space area in maint on metastation
2021-01-03 21:15:08 +01:00
Carty
8790043dd0 Fixes door names on Kilo Whiteship 2021-01-03 12:16:19 -05:00
81Denton
9bdd83fb63 Merge pull request #55847 from coiax/map-marker-beacons
Streamline marker beacons on maps
2021-01-03 12:18:03 +01:00
Avunia Takiya
12a9b3b01f Fix single space tile in starboard maint 2021-01-02 13:39:21 +01:00
Dex
81cbda8da0 Meat yoink (#55830)
This removes any meat products from the prison kitchens on all stations.

This change was proposed by @EOBGames on Discord after #55689 got closed.
vegeterian_propaganda_1
vegeterian_propaganda_2
Changelog

🆑 Dex
del: Removed meat from prison kitchens. All prisoners are now on a strict vegetarian diet as part of their punishment.
/🆑
2021-01-02 19:02:32 +13:00
Qustinnus
c7f09a672b Fixes up icebox cave gen (#55788)
Icebox cavegen generates the correct mobs and ore on the bottom z-level again
2020-12-31 17:44:57 -08:00
Jordan Brown
3e13cd8c58 Merge pull request #55824 from Ewwmewgewd/meta-atmos
Add missing vents/scrubbers on MetaStation
2020-12-30 22:12:49 -05:00
Jack Edge
0a446eb5a3 Streamline marker beacons on maps
- A new map only subtype of burgundy marker beacons has been added.
- This new subtype is used for the marker beacons on IceBox, which were
  intended to be red, but were actually picking random colours.
- Landing markers on Kilostation are now burgundy marker beacons with
  different names, rather than anchored marker beacon stacks.
2020-12-30 19:57:26 +00:00