Skip to content

Commit

Permalink
handrail fixes and sprites, throwpass & projectile_coverage on many o…
Browse files Browse the repository at this point in the history
…bjects. other minor map fixes.
  • Loading branch information
Zenith00000 committed Jun 27, 2024
1 parent 44cac0a commit 333cf3c
Show file tree
Hide file tree
Showing 6 changed files with 683 additions and 339 deletions.
7 changes: 7 additions & 0 deletions code/game/machinery/doors/airlock_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -915,13 +915,15 @@

/obj/structure/machinery/door/airlock/hybrisa
openspeed = 4

/obj/structure/machinery/door/airlock/hybrisa/generic
name = "\improper Airlock"
icon = 'icons/obj/structures/doors/hybrisa/hybrisa_generic_glass.dmi'
opacity = FALSE
glass = TRUE
req_access = null
req_one_access = list(ACCESS_CIVILIAN_PUBLIC)

/obj/structure/machinery/door/airlock/hybrisa/generic/autoname
req_access = null
opacity = FALSE
Expand Down Expand Up @@ -968,6 +970,7 @@
glass = FALSE
req_access = null
req_one_access = list(ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_PUBLIC)

/obj/structure/machinery/door/airlock/hybrisa/medical_solid/autoname
autoname = TRUE
opacity = TRUE
Expand All @@ -983,6 +986,7 @@
glass = TRUE
req_access = null
req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL)

/obj/structure/machinery/door/airlock/hybrisa/personal/autoname
autoname = TRUE
opacity = FALSE
Expand All @@ -1007,13 +1011,15 @@
req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL)

// Personal White

/obj/structure/machinery/door/airlock/hybrisa/personal_white
name = "\improper Airlock"
icon = 'icons/obj/structures/doors/hybrisa/hybrisa_personaldoor_glass_white.dmi'
opacity = FALSE
glass = TRUE
req_access = null
req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL)

/obj/structure/machinery/door/airlock/hybrisa/personal_white/autoname
autoname = TRUE
req_access = null
Expand All @@ -1029,6 +1035,7 @@
glass = FALSE
req_access = null
req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL)

/obj/structure/machinery/door/airlock/hybrisa/personal_solid_white/autoname
autoname = TRUE
opacity = TRUE
Expand Down
8 changes: 6 additions & 2 deletions code/game/machinery/doors/multi_tile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -624,19 +624,19 @@
opacity = FALSE
glass = TRUE



// Hybrisa

/obj/structure/machinery/door/airlock/multi_tile/hybrisa
openspeed = 4

/obj/structure/machinery/door/airlock/multi_tile/hybrisa/generic
name = "\improper Airlock"
icon = 'icons/obj/structures/doors/hybrisa/hybrisa_2x1generic.dmi'
opacity = FALSE
glass = TRUE
req_access = null
req_one_access = list(ACCESS_CIVILIAN_PUBLIC)

/obj/structure/machinery/door/airlock/multi_tile/hybrisa/generic/autoname
req_access = null
opacity = FALSE
Expand Down Expand Up @@ -683,6 +683,7 @@
glass = FALSE
req_access = null
req_one_access = list(ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_PUBLIC)

/obj/structure/machinery/door/airlock/multi_tile/hybrisa/medical_solid/autoname
autoname = TRUE
opacity = TRUE
Expand All @@ -698,6 +699,7 @@
glass = TRUE
req_access = null
req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL)

/obj/structure/machinery/door/airlock/multi_tile/hybrisa/personal/autoname
autoname = TRUE
opacity = FALSE
Expand Down Expand Up @@ -730,6 +732,7 @@
glass = TRUE
req_access = null
req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL)

/obj/structure/machinery/door/airlock/multi_tile/hybrisa/personal_white/autoname
autoname = TRUE
opacity = FALSE
Expand All @@ -745,6 +748,7 @@
glass = FALSE
req_access = null
req_one_access = list(ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_COMMAND, ACCESS_WY_COLONIAL)

/obj/structure/machinery/door/airlock/multi_tile/hybrisa/personal_solid_white/autoname
autoname = TRUE
opacity = TRUE
Expand Down
19 changes: 18 additions & 1 deletion code/game/objects/structures/barricade/handrail.dm
Original file line number Diff line number Diff line change
Expand Up @@ -253,19 +253,36 @@
name = "wood road barrier"
icon_state = "roadbarrierpolice"

// Metal
// Metal Road Barrier

/obj/structure/barricade/handrail/hybrisa/road/metal
name = "metal road barrier"
icon_state = "centerroadbarrier"

/obj/structure/barricade/handrail/hybrisa/road/metal/metaltan
name = "metal road barrier"
icon_state = "centerroadbarrier"

/obj/structure/barricade/handrail/hybrisa/road/metal/metaltan/middle
name = "metal road barrier"
icon_state = "centerroadbarrier_middle"

/obj/structure/barricade/handrail/hybrisa/road/metal/metaldark
name = "metal road barrier"
icon_state = "centerroadbarrier2"

/obj/structure/barricade/handrail/hybrisa/road/metal/metaldark/middle
name = "metal road barrier"
icon_state = "centerroadbarrier2_middle"

/obj/structure/barricade/handrail/hybrisa/road/metal/metaldark2
name = "metal road barrier"
icon_state = "centerroadbarrier3"

/obj/structure/barricade/handrail/hybrisa/road/metal/metaldark2/middle
name = "metal road barrier"
icon_state = "centerroadbarrier3_middle"

/obj/structure/barricade/handrail/hybrisa/road/metal/double
name = "metal road barrier"
icon_state = "centerroadbarrierdouble"
Expand Down
19 changes: 19 additions & 0 deletions code/game/objects/structures/hybrisa_props.dm
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,8 @@
desc = "A long shelf filled with various foodstuffs"
icon = 'icons/obj/structures/props/supermart.dmi'
density = TRUE
projectile_coverage = 20
throwpass = TRUE

/obj/structure/prop/hybrisa/supermart/rack/longrackempty
name = "shelf"
Expand Down Expand Up @@ -576,6 +578,9 @@
icon = 'icons/obj/structures/props/hybrisatables.dmi'
icon_state = "blackmetaltable"
health = 1000
projectile_coverage = 20
throwpass = TRUE

/obj/structure/prop/hybrisa/furniture/tables
icon = 'icons/obj/structures/props/hybrisatables.dmi'
icon_state = "table_pool"
Expand Down Expand Up @@ -894,6 +899,8 @@
anchored = TRUE
unslashable = FALSE
health = 150
projectile_coverage = 20
throwpass = TRUE

/obj/structure/blackgoocontainer/initialize_pass_flags(datum/pass_flags_container/PF)
..()
Expand Down Expand Up @@ -1218,6 +1225,8 @@
name = "cabinet"
desc = "a small cabinet with drawers."
icon_state = "sidecabinet"
projectile_coverage = 20
throwpass = TRUE



Expand All @@ -1228,6 +1237,8 @@
icon_state = "trashblue"
health = 250
density = TRUE
projectile_coverage = 20
throwpass = TRUE

/obj/structure/prop/hybrisa/misc/trash/bullet_act(obj/projectile/P)
health -= P.damage
Expand Down Expand Up @@ -1909,6 +1920,8 @@
health = 2000
anchored = TRUE
layer = ABOVE_MOB_LAYER
projectile_coverage = 20
throwpass = TRUE

/obj/structure/prop/hybrisa/misc/stoneplanterseats/empty
name = "concrete planter"
Expand Down Expand Up @@ -1938,6 +1951,8 @@
unslashable = TRUE
unacidable = TRUE
indestructible = TRUE
projectile_coverage = 20
throwpass = TRUE
var/id = 1
var/range = 15

Expand All @@ -1957,6 +1972,8 @@
density = TRUE
anchored = TRUE
health = 250
projectile_coverage = 20
throwpass = TRUE

/obj/structure/prop/hybrisa/misc/firehydrant/bullet_act(obj/projectile/P)
health -= P.damage
Expand Down Expand Up @@ -2003,6 +2020,7 @@
anchored = TRUE

// Phonebox Prop (Doesn't actually work as a locker)

/obj/structure/prop/hybrisa/misc/phonebox
name = "wrecked phonebox"
desc = "It's a phonebox, outdated but realiable technology. These are used to communicate throughout the colony and connected colonies without interference. It seems it's completely wrecked, the glass is smashed, hiding inside would be pointless."
Expand All @@ -2013,6 +2031,7 @@
bound_height = 32
density = TRUE
anchored = TRUE

/obj/structure/prop/hybrisa/misc/phonebox/bloody
name = "wrecked phonebox"
desc = "It's a phonebox, outdated but realiable technology. These are used to communicate throughout the colony and connected colonies without interference. It seems it's completely wrecked, covered in blood and the glass is smashed. Hiding inside would be pointless."
Expand Down
Binary file modified icons/obj/structures/handrail.dmi
Binary file not shown.
Loading

0 comments on commit 333cf3c

Please sign in to comment.