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

[MIRROR] Fixed potential runtimes smites and adds smite options (#9134)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
This commit is contained in:
CHOMPStation2
2024-10-03 15:30:37 -07:00
committed by GitHub
parent 49ec30ac06
commit 4ff2ed823b
3 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
code/modules/admin/player_effects.dm
View File

@@ -66,7 +66,7 @@
to_chat(user,"[target] didn't have any breakable legs, sorry.")
if("bluespace_artillery")
bluespace_artillery(target,src)
bluespace_artillery(target,usr)
if("spont_combustion")
var/mob/living/carbon/human/Tar = target
@@ -187,13 +187,13 @@
if("redspace_abduct")
redspace_abduction(target, src)
redspace_abduction(target, usr)
if("autosave")
fake_autosave(target, src)
fake_autosave(target, usr)
if("autosave2")
fake_autosave(target, src, TRUE)
fake_autosave(target, usr, TRUE)
if("adspam")
if(target.client)
@@ -453,6 +453,41 @@
else
Tar.Stasis(100000)
if("give_chem")
var/mob/living/carbon/human/Tar = target
if(!istype(Tar))
return
var/list/chem_list = typesof(/datum/reagent)
var/datum/reagent/chemical = tgui_input_list(user, "Which chemical would you like to add?", "Chemicals", chem_list)
if(!chemical)
return
var/chem = chemical.id
var/amount = tgui_input_number(user, "How much of the chemical would you like to add?", "Amount", 5)
if(!amount)
return
var/location = tgui_alert(user, "Where do you want to add the chemical?", "Location", list("Blood", "Stomach", "Skin", "Cancel"))
if(!location || location == "Cancel")
return
if(location == "Blood")
Tar.bloodstr.add_reagent(chem, amount)
if(location == "Stomach")
Tar.ingested.add_reagent(chem, amount)
if(location == "Skin")
Tar.touching.add_reagent(chem, amount)
if("purge")
var/mob/living/carbon/Tar = target
if(!istype(Tar))
return
Tar.bloodstr.clear_reagents()
Tar.ingested.clear_reagents()
Tar.touching.clear_reagents()
////////ABILITIES//////////////
if("vent_crawl")
@@ -722,6 +757,12 @@
if(tgui_alert(usr, "Make mob wake up? This is needed for carbon mobs.", "Wake mob?", list("Yes", "No")) == "Yes")
L.AdjustSleeping(-100)
if("cloaking")
if(target.cloaked)
target.uncloak()
else if(!target.cloaked)
target.cloak()
////////FIXES//////////////