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

Merge branch 'master' into midnight-fluffles

Browse Source
This commit is contained in:
FlattestGuitar
2017-05-25 18:45:58 +02:00
parent e09c294a2f 3abec5c6fe
commit ca60a08f3c
106 changed files with 2095 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+12 -27
View File
@@ -453,14 +453,10 @@
sallet.put_on_delay = helm.put_on_delay
sallet.burn_state = helm.burn_state
sallet.flags_cover = helm.flags_cover
if(helm.up)
sallet.flags &= ~helm.visor_flags
sallet.flags_inv &= ~helm.visor_flags_inv
if(!BLOCKHAIR in sallet.flags)
sallet.visor_flags = helm.visor_flags
sallet.visor_flags_inv = helm.visor_flags_inv
if(!(BLOCKHAIR in sallet.flags))
sallet.flags |= BLOCKHAIR
for(var/flag in list(HIDEMASK, HIDEFACE, HIDEEYES, HIDEEARS)) //Check for and apply missing flags.
if(!(sallet.flags_inv & flag))
sallet.flags_inv |= flag
sallet.add_fingerprint(H)
target.transfer_fingerprints_to(sallet)
@@ -591,11 +587,8 @@
if(choice && choice != state && !user.incapacitated() && Adjacent(user))
var/list/new_state = options[choice]
var/list/old_state = options[state]
icon_state = new_state["icon_state"]
flags_inv &= ~(old_state["visor_flags"]|old_state["mask_flags"])
state = choice
flags_inv |= (new_state["visor_flags"]|new_state["mask_flags"])
to_chat(user, "You adjust the sallet.")
playsound(src.loc, "[toggle_sound]", 100, 0, 4)
user.update_inv_head()
@@ -982,21 +975,13 @@
icon_state = options[choice]
to_chat(user, "Your strange witch hat has now shapeshifted into it's [choice] form!")
return 1
/obj/item/weapon/reagent_containers/food/drinks/bottle/fluff/moonshine //nethiafins : Serhij Zozulia
name = "Cloudy Bottle"
desc = "The contents of this bottle are vile. You should only drink it when you hit rock bottom."
icon = 'icons/obj/custom_items.dmi'
icon_state = "questionable_liquid"
item_state = "questionable_liquid"
amount_per_transfer_from_this = 5
list_reagents = list("moonshine" = 100)
/obj/item/weapon/storage/box/fluff/moonshine_kit //nethiafins : Serhij Zozulia
name = "Moonshine Serving box"
/obj/item/weapon/storage/box/fluff/moonshine_kit/New()
..()
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass(src)
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass(src)
new /obj/item/weapon/reagent_containers/food/drinks/bottle/fluff/moonshine(src)
/obj/item/clothing/accessory/necklace/locket/fluff/fethasnecklace //Fethas: Sefra'neem
name = "Orange gemmed locket"
desc = "A locket with a orange gem set on the front, the picture inside seems to be of a Tajaran."
icon = 'icons/obj/custom_items.dmi'
icon_state = "fethasnecklace"
item_state = "fethasnecklace"
item_color = "fethasnecklace"
slot_flags = SLOT_MASK | SLOT_TIE