Skip to content

Commit

Permalink
HELL IS REAL
Browse files Browse the repository at this point in the history
  • Loading branch information
@Imaginos16
Imaginos16 committed Nov 6, 2023
1 parent 69544a7 commit fbeaad5
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 17 deletions.
3 changes: 2 additions & 1 deletion _maps/shuttles/independent/independent_beluga.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,7 @@
/obj/item/clothing/head/hopcap,
/obj/item/gun/energy/e_gun/mini,
/obj/item/clothing/head/HoS/cowboy,
/obj/item/clothing/suit/jacket/leather/duster/command,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"ge" = (
Expand Down Expand Up @@ -3507,7 +3508,6 @@
/obj/item/clothing/under/rank/command,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/shoes/cowboy/black,
/obj/item/clothing/suit/armor/vest/capcarapace/alt,
/obj/item/clothing/suit/armor/vest/capcarapace/duster,
/obj/item/clothing/head/beret/captain,
/obj/item/clothing/head/caphat,
Expand All @@ -3521,6 +3521,7 @@
/obj/item/areaeditor/shuttle,
/obj/effect/turf_decal/spline/fancy/opaque/bottlegreen,
/obj/item/clothing/head/caphat/cowboy,
/obj/item/clothing/suit/armor/vest/capcarapace/captunic,
/turf/open/floor/wood/walnut,
/area/ship/bridge)
"Hv" = (
Expand Down
3 changes: 2 additions & 1 deletion _maps/shuttles/independent/independent_dwayne.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1552,8 +1552,9 @@
/obj/effect/turf_decal/corner/opaque/blue/half{
dir = 1
},
/obj/item/clothing/head/caphat/cowboy,
/obj/item/radio/intercom/wideband/directional/east,
/obj/item/clothing/suit/armor/vest/capcarapace/duster,
/obj/item/clothing/head/caphat/cowboy,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Ka" = (
Expand Down
1 change: 1 addition & 0 deletions _maps/shuttles/independent/independent_kilo.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@
/obj/item/spacecash/bundle/c1000,
/obj/item/spacecash/bundle/c1000,
/obj/item/spacecash/bundle/c1000,
/obj/item/clothing/suit/armor/vest/capcarapace/duster,
/turf/open/floor/carpet,
/area/ship/crew)
"da" = (
Expand Down
14 changes: 9 additions & 5 deletions _maps/shuttles/independent/nanotrasen_heron.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@
dir = 5
},
/obj/machinery/computer/atmos_control/tank/air_tank{
sensors = list("hairon"="Heron Air Mix Tank")
sensors = list("hairon"="Heron Air Mix Tank")
},
/obj/machinery/light_switch{
pixel_y = 23
Expand Down Expand Up @@ -6617,8 +6617,6 @@
req_access_txt = "20"
},
/obj/item/clothing/neck/cloak/cap,
/obj/item/clothing/gloves/color/captain,
/obj/item/clothing/head/caphat,
/obj/item/radio/headset/heads/captain/alt,
/obj/item/storage/backpack/captain,
/obj/item/clothing/under/rank/centcom/officer,
Expand All @@ -6640,6 +6638,8 @@
/obj/item/clothing/suit/hooded/wintercoat/centcom,
/obj/item/clothing/head/beret/centcom_formal,
/obj/item/stock_parts/cell/gun/upgraded,
/obj/item/clothing/head/centcom_cap,
/obj/item/clothing/gloves/combat,
/turf/open/floor/carpet/green,
/area/ship/crew/dorm/dormtwo)
"yc" = (
Expand Down Expand Up @@ -9267,6 +9267,10 @@
/obj/effect/turf_decal/corner/opaque/white/diagonal,
/turf/open/floor/plasteel,
/area/ship/crew/canteen/kitchen)
"HR" = (
/obj/item/clothing/gloves/color/captain/nt,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/crew/law_office)
"HT" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
Expand Down Expand Up @@ -9707,7 +9711,7 @@
dir = 9
},
/obj/machinery/computer/atmos_control/tank/toxin_tank{
sensors = list("heron_plasm"="Heron Plasma Tank")
sensors = list("heron_plasm"="Heron Plasma Tank")
},
/obj/structure/cable{
icon_state = "0-4"
Expand Down Expand Up @@ -15962,7 +15966,7 @@ oz
Oa
QG
QG
QG
HR
QG
QG
Ge
Expand Down
1 change: 1 addition & 0 deletions _maps/shuttles/nanotrasen/nanotrasen_delta.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1105,6 +1105,7 @@
/obj/item/gun/energy/laser,
/obj/item/megaphone/command,
/obj/machinery/light/small/directional/east,
/obj/item/clothing/head/caphat/parade,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"fy" = (
Expand Down
3 changes: 2 additions & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1934,7 +1934,7 @@
/obj/structure/railing,
/obj/machinery/computer/atmos_control/incinerator{
dir = 4;
sensors = list("gecko_burn_sensor"="Combustion Chamber")
sensors = list("gecko_burn_sensor"="Combustion Chamber")
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
Expand Down Expand Up @@ -3399,6 +3399,7 @@
/obj/effect/turf_decal/borderfloor{
dir = 1
},
/obj/item/clothing/head/caphat/parade,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Ij" = (
Expand Down
3 changes: 2 additions & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,6 @@
/obj/item/clothing/under/rank/command/captain/nt/skirt,
/obj/item/clothing/under/rank/command/captain/nt,
/obj/item/clothing/suit/armor/vest/capcarapace/alt,
/obj/item/clothing/gloves/color/captain,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/caphat/nt,
/obj/item/storage/belt/sabre,
Expand All @@ -1044,6 +1043,8 @@
desc = "An ICW-era self-destruct authorization disk. The codes on this are long past obsolete, but it's still a flagrant violation of company policy.";
name = "outdated nuclear authentication disk"
},
/obj/item/clothing/head/caphat/parade,
/obj/item/clothing/gloves/color/captain/nt,
/turf/open/floor/carpet/royalblue,
/area/ship/bridge)
"hv" = (
Expand Down
16 changes: 8 additions & 8 deletions _maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1508,10 +1508,7 @@
/obj/item/storage/backpack/satchel/leather,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/suit/armor/vest/hop,
/obj/item/clothing/head/hopcap,
/obj/item/clothing/head/hopcap/nt,
/obj/item/clothing/under/rank/command/head_of_personnel,
/obj/item/clothing/under/rank/command/head_of_personnel/skirt,
/obj/item/storage/box/ids,
/obj/item/storage/box/PDAs,
/obj/item/assembly/flash/handheld,
Expand All @@ -1521,6 +1518,8 @@
pixel_y = 32
},
/obj/effect/turf_decal/siding/wood,
/obj/item/clothing/under/rank/command/head_of_personnel/nt,
/obj/item/clothing/under/rank/command/head_of_personnel/nt/skirt,
/turf/open/floor/wood,
/area/ship/crew/crewthree)
"lg" = (
Expand Down Expand Up @@ -1833,7 +1832,7 @@
"nu" = (
/obj/machinery/computer/atmos_control/incinerator{
dir = 4;
sensors = list("nemo_incinerator_sensor"="Incinerator Chamber")
sensors = list("nemo_incinerator_sensor"="Incinerator Chamber")
},
/obj/structure/cable/yellow{
icon_state = "4-8"
Expand Down Expand Up @@ -5527,15 +5526,16 @@
/obj/item/storage/backpack/captain,
/obj/item/storage/belt/sabre,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/caphat,
/obj/item/clothing/head/beret/captain,
/obj/item/clothing/suit/armor/vest/capcarapace,
/obj/item/clothing/under/rank/command/captain/skirt,
/obj/item/clothing/under/rank/command/captain/suit,
/obj/item/clothing/under/rank/command/captain/parade,
/obj/item/clothing/shoes/laceup,
/obj/item/door_remote/captain,
/obj/item/clothing/suit/armor/vest/capcarapace/alt,
/obj/item/clothing/gloves/color/captain/nt,
/obj/item/clothing/under/rank/command/captain/nt/skirt,
/obj/item/clothing/under/rank/command/captain/nt,
/obj/item/clothing/head/caphat/parade,
/obj/item/clothing/head/caphat/nt,
/turf/open/floor/wood,
/area/ship/crew/crewtwo)
"UN" = (
Expand Down

0 comments on commit fbeaad5

Please sign in to comment.