Commit Graph

2412 Commits

Author SHA1 Message Date
DogeDogIs
88f8e60656 BoxStation: Medbay Button (#19000)
* Added the button that opens all doors in medbay.

Added again the button that opens all the medbay entrace doors again in BoxStation.

* Ops, forgot to change IDs

* Updated the medbay

Fix the reception button to work with the doors and moved the light to another location so will  not be in the same wall as the button.
2022-09-21 20:40:12 -05:00
Contrabang
2c830b5d4a i hate pixel shifts i hate pixel shifts (#19017) 2022-09-12 22:33:30 +01:00
ElorgRHG
3f8f5e8c45 Removal of a security newcaster on boxstation cargo bay (#18972) 2022-09-09 00:35:25 -05:00
Vi3trice
b64dd80859 The new era begins (#18925) 2022-09-09 00:17:22 -05:00
Adri
f893e4c30b Fixes Kerberos virology APC and the PANDEMIC (#18989) 2022-09-08 16:42:51 +01:00
Contrabang
75cd9c125f wow map fix (#18980) 2022-09-08 13:20:57 +01:00
Bm0n
fb089794e7 Remakes PR #17569, gives all special armours full body coverage (#18911)
* IT'S BACK

* merge conflict

* very slight change on the vox sprite

* accounts for the armour refactor

* deconflict?

* ok lets not conflict

* ablative trenchco

* garment bag
2022-09-07 18:34:30 +01:00
S34N
1dc0126ca5 Box station tweaks & fixes (pipe redundancy) (#18889)
* pipe redundancy

* wire

* fixes double-turfs
2022-09-06 15:11:29 +01:00
Neth
1a8becd998 Makes that Turbine Scrubbers no longer fight against Turbine itself (#18879)
* moved turbine siphon

* injectors into vents
2022-09-05 01:12:16 +01:00
LightFire53
7b2a456b87 Utilities are now paid (#18795) 2022-09-04 11:51:56 -05:00
LightFire53
281766db83 Tweaks DeltaStation Engineering (#18794)
* WHO MADE THESE AREAS

* And those lights

* dekonflik

* S34N

* Begone, Double Computer
2022-09-03 13:24:22 -05:00
Contrabang
5cef557dfa the trilogy (#18949) 2022-09-01 18:43:13 +01:00
Adrer
3cf7e97602 Fix invisible locker (#18948)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-09-01 18:42:26 +01:00
LightFire53
5e242fcc75 Tweaks DeltaStation Disposal/Supply/Scrubber Pipes (#18792)
* Upon this hill, I shall die

Begone, wall pipes.

* dē-kən-ˈflikt
2022-08-27 12:49:59 +01:00
S34N
41813c3e5f Various fixes and QoL tweaks to labor camp (#18841)
* gulag QoL fixes

* escape route, analyzer

* stops people from spam calling the shuttle down

* unifies access

* moves ofitser, fixes point claim console

* TGUI build

* unifies point system for good

* TGUI deps

* tweak

* sirryan review

* hard ref removal

* more changes

* scope creep scope creep

* sirryan!
2022-08-25 16:36:36 +01:00
LightFire53
b6f1b7e038 Lights And Doors (#18791) 2022-08-24 19:13:05 +01:00
LightFire53
6345a0bc5d DeltaStation Security Tweaks (#18790)
* Extra Security

* Req: Access

* Maint Access Change
2022-08-24 19:12:12 +01:00
AffectedArc07
400e9f8c65 Removes lavaland swarmer crash ruin (Its already disabled on the server anyway) (#18810)
* Removes lavaland swarmer crash

* Forgot the def
2022-08-20 17:48:52 -05:00
Charlie
9f3a3bc309 deletes one window from medmaints on box (#18801) 2022-08-19 13:11:13 +01:00
LightFire53
16d8d5b045 Fixes Med-Sci Remap Oversights (#18796)
* Tweakin

* Conflict no mo

* Vulk's Review

It was a 4 page document, single spaced, no paragraphs. My brain hurts.

* Viro Access

* I made a boo boo

* Revert "Conflict no mo"

This reverts commit eff38052e9.

* Sean Minor Requests
2022-08-18 23:51:52 +01:00
AffectedArc07
4140275ca8 Axes TS gateway (#18825)
* Axes TS gateway

* This too

* Commit for MDB

* This PR finna become my MDB2 test

* aaaaaaaaa
2022-08-18 23:48:29 +01:00
LightFire53
55875e77ab Fixes DeltaStation Law Office and Robotics Surgery Windows (#18789)
* Privacy Policy Update

* Shiiiift to the left
2022-08-16 11:23:57 +01:00
Farie82
3dc47a125d Makes shieldwall generators actually work and not drain the CPU (#18613)
* Fixes shieldwallgen's
Also makes them not suck performance like hell

* Update code/modules/power/singularity/singularity.dm

* Update code/modules/power/singularity/singularity.dm

* Makes walls stop the shieldwallgen from making walls

* Review changes
Make shieldgen not process when inactive
2022-08-15 20:29:21 +01:00
Sinestia
79139cc0a8 Removes the machinery pipe dispenser from the codebase (#18763)
* Remove from Maps

* Purge the code

* Fix the DME

* Remove the sprites
2022-08-15 17:16:17 +01:00
AffectedArc07
aba452f785 Refactors signallers, assemblies, electropacks (#18689)
* Refactors signalers, assemblies, electropacks

* Update code/game/objects/items/devices/radio/electropack.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-08-15 16:36:34 +01:00
LightFire53
0aceeea44e [GBP: No Update] Minor Mapping Tweak to BoxStation Arrivals (#18668)
* Fixes a mapping whoopsie

* Repower

* Conflict no mo
2022-08-14 17:39:55 +01:00
Sinestia
56782d862d Fix issues with the bell (#18659)
* Do the code changes

* add anchored to maps

* add instructions to the desc to help

* missed one

* Update code/modules/paperwork/desk_bell.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/modules/paperwork/desk_bell.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* adds visible messages i didnt test this btw cuz r-

* This one I actually tested, fix strings

* deconflict correctly

* Re-run

* add back to cyberiad

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2022-08-14 09:20:21 +01:00
LightFire53
c0ebdaf8a3 Adds a Pool and Gym to DeltaStation (#18531)
* Make Hal (Johnson) proud

* Joanne McLeod would be upset if I forgot coffee

And the pool controller, but eh.

* Gotta work out those kinks!

No kink shaming

* Pool Readjustment

Fixes window lights that were pre-existing in the area as well

* A few more tweaks
2022-08-13 21:04:49 +01:00
AffectedArc07
868257fa63 Converts MO19 from gateway to ruin (#18660)
* Converts MO19 from gateway to ruin

* Review

* Who saw that one coming

* I am defunct
2022-08-13 13:43:59 +01:00
Luc
0dd9467293 Removes redundant PJs (#18510) 2022-08-12 13:40:14 +01:00
Contrabang
a5028fb0bf Removes mentions of brig phys request terminal, replaces it with Detective, Give Detective disposals shipping (#18480)
* bye bye brig phys

* mapping side

* wow! detective mail!

* Update code/game/machinery/requests_console.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Update code/game/machinery/requests_console.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Update code/game/machinery/requests_console.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Update code/game/machinery/requests_console.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-08-12 13:31:55 +01:00
Sinestia
d79242e38e Remove from map, remove from code and DME (#18764) 2022-08-12 00:33:07 +01:00
S34N
dea37b11ce Medsci remap strikes back (#18468)
* 1

* 2

* 3

* 4

* 5

* the great tag purge of 2022

* job spawners, viro window deletion

* atmos pipe moment

* fixes

* removes maint can

* feedback

* converts spawners to the new system

* OR shuffle, and other things

* further edits

* le thingy

* miraviel review

* merge master 2

* denth review

* secondary thingies

* master update

* minor fixes

* feedback

* bmon review

* more tweaks

* area mistake

* things

* fixes departures

* deconflict

* unshocks your doors

* fridge fridge fridge

* OPTIMISE

* oops

* gnarg

* another one

* QC pass

* oops

* areas

* Update code/modules/research/rdconsole.dm

* more tweaks

* space sign space sign

* decals

* oh my life

* experimentor fixes part 2

* scope creep 2 scope creep 2

* de-gogglify

* restore chapel confession booth, fixes viro fridge

* more fixes

* lovely windows

* walls and pipes and pipes and walls

* bmon review

* bmon review

* excess access

* changes chapel maints, but not really
2022-08-11 15:46:49 +01:00
Adri
b7c2084cc1 Moves mining GPS into their storage units (#18663) 2022-08-02 14:31:57 +01:00
AffectedArc07
2da68e9b64 Atmospherics refactor (#18460)
* Atmospherics refactor

* META(GAMING)

* Cleanup

* RPD hotfix

* Fox review

* Do this

* Well that escalated

* Repath these

* Ah yes, scope creep

* Remove this comment

* Regression #1
2022-08-01 16:27:35 -04:00
PacifistDalek
f3035edb6f Pizza Overhaul 2022 (#18278)
* wip

* goodbye two pizzas

* commit to pizza time

* pizzaaaaaaaa

* getting there

* hopefully final

* pizza

* do you like me now CL?

* Update code/modules/food_and_drinks/recipes/recipes_oven.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* fixing suggestions

* Update paradise.dme

* back on track

* removing tablecrafting recipies, switch back to oven recipeis

* remove unused raw pizza sprites

* re-add KalevTait's suggestion

* fix merge conflict

* merge conflict fix i guess???

* i swear if this is still conflicted

* fixing trailing newlines

* moves parent calls

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-07-31 23:23:32 +01:00
Qwertytoforty
daca998981 [TM READY] Ports lavaland elites from TG. (#18448)
* startup, expect like 50 unneeded icons, not bug free™️

* Hope works. Cloak works. Buffs for AI controlled. Faction fix.

* map speed buffs, fixes resummon health decay

* Adds roles. Adds Mirror walk. Nerfs revival, especialy for non antag summoned.

* I am denser than bluespace ore

* x2 antag cooldown, update desc for cloak

* removes 66% burn damage resist from elites

* honestly just knock that down

* herald not speaking right, fuckup with max hp fix

* Thanks hal!

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* changes, changes, and more changes, oh my!

* Update code/datums/status_effects/buffs.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* GC stuff

* oh, and just one more thing

* no gibtonite gaming

* Huston we have a FUCKING PROBLEM

* oopsy doopsy

* but just one more thing (again, gc stuff)

* Lets all elites speak their mind

* NO LAVA

* grab ghost, legion charge red.

* dust the dusting from the code

* no mirror cargo shuttle crossing

* need to stop making small changes, x2 broodmother

* herald no longer crashes the MC

* Lower broodmother cooldown, herald down 5 brute and , legionare gets more smoke and thermals, pandora gets chasers

* remove extra brackets, x 2 on aoe squares

* pandora now respects factions

* fixes teleporting to tumor if reactivated by someone else. Herald has light, boost elites make message

* requested changes

* mirroring a wanted change

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-30 20:22:28 +01:00
AffectedArc07
38825f5c13 The beginning - Converts meatpackers gateway mission to ruin (#18434)
* Converts meatpackers gateway to ruin

* Line endings more like life endings

* Sean said this works

* Sean review

* the biggest edit
2022-07-30 13:05:30 +01:00
Adri
84fe17d5b5 Removes a gas chamber space ruin (#18455)
* Removes a specific space ruin

* Updates config
2022-07-29 22:47:49 +01:00
LightFire53
01e1298a4a Connects Cargo Maintenance with Engineering Maintenance on BoxStation (#18449)
* Expand

* When the airlock don't work

* AND THAT ONE

* And this is why we test our maps

* Update cyberiad.dmm

* When you convert every left facing chair into an electric chair

* Mk. II

* Mk. II.1

* Mk. II.2: Flow

* Mk. II.3: Better Buttons and Views

* Something apparently changed, but don't see anything

/shrug

* décongestionner

* déconflict partie 2

* Give the cat a name!

* Ack, the bell!

* spawner update
2022-07-29 20:11:02 +01:00
Adri
c1376e08f8 Adds a lavaland and a space ruin, adds a "nest" structure (#18508)
* Adds goliath/grub lavaland ruin

* Adds syndicate drug lab ruin

* Fixes nest.dm issues

* Fixes APC init

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Satisfies linter

* Addresses AA review

* Addresses Farie and AA reviews

* Missed a \the

* Adds comments

* Made the warning message stand out more

* Removes redundant initial desc

* Moves APC vars out of init

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Replaces plating with airless plating

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-27 21:32:40 +01:00
DogeDogIs
1b6d9f673e BoxStation: Armory Remaped (#18440)
* Secure Armory was re-mapped and the non-secure armory was removed and Gamma Shuttle now docks with the Secure Armory.

The Secure Armory now have all items from non-secure Armory, and Gamma shuttles now docks directly with the Secure Armory. The non-secure armory was removed to make place for Gamma Shuttle.

* Updated the Armory for the standard items

* Updated the Armory

New locations added and some changes to the benefit of the Warden

* Moved the shooting targets to another location

* Updated the areas

* Update cyberiad.dmm

* Updated files

* Updated files again

* updated file

* Removed some decals

* nades position in the rack updated
2022-07-27 20:22:33 +01:00
LightFire53
bcbf1cdef6 Remove DeltaStation Science Autolathe from Map (#18445)
* No Free Lathe For You

* Window Removed
2022-07-27 15:04:09 +01:00
Contrabang
05e5385fab Makes all security newscasters bumped, centers newscasters, and converts several newcasters to the security version, adds several newscasters to box (#18435)
* part 1 of part 1

* coooode

* deconflicted

* wow newscasters are missing everywhere

* way more newscasters

* updated to current, merging master so finicky

* Updated on Bmon Review
2022-07-27 14:46:06 +01:00
Sinestia
6674928e38 Adds a ring-able bell (#18364)
* Adds the bell. No map changes.

Co-authored-by: Wallemations <https://github.com/Wallemations>

* Update code/modules/paperwork/desk_bell.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Do a few things

 Addresses reviews, converts the bell to /obj/item by copping paperbin code, add to autolathe

* Add to maps

* Update code/modules/paperwork/desk_bell.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/paperwork/desk_bell.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/paperwork/desk_bell.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/paperwork/desk_bell.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/paperwork/desk_bell.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Update code/modules/paperwork/desk_bell.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Update code/modules/research/designs/autolathe_designs.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-07-27 14:39:53 +01:00
Adrer
1501e85945 Fixes invisible closet in wizard's den (#18569)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-07-26 15:43:38 +01:00
LightFire53
fc669e4696 Adds Robotic Storage to Central Command and Reduces CC Toxicity (#18515)
* Rock-a-bye Borgi

* Makes floors less nitrogen

* Silent but sleepy
2022-07-26 15:42:00 +01:00
LightFire53
18ef75f687 Adds a Gym to BoxStation Dormitories and Removes Exercised Buff/Bath Salts Malus (#18397)
* DO YOU EVEN LIFT?!!?

* You do not get THOSE gainz from punching

* In which I keep being code baby

* Baby steps

* The final touches

* KERCHOW!

GOTTA CHANNEL YOUR INNER MR. TORGUE WHEN MAKING COMMIT NAMES!

* WHO EVEN NEEDS DOORS ANYWAY

* Sean and Bmon

* THE ANTI-BUFF

* HEY, IT COMPILES

* IT COMPILES BABY!

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-23 15:34:01 +01:00
Bm0n
7642f1de77 More Meta Fixes (#18417)
* fixfixfixfix

* solar nearspace fixes

* are fix in foremaints + nXr fix via text edit
2022-07-23 00:36:58 +01:00
LightFire53
1bb73d7e02 Adds Airlock System to MetaStation Supermatter Engine (#18386)
* Radlock

* Space

* Airlock tweaks

* Lighting tweaks

* Recommendations

* Sean and Bmon

* DECONFLICT

IN BOTH DESIGN AND MERGE CONFLICTS

* Fine, let's just let it all burn
2022-07-22 16:33:45 +01:00