From 6d8d60290717ed9a1090057626711272882e4c63 Mon Sep 17 00:00:00 2001 From: Chloe Carver-Brown Date: Fri, 19 Feb 2021 23:21:12 +0000 Subject: [PATCH 1/2] Adding clustaur grenades --- code/_globalvars/lists/maintenance_loot.dm | 3 ++- .../objects/items/grenades/spawnergrenade.dm | 8 ++++++++ icons/obj/grenade.dmi | Bin 25648 -> 26119 bytes 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 6f63206e..8baf695f 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -118,7 +118,8 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/autosurgeon/vagina = 1, /obj/item/autosurgeon/breasts = 1, /obj/item/autosurgeon/womb = 1, - /obj/item/toy/plush/random = 1 + /obj/item/toy/plush/random = 1, + /obj/item/grenade/spawnergrenade/clustaur = 1 )) GLOBAL_LIST_INIT(ratking_trash, list(//Garbage: used by the regal rat mob when spawning garbage. diff --git a/code/game/objects/items/grenades/spawnergrenade.dm b/code/game/objects/items/grenades/spawnergrenade.dm index 2cc72f36..bc32b158 100644 --- a/code/game/objects/items/grenades/spawnergrenade.dm +++ b/code/game/objects/items/grenades/spawnergrenade.dm @@ -41,3 +41,11 @@ icon_state = "holy_grenade" spawner_type = /mob/living/simple_animal/hostile/poison/bees/toxin deliveryamt = 10 + +/obj/item/grenade/spawnergrenade/clustaur + desc = "A very strange grenade often found in maintanance. Use of this may constitute a war crime in your area, consult your local captain." + name = "clustaur grenade" + icon_state = "clustaur" + item_state = "clustaur" + deliveryamt = 10 + spawner_type = /obj/item/reagent_containers/glass/beaker/waterbottle/wataur \ No newline at end of file diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi index d6dd4c1b000c6ab1faea7bea7678a56834a24d9f..37ba386e2654722e1da250735c491d8aae504bf0 100644 GIT binary patch delta 6312 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 XLui?#Eag+s{ZLbW`Mg5W>cjs6#*lZ9 delta 5837 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 Date: Fri, 19 Feb 2021 23:35:57 +0000 Subject: [PATCH 2/2] Revert "Poggers" This reverts commit 389291b46a13d4f996884c0ffe4325769e4e9dc5. --- code/__DEFINES/misc.dm | 10 ---------- code/game/objects/items/cigs_lighters.dm | 19 ------------------- 2 files changed, 29 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 79459434..5bd83c7d 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -260,16 +260,6 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE)) GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_SKIN_ALT = 'icons/obj/pda_alt.dmi', PDA_SKIN_RUGGED = 'icons/obj/pda_rugged.dmi', PDA_SKIN_MODERN = 'icons/obj/pda_modern.dmi')) - -//zippo icon reskins -#define ZIPPO_SKIN_PLAIN "Plain" -#define ZIPPO_SKIN_DAME "Dame" -#define ZIPPO_SKIN_THIRTEEN "Thirteen" -#define ZIPPO_SKIN_SNAKE "Snake" - -GLOBAL_LIST_INIT(lighter_reskins, list(ZIPPO_SKIN_PLAIN = "plain", ZIPPO_SKIN_DAME = "dame", - ZIPPO_SKIN_THIRTEEN = "thirteen", ZIPPO_SKIN_SNAKE = "snake")) - ///////////////////////////////////// // atom.appearence_flags shortcuts // ///////////////////////////////////// diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index bb53f686..e8b30655 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -522,25 +522,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM overlay_state = pick(overlay_list) update_icon() -/obj/item/lighter/AltClick(mob/living/user) - . = ..() - if(GLOB.lighter_reskins && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY)) - reskin_obj(user) - -/obj/item/lighter/reskin_obj(mob/M) - if(lit) - return to_chat(M, "You need to close the lighter before changing the engraving!") - if(!LAZYLEN(GLOB.lighter_reskins)) - return - - var/choice = input(M, "Choose the a reskin for [src]","Reskin Object") as null|anything in GLOB.lighter_reskins - var/new_icon = GLOB.lighter_reskins[choice] - if(QDELETED(src) || isnull(new_icon) || new_icon == icon || !M.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) - return - overlay_state = new_icon - update_icon() - to_chat(M, "[src] is now skinned as '[choice]'.") - /obj/item/lighter/suicide_act(mob/living/carbon/user) if (lit) user.visible_message("[user] begins holding \the [src]'s flame up to [user.p_their()] face! It looks like [user.p_theyre()] trying to commit suicide!")