cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 03:56:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8661 from ShadowLarkens/med_pass_2

Browse Source 
TGUI Medical: Second Pass
This commit is contained in:
Novacat
2020-08-12 20:01:12 -04:00
committed by GitHub
parent cc0d7eb3a7 5c6025b8e8
commit e4b5b8ea2d
46 changed files with 2418 additions and 1509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/cosmetics.dm
+6 -7
View File
@@ -96,17 +96,16 @@
w_class = ITEMSIZE_TINY
icon = 'icons/obj/items.dmi'
icon_state = "trinketbox"
var/list/ui_users = list()
var/datum/tgui_module/appearance_changer/mirror/coskit/M
/obj/item/weapon/makeover/Initialize()
. = ..()
M = new(src, null)
/obj/item/weapon/makeover/attack_self(mob/living/carbon/user as mob)
if(ishuman(user))
to_chat(user, "<span class='notice'>You flip open \the [src] and begin to adjust your appearance.</span>")
var/datum/nano_module/appearance_changer/AC = ui_users[user]
if(!AC)
AC = new(src, user)
AC.name = "SalonPro Porta-Makeover Deluxe&trade;"
ui_users[user] = AC
AC.ui_interact(user)
M.tgui_interact(user)
var/mob/living/carbon/human/H = user
var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES]
if(istype(E))
code/game/objects/structures/ghost_pods/human.dm
+2 -2
View File
@@ -121,7 +121,7 @@
H.adjustBruteLoss(rand(1,20))
if(allow_appearance_change)
H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 1)
H.change_appearance(APPEARANCE_ALL, H, check_species_whitelist = 1)
visible_message("<span class='aliem'>\The [src] [pick("gurgles", "seizes", "clangs")] before releasing \the [H]!</span>")
@@ -241,6 +241,6 @@
H.adjustBruteLoss(rand(1,20))
if(allow_appearance_change)
H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 1)
H.change_appearance(APPEARANCE_ALL, H, check_species_whitelist = 1)
visible_message("<span class='aliem'>\The [src] [pick("gurgles", "seizes", "clangs")] before releasing \the [H]!</span>")
code/game/objects/structures/mirror.dm
+7 -7
View File
@@ -7,10 +7,11 @@
density = 0
anchored = 1
var/shattered = 0
var/list/ui_users = list()
var/glass = 1
var/datum/tgui_module/appearance_changer/mirror/M
/obj/structure/mirror/New(var/loc, var/dir, var/building = 0, mob/user as mob)
M = new(src, null)
if(building)
glass = 0
icon_state = "mirror_frame"
@@ -18,17 +19,16 @@
pixel_y = (dir & 3)? (dir == 1 ? -30 : 30) : 0
return
/obj/structure/mirror/Destroy()
QDEL_NULL(M)
. = ..()
/obj/structure/mirror/attack_hand(mob/user as mob)
if(!glass) return
if(shattered) return
if(ishuman(user))
var/datum/nano_module/appearance_changer/AC = ui_users[user]
if(!AC)
AC = new(src, user)
AC.name = "SalonPro Nano-Mirror&trade;"
ui_users[user] = AC
AC.ui_interact(user)
M.tgui_interact(user)
/obj/structure/mirror/proc/shatter()
if(!glass) return