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

The 515 MegaPR early downport (#7783)

Browse Source 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
Cadyn
2024-02-27 11:17:32 -08:00
committed by GitHub
parent 96a43a09c1
commit b90f7ec922
254 changed files with 2135 additions and 1576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/shieldgen/directional_shield.dm
View File

@@ -102,13 +102,13 @@
START_PROCESSING(SSobj, src)
if(always_on)
create_shields()
GLOB.moved_event.register(src, src, PROC_REF(moved_event))
RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(moved_event))
return ..()
/obj/item/shield_projector/Destroy()
destroy_shields()
STOP_PROCESSING(SSobj, src)
GLOB.moved_event.unregister(src, src, PROC_REF(moved_event))
UnregisterSignal(src, COMSIG_OBSERVER_MOVED)
return ..()
/obj/item/shield_projector/proc/moved_event()

8
code/modules/shieldgen/emergency_shield.dm
View File

@@ -259,14 +259,14 @@
return
if (src.active)
user.visible_message(span_blue("\icon[src][bicon(src)] [user] deactivated the shield generator."), \
span_blue("\icon[src][bicon(src)] You deactivate the shield generator."), \
user.visible_message(span_blue("[icon2html(src,viewers(src))] [user] deactivated the shield generator."), \
span_blue("[icon2html(src,user.client)] You deactivate the shield generator."), \
"You hear heavy droning fade out.")
src.shields_down()
else
if(anchored)
user.visible_message(span_blue("\icon[src][bicon(src)] [user] activated the shield generator."), \
span_blue("\icon[src][bicon(src)] You activate the shield generator."), \
user.visible_message(span_blue("[icon2html(src,viewers(src))] [user] activated the shield generator."), \
span_blue("[icon2html(src, user.client)] You activate the shield generator."), \
"You hear heavy droning.")
src.shields_up()
else

2
code/modules/shieldgen/shield_capacitor.dm
View File

@@ -49,7 +49,7 @@
else if(W.has_tool_quality(TOOL_WRENCH))
src.anchored = !src.anchored
playsound(src, W.usesound, 75, 1)
src.visible_message(span_blue("\icon[src][bicon(src)] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user]."))
src.visible_message(span_blue("[icon2html(src,viewers(src))] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user]."))
if(anchored)
spawn(0)

6
code/modules/shieldgen/shield_gen.dm
View File

@@ -72,7 +72,7 @@
else if(W.has_tool_quality(TOOL_WRENCH))
src.anchored = !src.anchored
playsound(src, W.usesound, 75, 1)
src.visible_message(span_blue("\icon[src][bicon(src)] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user]."))
src.visible_message(span_blue("[icon2html(src,viewers(src))] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user]."))
if(active)
toggle()
@@ -245,7 +245,7 @@
covered_turfs = null
for(var/mob/M in view(5,src))
to_chat(M, "\icon[src][bicon(src)] You hear heavy droning start up.")
to_chat(M, "[icon2html(src, M.client)] You hear heavy droning start up.")
for(var/obj/effect/energy_field/E in field) // Update the icons here to ensure all the shields have been made already.
E.update_icon()
shield_hum.start()
@@ -256,7 +256,7 @@
qdel(D)
for(var/mob/M in view(5,src))
to_chat(M, "\icon[src][bicon(src)] You hear heavy droning fade out.")
to_chat(M, "[icon2html(src, M.client)] You hear heavy droning fade out.")
shield_hum.stop()
/obj/machinery/shield_gen/update_icon()