cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

Browse Source 
Conflicts:
	code/modules/customitems/item_spawning.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-09-22 18:31:52 +10:00
parent 69ec1e3eca 8e8cbd66d8
commit 1bf5b97b2e
8 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
code/modules/customitems/item_defines.dm
View File

@@ -123,6 +123,14 @@
icon_on = "redzippoon"
icon_off = "redzippo"
/obj/item/weapon/lighter/zippo/fluff/executivekill_1 //executivekill: Hunter Duke
name = "Gonzo Fist zippo"
desc = "A Zippo lighter with the iconic Gonzo Fist on a matte black finish."
icon = 'custom_items.dmi'
icon_state = "gonzozippo"
icon_on = "gonzozippoon"
icon_off = "gonzozippo"
/obj/item/weapon/fluff/cado_keppel_1 //sparklysheep: Cado Keppel
name = "purple comb"
desc = "A pristine purple comb made from flexible plastic. It has a small K etched into its side."
@@ -131,6 +139,12 @@
icon_state = "purplecomb"
item_state = "purplecomb"
/obj/item/weapon/fluff/hugo_cinderbacth_1 //thatoneguy: Hugo Cinderbatch
name = "Old Cane"
desc = "An old brown cane made from wood. It has a a large, itallicized H on it's handle."
icon = 'custom_items.dmi'
icon_state = "special_cane"
attack_self(mob/user)
if(user.r_hand == src || user.l_hand == src)
for(var/mob/O in viewers(user, null))
@@ -252,6 +266,13 @@
icon = 'custom_items.dmi'
icon_state = "odysseus_spec_id"
/obj/item/weapon/card/id/fluff/ian_colmid //Roaper: Ian Colm
name = "Technician"
desc = "An old ID with the words 'Ian Colm's Technician ID' printed on it.."
icon = 'custom_items.dmi'
icon_state = "technician_id"
/obj/item/weapon/clipboard/fluff/mcreary_journal //sirribbot: James McReary
name = "McReary's journal"
desc = "A journal with a warning sticker on the front cover. The initials \"J.M.\" are written on the back."
@@ -259,6 +280,22 @@
icon_state = "mcreary_journal"
item_state = "mcreary_journal"
/obj/item/device/flashlight/fluff/thejesster14_1 //thejesster14: Rosa Wolff
name = "old red flashlight"
desc = "A very old, childlike flashlight."
icon = 'custom_items.dmi'
icon_state = "wolfflight0"
w_class = 2
item_state = "wolfflight"
flags = FPRINT | TABLEPASS | CONDUCT
slot_flags = SLOT_BELT
m_amt = 50
g_amt = 20
on = 0
brightness_on = 4 //luminosity when on
icon_on = "wolfflight1"
icon_off = "wolfflight0"
//////////////////////////////////
//////////// Clothing ////////////
//////////////////////////////////
@@ -498,3 +535,4 @@
icon = 'custom_items.dmi'
icon_state = "retpoluniform"
color = "retpoluniform"

16
code/modules/customitems/item_spawning.dm
View File

@@ -39,22 +39,24 @@
I.registered_name = M.real_name
I.access = C.access
I.assignment = C.assignment
//I.over_jumpsuit = C.over_jumpsuit
//I.blood_type = C.blood_type
//I.dna_hash = C.dna_hash
//I.fingerprint_hash = C.fingerprint_hash
//I.pin = C.pin
I.over_jumpsuit = C.over_jumpsuit
I.blood_type = C.blood_type
I.dna_hash = C.dna_hash
I.fingerprint_hash = C.fingerprint_hash
I.pin = C.pin
//custom stuff
if(M.ckey == "fastler" && M.real_name == "Fastler Greay") //This is a Lifetime ID
I.name = "[M.real_name]'s Lifetime ID Card ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
else if(M.ckey == "nerezza" && M.real_name == "Asher Spock") //This is an Odysseus Specialist ID
I.name = "[M.real_name]'s Odysseus Specialist ID Card ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
I.access += list(access_robotics) //Station-based mecha pilots need this to access the recharge bay.
I.access += list(ACCESS_ROBOTICS) //Station-based mecha pilots need this to access the recharge bay.
else if(M.ckey == "roaper" && M.real_name == "Ian Colm") //This is a Technician ID
I.name = "[M.real_name]'s Technician ID ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
//replace old ID
del(C)
ok = M.equip_to_slot_or_del(I, slot_wear_id) //if 1, last argument deletes on fail
ok = M.equip_if_possible(I, M.slot_wear_id, 0) //if 1, last argument deletes on fail
break
else if(istype(M.back,/obj/item/weapon/storage) && M.back:contents.len < M.back:storage_slots) // Try to place it in something on the mob's back
Item.loc = M.back