cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Lavaland code review fixes - also integrates flyswatter and cat toy

Browse Source
This commit is contained in:
Mark van Alphen
2019-04-20 00:24:58 +02:00
parent 5452d4e8df
commit c878f8e36e
18 changed files with 91 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/leather.dm
+14 -1
View File
@@ -125,10 +125,23 @@ var/global/list/datum/stack_recipe/sinew_recipes = list ( \
flags = NOBLUDGEON
w_class = WEIGHT_CLASS_NORMAL
layer = MOB_LAYER
var/static/list/can_strengthen_clothing
/obj/item/stack/sheet/animalhide/goliath_hide/Initialize(mapload)
. = ..()
if(!can_strengthen_clothing)
can_strengthen_clothing = typecacheof(list(
/obj/item/clothing/suit/space/hardsuit/mining,
/obj/item/clothing/head/helmet/space/hardsuit/mining,
/obj/item/clothing/suit/space/eva/plasmaman/miner,
/obj/item/clothing/head/helmet/space/eva/plasmaman/miner,
/obj/item/clothing/suit/hooded/explorer,
/obj/item/clothing/head/hooded/explorer
))
/obj/item/stack/sheet/animalhide/goliath_hide/afterattack(atom/target, mob/user, proximity_flag)
if(proximity_flag)
if(istype(target, /obj/item/clothing/suit/space/hardsuit/mining) || istype(target, /obj/item/clothing/head/helmet/space/hardsuit/mining) || istype(target, /obj/item/clothing/suit/space/eva/plasmaman/miner) || istype(target, /obj/item/clothing/head/helmet/space/eva/plasmaman/miner) || istype(target, /obj/item/clothing/suit/hooded/explorer) || istype(target, /obj/item/clothing/head/hooded/explorer))
if(is_type_in_typecache(target, can_strengthen_clothing))
var/obj/item/clothing/C = target
var/current_armor = C.armor
if(current_armor["melee"] < 60)