From 9f51701c8b077b52001f638f6d643e312b9a643b Mon Sep 17 00:00:00 2001 From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> Date: Sat, 4 Jan 2025 22:17:27 +0100 Subject: [PATCH 1/3] fixes --- .../tegu_items/rcorp/objective.dm | 24 +++++++++---------- .../game/gamemodes/management/event/combat.dm | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ModularTegustation/tegu_items/rcorp/objective.dm b/ModularTegustation/tegu_items/rcorp/objective.dm index e87a0e7b31ba..7f59db38301a 100644 --- a/ModularTegustation/tegu_items/rcorp/objective.dm +++ b/ModularTegustation/tegu_items/rcorp/objective.dm @@ -239,15 +239,15 @@ GLOBAL_VAR_INIT(rcorp_payload, null) resistance_flags &= ~INDESTRUCTIBLE /obj/structure/rcorpcomms/deconstruct(disassembled = TRUE) - for(var/mob/M in GLOB.player_list) - to_chat(M, span_userdanger("RCORP'S COMMUNICATIONS HAVE BEEN DESTROYED.")) - switch(GLOB.rcorp_wincondition) - if(0) - to_chat(M, span_userdanger("ABNORMALITY MAJOR VICTORY.")) - if(1) - to_chat(M, span_userdanger("ABNORMALITY SUPREME VICTORY.")) - if(2) - to_chat(M, span_userdanger("ABNORMALITY MINOR VICTORY.")) - SSticker.force_ending = 1 - ..() - + if(!SSticker.force_ending) + for(var/mob/M in GLOB.player_list) + to_chat(M, span_userdanger("RCORP'S COMMUNICATIONS HAVE BEEN DESTROYED.")) + switch(GLOB.rcorp_wincondition) + if(0) + to_chat(M, span_userdanger("ABNORMALITY MAJOR VICTORY.")) + if(1) + to_chat(M, span_userdanger("ABNORMALITY SUPREME VICTORY.")) + if(2) + to_chat(M, span_userdanger("ABNORMALITY MINOR VICTORY.")) + SSticker.force_ending = 1 + return ..() diff --git a/code/game/gamemodes/management/event/combat.dm b/code/game/gamemodes/management/event/combat.dm index 8911b3b639cb..f23f829aca04 100644 --- a/code/game/gamemodes/management/event/combat.dm +++ b/code/game/gamemodes/management/event/combat.dm @@ -89,7 +89,7 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u /// Automatically ends the shift if no humanoid players are alive /datum/game_mode/combat/proc/CheckLiving() for(var/mob/living/carbon/human/hooman in GLOB.human_list) - if(hooman.stat != DEAD && hooman.ckey) + if(hooman.stat != DEAD && hooman.ckey && !istype(hooman, /mob/living/carbon/human/species/pinocchio)) return if(SSticker.force_ending == TRUE) // they lost another way before we could do it, how rude. @@ -134,7 +134,7 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u //Gamemode stuff /datum/game_mode/combat/proc/counterincrease() addtimer(CALLBACK(src, PROC_REF(counterincrease)), 1 MINUTES) - GLOB.combat_counter+=1 + GLOB.combat_counter++ if(SSmaptype.maptype == "wcorp") for(var/mob/living/carbon/human/H in GLOB.human_list) if(H.stat == DEAD) From c3fcc562f4e570d4fe1380356d049e898ba20014 Mon Sep 17 00:00:00 2001 From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> Date: Sat, 4 Jan 2025 22:22:09 +0100 Subject: [PATCH 2/3] adds some confetti and sad trombone --- ModularTegustation/tegu_items/rcorp/objective.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ModularTegustation/tegu_items/rcorp/objective.dm b/ModularTegustation/tegu_items/rcorp/objective.dm index 7f59db38301a..8e5048440eb8 100644 --- a/ModularTegustation/tegu_items/rcorp/objective.dm +++ b/ModularTegustation/tegu_items/rcorp/objective.dm @@ -250,4 +250,8 @@ GLOBAL_VAR_INIT(rcorp_payload, null) if(2) to_chat(M, span_userdanger("ABNORMALITY MINOR VICTORY.")) SSticker.force_ending = 1 + else + var/turf/turf = get_turf(src) + new /obj/effect/decal/cleanable/confetti(turf) + playsound(turf, 'sound/misc/sadtrombone.ogg', 100) return ..() From 495e861cbf83e72289e912223281b173ea812e32 Mon Sep 17 00:00:00 2001 From: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> Date: Sat, 4 Jan 2025 22:34:04 +0100 Subject: [PATCH 3/3] adds the prevention to other methods aswell --- .../tegu_items/rcorp/objective.dm | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/ModularTegustation/tegu_items/rcorp/objective.dm b/ModularTegustation/tegu_items/rcorp/objective.dm index 8e5048440eb8..1546fa7fd086 100644 --- a/ModularTegustation/tegu_items/rcorp/objective.dm +++ b/ModularTegustation/tegu_items/rcorp/objective.dm @@ -162,19 +162,24 @@ GLOBAL_VAR_INIT(rcorp_payload, null) light_on = FALSE update_light() - //Round End Effects - SSticker.SetRoundEndSound('sound/abnormalities/donttouch/end.ogg') - SSticker.force_ending = 1 - for(var/mob/M in GLOB.player_list) - to_chat(M, span_userdanger("[uppertext(user.real_name)] has collected the bough!")) - - switch(GLOB.rcorp_wincondition) - if(0) - to_chat(M, span_userdanger("R-CORP MAJOR VICTORY.")) - if(1) - to_chat(M, span_userdanger("R-CORP MINOR VICTORY.")) - if(2) - to_chat(M, span_userdanger("R-CORP SUPREME VICTORY.")) + if(!SSticker.force_ending) + //Round End Effects + SSticker.SetRoundEndSound('sound/abnormalities/donttouch/end.ogg') + SSticker.force_ending = 1 + for(var/mob/M in GLOB.player_list) + to_chat(M, span_userdanger("[uppertext(user.real_name)] has collected the bough!")) + + switch(GLOB.rcorp_wincondition) + if(0) + to_chat(M, span_userdanger("R-CORP MAJOR VICTORY.")) + if(1) + to_chat(M, span_userdanger("R-CORP MINOR VICTORY.")) + if(2) + to_chat(M, span_userdanger("R-CORP SUPREME VICTORY.")) + else + var/turf/turf = get_turf(src) + new /obj/effect/decal/cleanable/confetti(turf) + playsound(turf, 'sound/misc/sadtrombone.ogg', 100) else user.gib() //lol, idiot. @@ -191,11 +196,16 @@ GLOBAL_VAR_INIT(rcorp_payload, null) /mob/living/simple_animal/hostile/shrimp_vip/death(gibbed) - for(var/mob/M in GLOB.player_list) - to_chat(M, span_userdanger("THE VIP HAS BEEN SLAIN.")) - to_chat(M, span_userdanger("R-CORP MAJOR VICTORY.")) - SSticker.force_ending = 1 - ..() + if(!SSticker.force_ending) + for(var/mob/M in GLOB.player_list) + to_chat(M, span_userdanger("THE VIP HAS BEEN SLAIN.")) + to_chat(M, span_userdanger("R-CORP MAJOR VICTORY.")) + SSticker.force_ending = 1 + else + var/turf/turf = get_turf(src) + new /obj/effect/decal/cleanable/confetti(turf) + playsound(turf, 'sound/misc/sadtrombone.ogg', 100) + return ..() //Arbiter /obj/effect/mob_spawn/human/arbiter/rcorp