cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] rework appearance changer (#9588)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-12-08 06:38:57 -07:00
committed by GitHub
parent d3976b78a3
commit 983664d462
25 changed files with 309 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/devices/personal_shield_generator_vr.dm
View File

@@ -542,7 +542,7 @@
//Misc belts. Admin-spawn only atm.
/obj/item/personal_shield_generator/belt/adminbus
desc = "You should not see this. You REALLY should not see this. If you do, you have either been blessed or are about to be the target of some sick prank."
desc = DEVELOPER_WARNING_NAME + " You REALLY should not see this. If you do, you have either been blessed or are about to be the target of some sick prank."
modifier_type = /datum/modifier/shield_projection/admin
generator_hit_cost = 0
generator_active_cost = 0

2
code/game/objects/items/falling_object_vr.dm
View File

@@ -1,5 +1,5 @@
/obj/effect/falling_effect
name = "you should not see this"
name = DEVELOPER_WARNING_NAME
desc = "no data"
invisibility = 101
anchored = TRUE

8
code/game/objects/structures/curtains.dm
View File

@@ -26,6 +26,14 @@
toggle()
..()
/obj/structure/curtain/attack_ai(mob/user)
if(!Adjacent(user))
return
if(!isrobot((user)))
return
playsound(src, "rustle", 15, 1, -5)
toggle()
/obj/structure/curtain/proc/toggle()
set_opacity(!opacity)
if(opacity)

14
code/game/objects/structures/mirror.dm
View File

@@ -11,7 +11,7 @@
var/glass = 1
var/datum/tgui_module/appearance_changer/mirror/M
/obj/structure/mirror/Initialize(mapload, var/dir, var/building = 0, mob/user as mob)
/obj/structure/mirror/Initialize(mapload, var/dir, var/building = 0)
M = new(src, null)
if(building)
glass = 0
@@ -24,12 +24,18 @@
QDEL_NULL(M)
. = ..()
/obj/structure/mirror/attack_hand(mob/user as mob)
/obj/structure/mirror/attack_hand(mob/user)
if(!glass) return
if(shattered) return
if(ishuman(user))
M.tgui_interact(user)
M.tgui_interact(user)
/obj/structure/mirror/attack_ai(mob/user)
if(!glass) return
if(shattered) return
if(!Adjacent(user)) return
M.tgui_interact(user)
/obj/structure/mirror/proc/shatter()
if(!glass) return