cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13390 from Heroman3003/two-fixes

Browse Source 
Fixes two bugs
This commit is contained in:
Casey
2022-07-24 19:39:28 -04:00
committed by CHOMPStation2
parent cbc3751c64
commit 840510f1b2
3 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/admin.dm
View File

@@ -1,5 +1,3 @@
var/global/BSACooldown = 0
var/global/floorIsLava = 0 var/global/floorIsLava = 0

14
code/modules/admin/verbs/smite.dm
View File

@@ -50,14 +50,6 @@
if(!istype(target)) if(!istype(target))
return return
if(BSACooldown)
if(user)
to_chat(user,"<span class='warning'>BSA is still cooling down, please wait!</span>")
return
BSACooldown = 1
VARSET_IN(global, BSACooldown, FALSE, 5 SECONDS)
to_chat(target,"You've been hit by bluespace artillery!") to_chat(target,"You've been hit by bluespace artillery!")
log_and_message_admins("[key_name(target)] has been hit by Bluespace Artillery fired by [key_name(user ? user : usr)]") log_and_message_admins("[key_name(target)] has been hit by Bluespace Artillery fired by [key_name(user ? user : usr)]")
@@ -68,10 +60,12 @@
if(prob(80)) T.break_tile_to_plating() if(prob(80)) T.break_tile_to_plating()
else T.break_tile() else T.break_tile()
if(target.health == 1) playsound(T, get_sfx("explosion"), 100, 1, get_rand_frequency(), falloff = 5) // get_sfx() is so that everyone gets the same sound
if(target.health < 10)
target.gib() target.gib()
else else
target.adjustBruteLoss( min( 99 , (target.health - 1) ) ) target.adjustBruteLoss( max( 99 , (target.health - 1) ) )
target.Stun(20) target.Stun(20)
target.Weaken(20) target.Weaken(20)
target.stuttering = 20 target.stuttering = 20

10
code/modules/planet/virgo3c_vr.dm
View File

@@ -147,11 +147,11 @@ var/datum/planet/virgo3c/planet_virgo3c = null
/datum/weather/virgo3c/clear /datum/weather/virgo3c/clear
name = "clear" name = "clear"
transition_chances = list( transition_chances = list(
WEATHER_CLEAR = 60, WEATHER_CLEAR = 120,
WEATHER_OVERCAST = 20, WEATHER_OVERCAST = 40,
WEATHER_LIGHT_SNOW = 1, WEATHER_LIGHT_SNOW = 2,
WEATHER_BLOOD_MOON = 1, WEATHER_BLOOD_MOON = 2,
WEATHER_EMBERFALL = 0.5) WEATHER_EMBERFALL = 1)
transition_messages = list( transition_messages = list(
"The sky clears up.", "The sky clears up.",
"The sky is visible.", "The sky is visible.",