cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 08:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11143 from farie82/hoodies

Browse Source 
Refactored hoodies to work without antidrop
This commit is contained in:
Fox McCloud
2019-08-31 18:59:27 -04:00
committed by GitHub
parent e0633d1da2 9d58af6ec5
commit 07788252a9
10 changed files with 1081 additions and 1086 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/jobs.dm
+3 -3
View File
@@ -39,7 +39,7 @@
//Chaplain
/obj/item/clothing/head/chaplain_hood
/obj/item/clothing/head/hooded/chaplain_hood
name = "chaplain's hood"
desc = "It's hood that covers the head. It keeps you warm during the space winters."
icon_state = "chaplain_hood"
@@ -47,7 +47,7 @@
flags_cover = HEADCOVERSEYES
//Chaplain
/obj/item/clothing/head/nun_hood
/obj/item/clothing/head/hooded/nun_hood
name = "nun hood"
desc = "Maximum piety in this star system."
icon_state = "nun_hood"
@@ -55,7 +55,7 @@
flags_cover = HEADCOVERSEYES
//Chaplain
/obj/item/clothing/head/monk_hood
/obj/item/clothing/head/hooded/monk_hood
name = "monk hood"
desc = "Wooden board not included."
icon_state = "monk_hood"
code/modules/clothing/suits/hood.dm
+29 -32
View File
@@ -2,44 +2,21 @@
/obj/item/clothing/suit/hooded
actions_types = list(/datum/action/item_action/toggle)
var/obj/item/clothing/head/hood
var/hoodtype = /obj/item/clothing/head/winterhood //so the chaplain hoodie or other hoodies can override this
var/obj/item/clothing/head/hooded/hood
var/hoodtype = /obj/item/clothing/head/hooded/winterhood //so the chaplain hoodie or other hoodies can override this
/obj/item/clothing/head/chaplain_hood
flags = NODROP
/obj/item/clothing/head/nun_hood
flags = NODROP
/obj/item/clothing/head/monk_hood
flags = NODROP
/obj/item/clothing/head/culthood
flags = NODROP
/obj/item/clothing/head/culthood/alt
flags = NODROP
/obj/item/clothing/head/berserkerhood
flags = NODROP
/obj/item/clothing/head/hooded/drake
flags = NODROP
/obj/item/clothing/head/hooded/goliath
flags = NODROP
/obj/item/clothing/suit/hooded/New()
/obj/item/clothing/suit/hooded/Initialize(mapload)
. = ..()
MakeHood()
..()
/obj/item/clothing/suit/hooded/Destroy()
QDEL_NULL(hood)
return ..()
. = ..()
/obj/item/clothing/suit/hooded/proc/MakeHood()
if(!hood)
var/obj/item/clothing/head/W = new hoodtype(src)
var/obj/item/clothing/head/hooded/W = new hoodtype(src)
W.suit = src
hood = W
/obj/item/clothing/suit/hooded/ui_action_click()
@@ -63,7 +40,7 @@
var/mob/living/carbon/H = hood.loc
H.unEquip(hood, 1)
H.update_inv_wear_suit()
hood.loc = src
hood.forceMove(src)
for(var/X in actions)
var/datum/action/A = X
A.UpdateButtonIcon()
@@ -82,7 +59,7 @@
if(H.head)
to_chat(H,"<span class='warning'>You're already wearing something on your head!</span>")
return
else if(H.equip_to_slot_if_possible(hood,slot_head,0,0,1))
else if(H.equip_to_slot_if_possible(hood, slot_head, 0, 0, 1))
suit_adjusted = 1
icon_state = "[initial(icon_state)]_hood"
H.update_inv_wear_suit()
@@ -91,3 +68,23 @@
A.UpdateButtonIcon()
else
RemoveHood()
/obj/item/clothing/head/hooded
var/obj/item/clothing/suit/hooded/suit
/obj/item/clothing/head/hooded/Destroy()
suit = null
return ..()
/obj/item/clothing/head/hooded/dropped()
..()
if(suit)
suit.RemoveHood()
/obj/item/clothing/head/hooded/equipped(mob/user, slot)
..()
if(slot != slot_head)
if(suit)
suit.RemoveHood()
else
qdel(src)
code/modules/clothing/suits/jobs.dm
+3 -3
View File
@@ -85,7 +85,7 @@
icon_state = "chaplain_hoodie"
item_state = "chaplain_hoodie"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
hoodtype = /obj/item/clothing/head/chaplain_hood
hoodtype = /obj/item/clothing/head/hooded/chaplain_hood
allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/emergency_oxygen)
sprite_sheets = list(
@@ -100,7 +100,7 @@
item_state = "nun"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDESHOES|HIDEJUMPSUIT
hoodtype = /obj/item/clothing/head/nun_hood
hoodtype = /obj/item/clothing/head/hooded/nun_hood
allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/emergency_oxygen)
sprite_sheets = list(
@@ -115,7 +115,7 @@
item_state = "monkrobe"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDESHOES|HIDEJUMPSUIT
hoodtype = /obj/item/clothing/head/monk_hood
hoodtype = /obj/item/clothing/head/hooded/monk_hood
allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/emergency_oxygen)
/obj/item/clothing/suit/witchhunter
code/modules/clothing/suits/miscellaneous.dm
+1017 -1018
View File
File diff suppressed because it is too large Load Diff
code/modules/customitems/item_defines.dm
+15 -15
View File
@@ -903,9 +903,9 @@
desc = "A green hoodie with the Nanotrasen logo on the back. It looks weathered."
icon = 'icons/obj/custom_items.dmi'
icon_state = "linda_hoodie"
hoodtype = /obj/item/clothing/head/hood/fluff/linda
hoodtype = /obj/item/clothing/head/hooded/hood/fluff/linda
/obj/item/clothing/head/hood/fluff/linda //Epic_Charger: Linda Clark
/obj/item/clothing/head/hooded/hood/fluff/linda //Epic_Charger: Linda Clark
icon_state = "greenhood"
/obj/item/clothing/suit/hooded/hoodie/hylo //Hylocereus: Sam Aria
@@ -913,9 +913,9 @@
desc = "A soft, cozy longline hoodie. It looks old and worn, but well cared for. There's no label, but a series of dates and names is penned on a scrap of fabric sewn on the inside of the left side of the chest - 'Sam Aria' is scrawled atop them all, next to the words 'Please Remember'."
icon = 'icons/obj/custom_items.dmi'
icon_state = "sam_hoodie"
hoodtype = /obj/item/clothing/head/hood/hylo
hoodtype = /obj/item/clothing/head/hooded/hood/hylo
/obj/item/clothing/head/hood/hylo
/obj/item/clothing/head/hooded/hood/hylo
icon = 'icons/obj/custom_items.dmi'
icon_state = "sam_hood"
@@ -925,9 +925,9 @@
body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
icon = 'icons/obj/custom_items.dmi'
icon_state = "skeleton_suit"
hoodtype = /obj/item/clothing/head/hood/fluff/skeleton
hoodtype = /obj/item/clothing/head/hooded/hood/fluff/skeleton
/obj/item/clothing/head/hood/fluff/skeleton
/obj/item/clothing/head/hooded/hood/fluff/skeleton
icon = 'icons/obj/custom_items.dmi'
icon_state = "skeleton_hood"
@@ -973,18 +973,18 @@
desc = "A velvety smooth black winter coat with white and red stripes on the side."
icon = 'icons/obj/custom_items.dmi'
icon_state = "xantholne_wintercoat"
hoodtype = /obj/item/clothing/head/hood/fluff/xantholne
hoodtype = /obj/item/clothing/head/hooded/hood/fluff/xantholne
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
/obj/item/clothing/head/hood/fluff/xantholne // Xantholne: Meex Zwichsnicrur
/obj/item/clothing/head/hooded/hood/fluff/xantholne // Xantholne: Meex Zwichsnicrur
name = "black winter hood"
desc = "A black hood attached to a stripped winter coat."
icon = 'icons/obj/custom_items.dmi'
icon_state = "xantholne_winterhood"
body_parts_covered = HEAD
flags = NODROP|BLOCKHAIR
flags = BLOCKHAIR
flags_inv = HIDEEARS
/obj/item/clothing/suit/hooded/hoodie/fluff/xydonus //Xydonus: Rsik Ugsharki Atan | Based off of the bomber jacket, but with a hood slapped on (for allowed suit storage)
@@ -993,18 +993,18 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "xydonus_jacket"
ignore_suitadjust = 0
hoodtype = /obj/item/clothing/head/hood/fluff/xydonus
hoodtype = /obj/item/clothing/head/hooded/hood/fluff/xydonus
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
allowed = list(/obj/item/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
/obj/item/clothing/head/hood/fluff/xydonus
/obj/item/clothing/head/hooded/hood/fluff/xydonus
name = "custom fit hood"
desc = "A hood with some horns <i>glued</i> to them, or something like that. Custom fit for a Unathi's head shape."
icon = 'icons/obj/custom_items.dmi'
icon_state = "xydonus_bomberhood"
body_parts_covered = HEAD
flags = NODROP|BLOCKHAIR
flags = BLOCKHAIR
flags_inv = HIDEEARS
/obj/item/clothing/suit/fluff/pineapple //Pineapple Salad: Dan Jello
@@ -1039,17 +1039,17 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "shesicoat"
item_state = "shesicoat"
hoodtype = /obj/item/clothing/head/hood/fluff/shesi
hoodtype = /obj/item/clothing/head/hooded/hood/fluff/shesi
body_parts_covered = UPPER_TORSO|LOWER_TORSO
cold_protection = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/head/hood/fluff/shesi //MrSynnester : Shesi Skaklas
/obj/item/clothing/head/hooded/hood/fluff/shesi //MrSynnester : Shesi Skaklas
name = "custom made winter hood"
desc = "A custom made winter coat hood. Looks comfy."
icon = 'icons/obj/custom_items.dmi'
icon_state = "shesicoat_hood2"
body_parts_covered = HEAD
flags = NODROP|BLOCKHAIR
flags = BLOCKHAIR
flags_inv = HIDEEARS
/obj/item/clothing/suit/jacket/dtx //AffectedArc07: DTX
code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
+1 -1
View File
@@ -361,7 +361,7 @@
if("Cultist")
uniform = /obj/item/clothing/under/roman
suit = /obj/item/clothing/suit/hooded/cultrobes
head = /obj/item/clothing/head/culthood
head = /obj/item/clothing/head/hooded/culthood
suit_store = /obj/item/tome
r_pocket = /obj/item/restraints/legcuffs/bola/cult
l_pocket = /obj/item/melee/cultblade/dagger