cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-01 12:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Batch pr pull (#12554)

Browse Source 
* https://github.com/tgstation/tgstation/pull/65814

* https://github.com/tgstation/tgstation/pull/65832

* https://github.com/tgstation/tgstation/pull/65850

* https://github.com/tgstation/tgstation/pull/65689

* https://github.com/tgstation/tgstation/pull/65579

* https://github.com/tgstation/tgstation/pull/65760
This commit is contained in:
Gandalf
2022-04-06 19:26:58 +01:00
committed by GitHub
parent 9917ff2643
commit ad0b6e4e67
51 changed files with 485 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/power/singularity/emitter.dm
View File

@@ -125,9 +125,9 @@
/obj/machinery/power/emitter/Destroy()
if(SSticker.IsRoundInProgress())
var/turf/T = get_turf(src)
message_admins("Emitter deleted at [ADMIN_VERBOSEJMP(T)]")
log_game("Emitter deleted at [AREACOORD(T)]")
investigate_log("<font color='red'>deleted</font> at [AREACOORD(T)]", INVESTIGATE_SINGULO)
message_admins("[src] deleted at [ADMIN_VERBOSEJMP(T)]")
log_game("[src] deleted at [AREACOORD(T)]")
investigate_log("deleted at [AREACOORD(T)]", INVESTIGATE_ENGINE)
QDEL_NULL(sparks)
return ..()
@@ -158,9 +158,9 @@
fire_delay = maximum_fire_delay
to_chat(user, span_notice("You turn [active ? "on" : "off"] [src]."))
message_admins("Emitter turned [active ? "ON" : "OFF"] by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]")
log_game("Emitter turned [active ? "ON" : "OFF"] by [key_name(user)] in [AREACOORD(src)]")
investigate_log("turned [active ? "<font color='green'>ON</font>" : "<font color='red'>OFF</font>"] by [key_name(user)] at [AREACOORD(src)]", INVESTIGATE_SINGULO)
message_admins("[src] turned [active ? "ON" : "OFF"] by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]")
log_game("[src] turned [active ? "ON" : "OFF"] by [key_name(user)] in [AREACOORD(src)]")
investigate_log("turned [active ? "ON" : "OFF"] by [key_name(user)] at [AREACOORD(src)]", INVESTIGATE_ENGINE)
update_appearance()
/obj/machinery/power/emitter/attack_animal(mob/living/simple_animal/user, list/modifiers)
@@ -189,15 +189,15 @@
if(powered)
powered = FALSE
update_appearance()
investigate_log("lost power and turned <font color='red'>OFF</font> at [AREACOORD(src)]", INVESTIGATE_SINGULO)
log_game("Emitter lost power in [AREACOORD(src)]")
investigate_log("lost power and turned OFF at [AREACOORD(src)]", INVESTIGATE_ENGINE)
log_game("[src] lost power in [AREACOORD(src)]")
return
add_load(active_power_usage)
if(!powered)
powered = TRUE
update_appearance()
investigate_log("regained power and turned <font color='green'>ON</font> at [AREACOORD(src)]", INVESTIGATE_SINGULO)
investigate_log("regained power and turned ON at [AREACOORD(src)]", INVESTIGATE_ENGINE)
if(charge <= 80)
charge += 2.5 * delta_time
if(!check_delay() || manual == TRUE)

4
code/modules/power/singularity/field_generator.dm
View File

@@ -95,7 +95,7 @@ no power level overlay is currently in the overlays list.
span_notice("You turn on [src]."),
span_hear("You hear heavy droning."))
turn_on()
investigate_log("<font color='green'>activated</font> by [key_name(user)].", INVESTIGATE_SINGULO)
investigate_log("activated by [key_name(user)].", INVESTIGATE_ENGINE)
add_fingerprint(user)
@@ -237,7 +237,7 @@ no power level overlay is currently in the overlays list.
else
visible_message(span_danger("The [name] shuts down!"), span_hear("You hear something shutting down."))
turn_off()
investigate_log("ran out of power and <font color='red'>deactivated</font>", INVESTIGATE_SINGULO)
investigate_log("ran out of power and DEACTIVATED.", INVESTIGATE_ENGINE)
power = 0
check_power_level()
return FALSE

8
code/modules/power/singularity/singularity.dm
View File

@@ -144,7 +144,7 @@
switch(severity)
if(EXPLODE_DEVASTATE)
if(current_size <= STAGE_TWO)
investigate_log("has been destroyed by a heavy explosion.", INVESTIGATE_SINGULO)
investigate_log("has been destroyed by a heavy explosion.", INVESTIGATE_ENGINE)
qdel(src)
return
@@ -264,7 +264,7 @@
resolved_singularity.singularity_size = current_size
if(current_size == allowed_size)
investigate_log("<font color='red'>grew to size [current_size]</font>", INVESTIGATE_SINGULO)
investigate_log("grew to size [current_size].", INVESTIGATE_ENGINE)
return TRUE
else if(current_size < (--temp_allowed_size))
expand(temp_allowed_size)
@@ -273,7 +273,7 @@
/obj/singularity/proc/check_energy()
if(energy <= 0)
investigate_log("collapsed.", INVESTIGATE_SINGULO)
investigate_log("collapsed.", INVESTIGATE_ENGINE)
qdel(src)
return FALSE
switch(energy)//Some of these numbers might need to be changed up later -Mport
@@ -437,7 +437,7 @@
/obj/singularity/singularity_act()
var/gain = (energy/2)
var/dist = max((current_size - 2),1)
investigate_log("has been destroyed by another singularity.", INVESTIGATE_SINGULO)
investigate_log("has been destroyed by another singularity.", INVESTIGATE_ENGINE)
explosion(
src,
devastation_range = dist,