This commit is contained in:
timothyteakettle
2020-07-16 02:51:07 +01:00
parent a7e2668eff
commit 03bd806c73
10 changed files with 73 additions and 5 deletions
+4 -2
View File
@@ -1276,7 +1276,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
if(!check_rights(R_ADMIN) || !check_rights(R_FUN))
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)
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/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list
@@ -1341,7 +1341,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
if(ADMIN_PUNISHMENT_PIE)
var/obj/item/reagent_containers/food/snacks/pie/cream/nostun/creamy = new(get_turf(target))
creamy.splat(target)
if (ADMIN_PUNISHMENT_CUSTOM_PIE)
if(ADMIN_PUNISHMENT_CUSTOM_PIE)
var/obj/item/reagent_containers/food/snacks/pie/cream/nostun/A = new()
if(!A.reagents)
var/amount = input(usr, "Specify the reagent size of [A]", "Set Reagent Size", 50) as num|null
@@ -1354,6 +1354,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
if(amount)
A.reagents.add_reagent(chosen_id, amount)
A.splat(target)
if(ADMIN_PUNISHMENT_PICKLE)
target.turn_into_pickle()
punish_log(target, punishment)
@@ -2,6 +2,28 @@
/mob/living/simple_animal/pickle
name = "pickle"
desc = "funniest shit i've ever seen"
desc = "It's a pickle. It might just be the funniest thing you have ever seen."
health = 100
maxHealth = 100
icon = 'icons/mob/32x64.dmi'
icon_state = "pickle"
del_on_death = TRUE
deathmessage = "The pickle implodes into its own existential dread and disappears!"
friendly_verb_continous = "tickles"
friendly_verb_simple = "tickle"
var/mob/living/original_body
/mob/living/simple_animal/pickle/UnarmedAttack(atom/A)
..() //we want the tickle emote to go before the laugh
if(ismob(A))
var/mob/laugher = A
laugher.emote("laugh")
/mob/living/simple_animal/pickle/Destroy(force, kill_body = TRUE)
if(original_body)
if(kill_body)
original_body.adjustOrganLoss(ORGAN_SLOT_BRAIN, 200) //to be fair, you have to have a very high iq to understand-
original_body.forceMove(get_turf(src))
if(mind)
mind.transfer_to(original_body)
..()
+17
View File
@@ -581,3 +581,20 @@
. = new_mob
qdel(src)
/mob/living/proc/turn_into_pickle()
//if they're already a pickle, turn them back instead
if(istype(src, /mob/living/simple_animal/pickle))
qdel(src, FALSE) //this means the body inside the pickle will be dropped without killing it
else
//make a new pickle on the tile and move their mind into it if possible
var/mob/living/simple_animal/pickle/new_pickle = new /mob/living/simple_animal/pickle(get_turf(src))
new_pickle.original_body = src
if(mind)
mind.transfer_to(new_pickle)
//give them their old access if any
var/obj/item/card/id/mob_access_card = get_idcard()
if(mob_access_card)
new_pickle.access_card = mob_access_card
//move old body inside the pickle for safekeeping (when they die, we'll return the corpse because we're nice)
src.forceMove(new_pickle)
@@ -75,4 +75,9 @@
/obj/item/ammo_casing/energy/shrink
projectile_type = /obj/item/projectile/beam/shrink
select_name = "shrink ray"
e_cost = 200
e_cost = 200
/obj/item/ammo_casing/energy/pickle //ammo for an adminspawn gun
projectile_type = /obj/item/projectile/energy/pickle
select_name = "pickle ray"
e_cost = 0
@@ -329,3 +329,11 @@
add_overlay("emitter_carbine_empty")
else
add_overlay("emitter_carbine")
//the pickle ray
/obj/item/gun/energy/pickle_gun
name = "pickle ray"
desc = "funniest shit i've ever seen"
icon_state = "decloner"
no_pin_required = TRUE
ammo_type = list(/obj/item/ammo_casing/energy/pickle)
@@ -13,3 +13,13 @@
damage_type = TOX
knockdown = 100
range = 7
/obj/item/projectile/energy/pickle //projectile for adminspawn only gun
name = "pickle-izing beam"
icon_state = "declone"
/obj/item/projectile/energy/pickle/on_hit(atom/target)
//we don't care if they blocked it, they're turning into a pickle
if(isliving(target))
var/mob/living/living_target = target
living_target.turn_into_pickle() //yes this is a real proc
+2 -1
View File
@@ -207,7 +207,8 @@
/mob/living/simple_animal/pet/fox,
/mob/living/simple_animal/butterfly,
/mob/living/simple_animal/pet/cat/cak,
/mob/living/simple_animal/chick)
/mob/living/simple_animal/chick,
/mob/living/simple_animal/pickle)
new_mob = new path(M.loc)
if("humanoid")