mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
Re-added custom items
This commit is contained in:
@@ -6,6 +6,21 @@
|
||||
icon = 'icons/obj/custom_items.dmi'
|
||||
w_class = 1.0
|
||||
|
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
/////////////////////PARADISE STATION CUSTOM ITEMS////////////////////
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
/obj/item/clothing/head/fluff/heather_winceworth // regens: Heather Winceworth
|
||||
name= "red flower hair pin"
|
||||
desc= "A blood red flower pin."
|
||||
icon= 'icons/obj/clothing/hats.dmi'
|
||||
icon_state = "hairflower"
|
||||
flags = FPRINT|TABLEPASS
|
||||
|
||||
|
||||
|
||||
//////////////////////////////////
|
||||
////////// Fluff Items ///////////
|
||||
//////////////////////////////////
|
||||
@@ -242,6 +257,7 @@
|
||||
name = "gold engraved zippo"
|
||||
desc = "An engraved golden Zippo lighter with the letters NT on it."
|
||||
icon = 'icons/obj/custom_items.dmi'
|
||||
icon_state = "zippo_nt_off"
|
||||
icon_on = "zippo_nt_on"
|
||||
icon_off = "zippo_nt_off"
|
||||
|
||||
@@ -926,3 +942,19 @@
|
||||
if(istype(A, /obj/item/ammo_magazine))
|
||||
flick("leamas-reloading",src)
|
||||
..()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
//for multiple items just add mutliple entries, unless i change it to be a listlistlist
|
||||
//yes, it has to be an item, you can't pick up nonitems
|
||||
|
||||
/*
|
||||
|
||||
|
||||
/proc/EquipCustomItems(mob/living/carbon/human/M)
|
||||
// load lines
|
||||
@@ -74,4 +74,3 @@
|
||||
if (ok == 0) // Finally, since everything else failed, place it on the ground
|
||||
Item.loc = get_turf(M.loc)
|
||||
|
||||
*/
|
||||
@@ -284,14 +284,12 @@
|
||||
|
||||
var/mob/living/carbon/human/character = create_character() //creates the human and transfers vars and mind
|
||||
job_master.EquipRank(character, rank, 1) //equips the human
|
||||
//EquipCustomItems(character)
|
||||
EquipCustomItems(character)
|
||||
character.loc = pick(latejoin)
|
||||
character.lastarea = get_area(loc)
|
||||
|
||||
ticker.mode.latespawn(character)
|
||||
|
||||
//ticker.mode.latespawn(character)
|
||||
|
||||
if(character.mind.assigned_role != "Cyborg")
|
||||
data_core.manifest_inject(character)
|
||||
ticker.minds += character.mind//Cyborgs and AIs handle this in the transform proc. //TODO!!!!! ~Carn
|
||||
|
||||
Reference in New Issue
Block a user