mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 19:52:40 +00:00
Merge pull request #13681 from Heroman3003/few-things-aaa
Fixes a few minor things
This commit is contained in:
@@ -52,7 +52,7 @@ SUBSYSTEM_DEF(chat)
|
|||||||
for(var/I in target)
|
for(var/I in target)
|
||||||
var/client/C = CLIENT_FROM_VAR(I) //Grab us a client if possible
|
var/client/C = CLIENT_FROM_VAR(I) //Grab us a client if possible
|
||||||
|
|
||||||
if(!C)
|
if(!C || !C.chatOutput)
|
||||||
continue // No client? No care.
|
continue // No client? No care.
|
||||||
else if(C.chatOutput.broken)
|
else if(C.chatOutput.broken)
|
||||||
DIRECT_OUTPUT(C, original_message)
|
DIRECT_OUTPUT(C, original_message)
|
||||||
@@ -65,7 +65,7 @@ SUBSYSTEM_DEF(chat)
|
|||||||
else
|
else
|
||||||
var/client/C = CLIENT_FROM_VAR(target) //Grab us a client if possible
|
var/client/C = CLIENT_FROM_VAR(target) //Grab us a client if possible
|
||||||
|
|
||||||
if(!C)
|
if(!C || !C.chatOutput)
|
||||||
return // No client? No care.
|
return // No client? No care.
|
||||||
else if(C.chatOutput.broken)
|
else if(C.chatOutput.broken)
|
||||||
DIRECT_OUTPUT(C, original_message)
|
DIRECT_OUTPUT(C, original_message)
|
||||||
|
|||||||
@@ -92,8 +92,8 @@
|
|||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
/obj/machinery/teleport/station/attack_ai()
|
/obj/machinery/teleport/station/attack_ai(mob/user)
|
||||||
attack_hand()
|
attack_hand(user)
|
||||||
|
|
||||||
/obj/machinery/computer/teleporter/attack_ai(mob/user)
|
/obj/machinery/computer/teleporter/attack_ai(mob/user)
|
||||||
teleport_control.tgui_interact(user)
|
teleport_control.tgui_interact(user)
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
to_chat(usr, "<font color='red'> You cannot pray (muted).</font>")
|
to_chat(usr, "<font color='red'> You cannot pray (muted).</font>")
|
||||||
return
|
return
|
||||||
|
|
||||||
var/image/cross = image('icons/obj/storage.dmi',"bible")
|
var/icon/cross = icon('icons/obj/storage.dmi',"bible")
|
||||||
msg = "<font color='blue'>\icon[cross][bicon(cross)] <b><font color=purple>PRAY: </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[src]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) ([admin_jump_link(src, src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>) (<A HREF='?_src_=holder;adminsmite=\ref[src]'>SMITE</a>):</b> [msg]</font>"
|
msg = "<font color='blue'>\icon[cross][bicon(cross)] <b><font color=purple>PRAY: </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[src]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) ([admin_jump_link(src, src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>) (<A HREF='?_src_=holder;adminsmite=\ref[src]'>SMITE</a>):</b> [msg]</font>"
|
||||||
|
|
||||||
for(var/client/C in GLOB.admins)
|
for(var/client/C in GLOB.admins)
|
||||||
|
|||||||
@@ -345,6 +345,7 @@ var/global/list/light_type_cache = list()
|
|||||||
construct.transfer_fingerprints_to(src)
|
construct.transfer_fingerprints_to(src)
|
||||||
set_dir(construct.dir)
|
set_dir(construct.dir)
|
||||||
else
|
else
|
||||||
|
installed_light = new light_type(src)
|
||||||
if(start_with_cell && !no_emergency)
|
if(start_with_cell && !no_emergency)
|
||||||
cell = new/obj/item/weapon/cell/emergency_light(src)
|
cell = new/obj/item/weapon/cell/emergency_light(src)
|
||||||
var/obj/item/weapon/light/L = get_light_type_instance(light_type) //This is fine, but old code.
|
var/obj/item/weapon/light/L = get_light_type_instance(light_type) //This is fine, but old code.
|
||||||
@@ -859,6 +860,7 @@ var/global/list/light_type_cache = list()
|
|||||||
s.start()
|
s.start()
|
||||||
status = LIGHT_BROKEN //This occasionally runtimes when it occurs midround after build mode spawns a broken light. No idea why.
|
status = LIGHT_BROKEN //This occasionally runtimes when it occurs midround after build mode spawns a broken light. No idea why.
|
||||||
installed_light.status = status
|
installed_light.status = status
|
||||||
|
installed_light.update_icon()
|
||||||
update()
|
update()
|
||||||
|
|
||||||
/obj/machinery/light/proc/fix()
|
/obj/machinery/light/proc/fix()
|
||||||
|
|||||||
@@ -14,9 +14,6 @@
|
|||||||
// create a new lighting fixture
|
// create a new lighting fixture
|
||||||
/obj/machinery/light/New()
|
/obj/machinery/light/New()
|
||||||
..()
|
..()
|
||||||
installed_light = new light_type
|
|
||||||
installed_light.status = status //This is just in case RNG decides to break the light at round start!
|
|
||||||
installed_light.update_icon() //Give it the proper sprite!
|
|
||||||
//Vorestation addition, so large mobs stop looking stupid in front of lights.
|
//Vorestation addition, so large mobs stop looking stupid in front of lights.
|
||||||
if (dir == SOUTH) // Lights are backwards, SOUTH lights face north (they are on south wall)
|
if (dir == SOUTH) // Lights are backwards, SOUTH lights face north (they are on south wall)
|
||||||
layer = ABOVE_MOB_LAYER
|
layer = ABOVE_MOB_LAYER
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 428 KiB After Width: | Height: | Size: 426 KiB |
Reference in New Issue
Block a user