shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fry smite

Browse Source
This commit is contained in:
Timothy Teakettle
2020-07-20 17:48:37 +01:00
parent a0c166c490
commit b06948bed4
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/admin.dm
+1
View File
@@ -75,6 +75,7 @@
#define ADMIN_PUNISHMENT_PIE "Cream Pie" #define ADMIN_PUNISHMENT_PIE "Cream Pie"
#define ADMIN_PUNISHMENT_CUSTOM_PIE "Custom Cream Pie" #define ADMIN_PUNISHMENT_CUSTOM_PIE "Custom Cream Pie"
#define ADMIN_PUNISHMENT_PICKLE "Pickle-ify" #define ADMIN_PUNISHMENT_PICKLE "Pickle-ify"
#define ADMIN_PUNISHMENT_FRY "Fry"
#define AHELP_ACTIVE 1 #define AHELP_ACTIVE 1
#define AHELP_CLOSED 2 #define AHELP_CLOSED 2
code/datums/components/fried.dm
+2
View File
@@ -56,6 +56,8 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
var/colour_priority = FIXED_COLOUR_PRIORITY var/colour_priority = FIXED_COLOUR_PRIORITY
if(ismob(owner)) if(ismob(owner))
colour_priority = WASHABLE_COLOUR_PRIORITY //badmins fried someone and we want to let them wash the fry colour off colour_priority = WASHABLE_COLOUR_PRIORITY //badmins fried someone and we want to let them wash the fry colour off
//lets heavily hint at how to undo their frying
to_chat(owner, "<span class='warning'>You've been coated in hot cooking oil! You should probably go wash it off at the showers.</span>")
else else
owner.AddComponent(/datum/component/edible, foodtypes = fried_tastes, tastes = fried_tastes, eat_time = fried_eat_time) //we don't want mobs to get the edible component owner.AddComponent(/datum/component/edible, foodtypes = fried_tastes, tastes = fried_tastes, eat_time = fried_eat_time) //we don't want mobs to get the edible component
code/modules/admin/verbs/randomverbs.dm
+15 -1
View File
@@ -1269,7 +1269,19 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
if(!check_rights(R_ADMIN) || !check_rights(R_FUN)) if(!check_rights(R_ADMIN) || !check_rights(R_FUN))
return return
var/list/punishment_list = list(ADMIN_PUNISHMENT_PIE, ADMIN_PUNISHMENT_CUSTOM_PIE, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_SUPPLYPOD_QUICK, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_ROD, ADMIN_PUNISHMENT_PICKLE) var/list/punishment_list = list(ADMIN_PUNISHMENT_PIE,
ADMIN_PUNISHMENT_CUSTOM_PIE,
ADMIN_PUNISHMENT_FIREBALL,
ADMIN_PUNISHMENT_LIGHTNING,
ADMIN_PUNISHMENT_BRAINDAMAGE,
ADMIN_PUNISHMENT_BSA,
ADMIN_PUNISHMENT_GIB,
ADMIN_PUNISHMENT_SUPPLYPOD_QUICK,
ADMIN_PUNISHMENT_SUPPLYPOD,
ADMIN_PUNISHMENT_MAZING,
ADMIN_PUNISHMENT_ROD,
ADMIN_PUNISHMENT_PICKLE,
ADMIN_PUNISHMENT_FRY)
var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list
@@ -1349,6 +1361,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
A.splat(target) A.splat(target)
if(ADMIN_PUNISHMENT_PICKLE) if(ADMIN_PUNISHMENT_PICKLE)
target.turn_into_pickle() target.turn_into_pickle()
if(ADMIN_PUNISHMENT_FRY)
target.fry()
punish_log(target, punishment) punish_log(target, punishment)