Skip to content

Commit

Permalink
Golden Deep Reactor Fix (#17622)
Browse files Browse the repository at this point in the history
* aaaaa

* lights & access

* grat
  • Loading branch information
RustingWithYou authored Oct 19, 2023
1 parent 8c7862b commit b263112
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 16 deletions.
41 changes: 41 additions & 0 deletions html/changelogs/RustingWithYou - pain.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################

# Your name.
author: RustingWithYou

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- maptweak: "Adds fuel and coolant to the Golden Deep ship."
71 changes: 55 additions & 16 deletions maps/away/ships/golden_deep/golden_deep_merchant.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@
/turf/simulated/floor/gold,
/area/golden_deep/dock/aux)
"bZ" = (
/obj/structure/closet/secure_closet/guncabinet,
/obj/structure/closet/secure_closet/guncabinet{
req_access = list(217)
},
/obj/random/civgun,
/obj/random/civgun,
/obj/random/civgun,
Expand All @@ -177,6 +179,19 @@
},
/turf/simulated/floor/tiled,
/area/golden_deep/eva)
"cc" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/closet/crate/rad{
name = "fuel crate"
},
/obj/item/stack/material/tritium/full,
/obj/item/stack/material/tritium/full,
/turf/simulated/floor/tiled,
/area/golden_deep/engineering)
"cd" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/autolathe,
Expand Down Expand Up @@ -945,7 +960,9 @@
/turf/simulated/wall/shuttle/dark/cardinal/gold,
/area/golden_deep/portprop)
"kg" = (
/obj/structure/closet/secure_closet/guncabinet,
/obj/structure/closet/secure_closet/guncabinet{
req_access = list(217)
},
/obj/item/storage/box/frags,
/obj/item/storage/box/flashbangs,
/obj/item/storage/box/handcuffs,
Expand Down Expand Up @@ -1001,6 +1018,7 @@
/turf/simulated/floor/plating,
/area/golden_deep/portprop)
"kt" = (
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/golden_deep/secure)
"kA" = (
Expand Down Expand Up @@ -1154,6 +1172,7 @@
dir = 6;
pixel_y = 0
},
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/golden_deep/secure)
"lS" = (
Expand Down Expand Up @@ -1441,6 +1460,13 @@
},
/turf/simulated/floor/plating,
/area/golden_deep/portprop)
"ov" = (
/obj/machinery/light{
dir = 4;
icon_state = "tube_empty"
},
/turf/simulated/floor/gold,
/area/golden_deep)
"ow" = (
/obj/structure/cable/green{
d1 = 4;
Expand Down Expand Up @@ -2049,7 +2075,9 @@
/turf/simulated/floor/tiled,
/area/golden_deep/custodial)
"vk" = (
/obj/structure/closet/secure_closet/guncabinet,
/obj/structure/closet/secure_closet/guncabinet{
req_access = list(217)
},
/obj/item/gun/energy/rifle/laser/noctiluca,
/obj/item/gun/energy/rifle/laser/noctiluca,
/obj/item/gun/energy/rifle/laser/noctiluca,
Expand Down Expand Up @@ -2514,7 +2542,9 @@
/turf/simulated/floor/tiled,
/area/golden_deep/eva)
"zA" = (
/obj/structure/closet/secure_closet/guncabinet,
/obj/structure/closet/secure_closet/guncabinet{
req_access = list(217)
},
/obj/item/clothing/suit/armor/carrier/heavy,
/obj/item/clothing/suit/armor/carrier/heavy,
/obj/item/clothing/head/helmet/merc,
Expand Down Expand Up @@ -2701,6 +2731,7 @@
/obj/machinery/light{
dir = 4
},
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/golden_deep/secure)
"BF" = (
Expand Down Expand Up @@ -3087,6 +3118,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/golden_deep/secure)
"FV" = (
Expand Down Expand Up @@ -3138,7 +3170,9 @@
/turf/simulated/wall/shuttle/dark/cardinal/gold,
/area/golden_deep/warehouse)
"Gx" = (
/obj/structure/closet/secure_closet/guncabinet,
/obj/structure/closet/secure_closet/guncabinet{
req_access = list(217)
},
/obj/random/civgun/rifle,
/obj/random/civgun/rifle,
/obj/effect/floor_decal/industrial/outline/security,
Expand Down Expand Up @@ -4064,6 +4098,11 @@
/obj/structure/cable/green{
icon_state = "2-8"
},
/obj/structure/reagent_dispensers/coolanttank,
/obj/item/reagent_containers/glass/bucket{
pixel_y = -10;
pixel_x = -5
},
/turf/simulated/floor/tiled,
/area/golden_deep/engineering)
"Rz" = (
Expand Down Expand Up @@ -17378,19 +17417,19 @@ qw
jm
Tx
Tx
tO
Tx
gr
Tx
tO
Tx
Tx
tO
Tx
Tx
tO
Tx
Tx
Tx
KZ
Tx
tO
Tx
Tx
Tx
tJ
Expand Down Expand Up @@ -17540,19 +17579,19 @@ WZ
BW
zb
zb
zb
ov
vz
zb
ov
zb
zb
ov
zb
zb
zb
zb
zb
ov
Hj
zb
zb
ov
zb
zb
Mr
Expand Down Expand Up @@ -19287,7 +19326,7 @@ aH
aH
aH
vB
Rm
cc
fA
fA
fA
Expand Down

0 comments on commit b263112

Please sign in to comment.