The Great Deck 3 and Operations Remap (#13743)

This commit is contained in:
SleepyGemmy
2022-05-09 15:17:16 +02:00
committed by GitHub
parent e720e051f1
commit ad29518f38
25 changed files with 26866 additions and 17275 deletions
@@ -0,0 +1,15 @@
/obj/item/hullbeacon
name = "hull beacon"
desc = "A light-emitting hull beacon."
icon = 'icons/obj/lighting.dmi'
anchored = TRUE
/obj/item/hullbeacon/attack_hand(mob/user)
return
/obj/item/hullbeacon/red
name = "red hull beacon"
desc = "A light-emitting red hull beacon."
icon_state = "beacon_red_on"
light_color = LIGHT_COLOR_RED
light_range = 3
@@ -25,6 +25,7 @@ var/list/tape_roll_applications = list()
name = "tape"
icon = 'icons/policetape.dmi'
anchored = 1
layer = 3.1 // Above closed airlocks.
var/lifted = 0
var/list/crumplers
var/crumpled = 0
@@ -980,4 +980,10 @@
else
to_chat(user, SPAN_WARNING("\The [src] needs to be empty before you can do that!"))
else
..()
..()
/obj/item/storage/box/tungstenslugs
name = "box of compact tungsten slugs"
desc = "A box with several compact tungsten slugs, aimed for use in gauss carbines."
icon_state = "box_tungstenslug"
starts_with = list(/obj/item/ammo_casing/gauss/carbine = 4)
+5 -2
View File
@@ -65,8 +65,11 @@
desc = "A catwalk for easier EVA maneuvering."
icon = 'icons/obj/smooth/catwalk.dmi'
icon_state = "catwalk"
smooth = TRUE
canSmoothWith = null
smooth = SMOOTH_TRUE
canSmoothWith = list(
/obj/structure/lattice/catwalk,
/obj/structure/lattice/catwalk/indoor
)
var/return_amount = 3
// Special catwalk that can be placed on regular flooring.
+12 -12
View File
@@ -69,18 +69,18 @@
name = "airtight plastic flaps"
desc = "Heavy duty, airtight, plastic flaps."
New() //set the turf below the flaps to block air
var/turf/T = get_turf(loc)
if(T)
T.blocks_air = 1
..()
/obj/structure/plasticflaps/mining/New() //set the turf below the flaps to block air
var/turf/T = get_turf(loc)
if(T)
T.blocks_air = 1
..()
Destroy() //lazy hack to set the turf to allow air to pass if it's a simulated floor
var/turf/T = get_turf(loc)
if(T)
if(istype(T, /turf/simulated/floor))
T.blocks_air = 0
return ..()
/obj/structure/plasticflaps/mining/Destroy() //lazy hack to set the turf to allow air to pass if it's a simulated floor
var/turf/T = get_turf(loc)
if(T)
if(istype(T, /turf/simulated/floor))
T.blocks_air = 0
return ..()
//Airtight plastic flaps made for the kitchen freezer, blocks atmos but not movement
@@ -103,4 +103,4 @@
return ..()
/obj/structure/plasticflaps/airtight/CanPass(atom/A, turf/T)
return 1//Blocks nothing except air
return 1//Blocks nothing except air
+24
View File
@@ -275,11 +275,35 @@
desc = "A green sign pointing towards an emergency exit."
icon_state = "emerg_exit"
/obj/structure/sign/emerg_exit/evac
name = "\improper EVACUATION ROUTE sign"
desc = "A green sign pointing towards an evacuation route."
icon_state = "emerg_exit"
/obj/structure/sign/emerg_exitZ
name = "\improper EMERGENCY LADDER"
desc = "A green sign that depicts a person climbing the ladder towards the arrow's direction, pointing at the emergency exit."
icon_state = "emerg_exitZ"
/obj/structure/sign/emerg_exitZ/evac
name = "\improper EVACUATION ROUTE sign"
desc = "A green sign that depicts a person climbing a ladder towards an evacuation route."
icon_state = "emerg_exitZ"
/obj/structure/sign/emerg_exitZ_stairs
name = "\improper STAIRS"
desc = "A green sign that depicts a person using stairs towards the arrow's direction, pointing at the emergency exit."
icon_state = "emerg_exitZ_stairs"
/obj/structure/sign/emerg_exitZ_stairs/evac
name = "\improper EVACUATION ROUTE sign"
desc = "A green sign that depicts a person using a stairwell, moving towards an evacuation route."
icon_state = "emerg_exitZ_stairs"
/obj/structure/sign/emerg_pods
name = "\improper EVACUATION POD sign"
desc = "A green sign that depicts an evacuation pod, with the text \"EVACUATION PODS\" under it."
icon_state = "emerg_pods"
//Christmas
/obj/structure/sign/christmas/lights