cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Allows for the gravity generator to be cmagged. (#20944)" (#21493)

Browse Source 
This reverts commit 7115eca62e.
This commit is contained in:
Luc
2023-06-27 22:13:18 -05:00
committed by GitHub
parent 1c64facdb5
commit b1565a36e9
3 changed files with 0 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/gravitygenerator.dm
-40
View File
@@ -91,13 +91,9 @@ GLOBAL_LIST_EMPTY(gravity_generators)
var/current_overlay = null
var/construction_state = GRAV_NEEDS_WELDING
var/overlay_state = "activated"
/// The last time we were cmagged, so we don't see this spammed.
var/on_cmag_cooldown = FALSE
/obj/machinery/gravity_generator/main/examine(mob/user)
. = ..()
if(HAS_TRAIT(src, TRAIT_CMAGGED))
. += "<span class='warning'>Yellow ooze seems to be coming out of the control panel...</span>"
if(!(stat & BROKEN))
return
@@ -121,7 +117,6 @@ GLOBAL_LIST_EMPTY(gravity_generators)
if(!is_station_level(A.z))
continue
A.gravitychange(FALSE, A)
A.cmag_grav_change(FALSE, A)
shake_everyone()
return ..()
@@ -298,7 +293,6 @@ GLOBAL_LIST_EMPTY(gravity_generators)
if(!is_station_level(A.z))
continue
A.gravitychange(TRUE, A)
A.cmag_grav_change(TRUE, A)
else if(generators_in_level() == TRUE) // Turned off, and there is gravity
alert = TRUE
@@ -308,46 +302,12 @@ GLOBAL_LIST_EMPTY(gravity_generators)
if(!is_station_level(A.z))
continue
A.gravitychange(FALSE, A)
A.cmag_grav_change(FALSE, A)
update_icon()
update_gen_list()
if(alert)
shake_everyone()
/obj/machinery/gravity_generator/main/cmag_act(mob/user)
if(HAS_TRAIT(src, TRAIT_CMAGGED))
return
if(on_cmag_cooldown)
to_chat(user, "<span class='danger'>[src] still smells faintly of burned banana, you should probably wait a bit.</span>")
return
to_chat(user, "<span class='warning'>You slap the card around [src], and its gravity draws some ooze off of the card and into its core! Looks like it'll take effect shortly.</span>")
playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
ADD_TRAIT(src, TRAIT_CMAGGED, CLOWN_EMAG)
add_attack_logs(user, src, "cmagged, making everyone flippery.")
addtimer(CALLBACK(src, PROC_REF(do_cmagging), user), 10 SECONDS)
/obj/machinery/gravity_generator/main/proc/do_cmagging(mob/user)
// give the perp a moment to get away, even though it will be incredibly obvious who did it.
if(on)
// if it was already off, then we'll have a fun surprise when it wakes up
for(var/area/A in world)
if(!is_station_level(A.z))
continue
A.cmag_grav_change(TRUE, A)
shake_everyone()
add_fingerprint(user)
on_cmag_cooldown = TRUE
addtimer(VARSET_CALLBACK(src, on_cmag_cooldown, FALSE), 5 MINUTES)
/obj/machinery/gravity_generator/main/uncmag()
for(var/area/A in world)
if(!is_station_level(A.z))
continue
A.cmag_grav_change(FALSE, A)
shake_everyone()
// Charge/Discharge and turn on/off gravity when you reach 0/100 percent.
// Also emit radiation and handle the overlays.
/obj/machinery/gravity_generator/main/process()