This commit is contained in:
Drulikar
2025-01-07 07:01:43 -06:00
parent ac8f3d5dd0
commit ff70da0895
3 changed files with 8 additions and 7 deletions
+3 -3
View File
@@ -422,7 +422,7 @@
/obj/machinery/door/airlock/research
name = "Research Airlock"
icon = 'icons/obj/doors/Doorresearch.dmi'
icon = 'icons/obj/doors/doorresearch.dmi'
assembly_type = /obj/structure/door_assembly/door_assembly_research
open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off.
close_sound_powered = 'sound/machines/door/hall1c.ogg' // VOREStation Edit: Default door sounds for fancy, department-off.
@@ -432,7 +432,7 @@
/obj/machinery/door/airlock/glass_research
name = "Research Airlock"
icon = 'icons/obj/doors/Doorresearchglass.dmi'
icon = 'icons/obj/doors/doorresearchglass.dmi'
hitsound = 'sound/effects/Glasshit.ogg'
maxhealth = 300
explosion_resistance = 5
@@ -553,7 +553,7 @@
/obj/machinery/door/airlock/science
name = "Research Airlock"
icon = 'icons/obj/doors/Doorsci.dmi'
icon = 'icons/obj/doors/doorsci.dmi'
assembly_type = /obj/structure/door_assembly/door_assembly_science
req_one_access = list(access_research)
open_sound_powered = 'sound/machines/door/hall1o.ogg' // VOREStation Edit: Default door sounds for fancy, department-off.
@@ -22,10 +22,11 @@ var/list/marker_beacon_colors = list(
description_info = "Use inhand to drop one marker beacon. You can pick them up again with an empty hand or \
hitting them with this marker stack. Alt-click to select a specific color."
icon = 'icons/obj/lighting.dmi'
icon_state = "marker"
icon_state = "markerrandom"
max_amount = 100
no_variants = TRUE
w_class = ITEMSIZE_SMALL
var/icon_base = "marker"
var/picked_color = "random"
/obj/item/stack/marker_beacon/ten
@@ -47,7 +48,7 @@ var/list/marker_beacon_colors = list(
. += span_notice("Alt-click to select a color. Current color is [picked_color].")
/obj/item/stack/marker_beacon/update_icon()
icon_state = "[initial(icon_state)][lowertext(picked_color)]"
icon_state = "[icon_base][lowertext(picked_color)]"
/obj/item/stack/marker_beacon/attack_self(mob/user)
if(!isturf(user.loc))
+2 -2
View File
@@ -58,7 +58,7 @@
/obj/random/technology_scanner
name = "random scanner"
desc = "This is a random technology scanner."
icon_state = "random_device"
icon_state = "tech"
/obj/random/technology_scanner/item_to_spawn()
return pick(prob(5);/obj/item/t_scanner,
@@ -91,7 +91,7 @@
/obj/random/bomb_supply
name = "bomb supply"
desc = "This is a random bomb supply."
icon_state = "random_device"
icon_state = "tech"
/obj/random/bomb_supply/item_to_spawn()
return pick(/obj/item/assembly/igniter,