From e0703fcecc538cc1115d784c1973b76af7a66690 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Thu, 1 Feb 2018 21:39:30 -0600 Subject: [PATCH] Removes Fun --- code/citadel/dogborgstuff.dm | 26 +--------------------- code/modules/clothing/head/misc_special.dm | 4 ++-- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/code/citadel/dogborgstuff.dm b/code/citadel/dogborgstuff.dm index 38140bd839..3586f97ec8 100644 --- a/code/citadel/dogborgstuff.dm +++ b/code/citadel/dogborgstuff.dm @@ -330,31 +330,7 @@ var/escape_in_progress = FALSE var/message_cooldown var/breakout_time = 300 - var/list/items_preserved = list( - /obj/item/hand_tele, - /obj/item/card/id, - /obj/item/device/pda, - /obj/item/device/aicard, - /obj/item/gun, - /obj/item/pinpointer, - /obj/item/clothing/shoes/magboots, - /obj/item/clothing/head/helmet/space, - /obj/item/clothing/suit/space, - /obj/item/reagent_containers/hypospray/CMO, - /obj/item/tank/jetpack/oxygen/captain, - /obj/item/clothing/accessory/medal/gold/captain, - /obj/item/clothing/suit/armor, - /obj/item/documents, - /obj/item/nuke_core, - /obj/item/nuke_core_container, - /obj/item/areaeditor/blueprints, - /obj/item/documents/syndicate, - /obj/item/disk/nuclear, - /obj/item/bombcore, - /obj/item/grenade, - /obj/item/storage - ) - + var/list/items_preserved = list() var/list/important_items = list( /obj/item/hand_tele, /obj/item/card/id/captains_spare, diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 3bd255c058..43ea1928fc 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -59,8 +59,8 @@ /obj/item/clothing/head/hardhat/cakehat/turn_on() ..() - force = 15 - throwforce = 15 + force = 1 + throwforce = 1 damtype = BURN hitsound = 'sound/items/welder.ogg' START_PROCESSING(SSobj, src)