mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 11:34:19 +01:00
Reorganized clothing as a whole.
Everything related to clothing should now be defined in modules/clothing. I'm almost certain there's clothing code hidden elsewhere but this should be the vast majority of it finished. Everything is set up related to the object types themselves (meaning paths.) So all hats will be in modules/clothing/head, all gloves will be in modules/clothing/gloves, ect... I've removed 'modules/clothing/random.dm' and 'objects/items/clothing.dm' which both seemed to just be a place where people would put stuff they were too lazy to find a proper home for. I've also moved files that had no, or very few blocks of code into more catagorized areas. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4388 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -173,7 +173,7 @@
|
||||
..()
|
||||
sleep(2)
|
||||
new /obj/item/clothing/under/det(src)
|
||||
new /obj/item/clothing/suit/det_suit/armor(src)
|
||||
new /obj/item/clothing/suit/armor/det_suit(src)
|
||||
new /obj/item/clothing/suit/det_suit(src)
|
||||
new /obj/item/clothing/gloves/black(src)
|
||||
new /obj/item/clothing/head/det_hat(src)
|
||||
|
||||
@@ -1,137 +0,0 @@
|
||||
/*
|
||||
CONTAINS:
|
||||
ORANGE SHOES
|
||||
MUZZLE
|
||||
CAKEHAT
|
||||
SUNGLASSES
|
||||
SWAT SUIT
|
||||
CHAMELEON JUMPSUIT
|
||||
SYNDICATE SHOES
|
||||
DEATH COMMANDO GAS MASK
|
||||
THERMAL GLASSES
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
/obj/item/clothing/fire_burn(obj/fire/raging_fire, datum/air_group/environment)
|
||||
if(raging_fire.internal_temperature > src.s_fire)
|
||||
spawn( 0 )
|
||||
var/t = src.icon_state
|
||||
src.icon_state = ""
|
||||
src.icon = 'b_items.dmi'
|
||||
flick(text("[]", t), src)
|
||||
spawn(14)
|
||||
del(src)
|
||||
return
|
||||
return
|
||||
return 0
|
||||
return 1
|
||||
*/ //TODO FIX
|
||||
|
||||
/obj/item/clothing/gloves/examine()
|
||||
set src in usr
|
||||
..()
|
||||
return
|
||||
|
||||
/*
|
||||
/obj/item/clothing/gloves/latex/attackby(obj/item/weapon/cable_coil/O as obj, loc)
|
||||
if (istype(O) && O.amount==1)
|
||||
var/obj/item/latexballon/LB = new //BALLOON IS EVEN SPELLED INCORRECTLY OMFG D=
|
||||
usr.put_in_hands(new /obj/item/latexballon)
|
||||
del(O)
|
||||
del(src)
|
||||
else
|
||||
return ..()
|
||||
*/
|
||||
|
||||
/obj/item/clothing/shoes/orange/attack_self(mob/user as mob)
|
||||
if (src.chained)
|
||||
src.chained = null
|
||||
src.slowdown = SHOES_SLOWDOWN
|
||||
new /obj/item/weapon/handcuffs( user.loc )
|
||||
src.icon_state = "orange"
|
||||
return
|
||||
|
||||
/obj/item/clothing/shoes/orange/attackby(H as obj, loc)
|
||||
..()
|
||||
if ((istype(H, /obj/item/weapon/handcuffs) && !( src.chained )))
|
||||
//H = null
|
||||
del(H)
|
||||
src.chained = 1
|
||||
src.slowdown = 15
|
||||
src.icon_state = "orange1"
|
||||
return
|
||||
|
||||
/obj/item/clothing/mask/muzzle/attack_paw(mob/user as mob)
|
||||
if (src == user.wear_mask)
|
||||
return
|
||||
else
|
||||
..()
|
||||
return
|
||||
|
||||
/obj/item/clothing/head/cakehat/var/processing = 0
|
||||
|
||||
/obj/item/clothing/head/cakehat/process()
|
||||
if(!onfire)
|
||||
processing_objects.Remove(src)
|
||||
return
|
||||
|
||||
var/turf/location = src.loc
|
||||
if(istype(location, /mob/))
|
||||
var/mob/living/carbon/human/M = location
|
||||
if(M.l_hand == src || M.r_hand == src || M.head == src)
|
||||
location = M.loc
|
||||
|
||||
if (istype(location, /turf))
|
||||
location.hotspot_expose(700, 1)
|
||||
|
||||
|
||||
/obj/item/clothing/head/cakehat/attack_self(mob/user as mob)
|
||||
if(status > 1) return
|
||||
src.onfire = !( src.onfire )
|
||||
if (src.onfire)
|
||||
src.force = 3
|
||||
src.damtype = "fire"
|
||||
src.icon_state = "cake1"
|
||||
processing_objects.Add(src)
|
||||
else
|
||||
src.force = null
|
||||
src.damtype = "brute"
|
||||
src.icon_state = "cake0"
|
||||
return
|
||||
|
||||
|
||||
|
||||
/obj/item/clothing/suit/suit/verb/toggle()
|
||||
set name = "Toggle Jacket Buttons"
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
|
||||
if(!usr.canmove || usr.stat || usr.restrained())
|
||||
return 0
|
||||
|
||||
if(src.icon_state == "suitjacket_blue_open")
|
||||
src.icon_state = "suitjacket_blue"
|
||||
src.item_state = "suitjacket_blue"
|
||||
usr << "You button up the suit jacket."
|
||||
else if(src.icon_state == "suitjacket_blue")
|
||||
src.icon_state = "suitjacket_blue_open"
|
||||
src.item_state = "suitjacket_blue_open"
|
||||
usr << "You unbutton the suit jacket."
|
||||
else
|
||||
usr << "You button-up some imaginary buttons on your [src]."
|
||||
return
|
||||
usr.update_inv_wear_suit()
|
||||
|
||||
/obj/item/clothing/head/ushanka/attack_self(mob/user as mob)
|
||||
if(src.icon_state == "ushankadown")
|
||||
src.icon_state = "ushankaup"
|
||||
src.item_state = "ushankaup"
|
||||
user << "You raise the ear flaps on the ushanka."
|
||||
else
|
||||
src.icon_state = "ushankadown"
|
||||
src.item_state = "ushankadown"
|
||||
user << "You lower the ear flaps on the ushanka."
|
||||
|
||||
|
||||
|
||||
@@ -75,7 +75,6 @@ ENERGY SHIELD (where else should i even put this)
|
||||
return
|
||||
|
||||
// AXE
|
||||
|
||||
/obj/item/weapon/melee/energy/axe/attack(target as mob, mob/user as mob)
|
||||
..()
|
||||
|
||||
@@ -94,6 +93,17 @@ ENERGY SHIELD (where else should i even put this)
|
||||
src.add_fingerprint(user)
|
||||
return
|
||||
|
||||
// CLASSIC BATON
|
||||
/obj/item/weapon/melee/classic_baton
|
||||
name = "police baton"
|
||||
desc = "A wooden truncheon for beating criminal scum."
|
||||
icon = 'icons/obj/weapons.dmi'
|
||||
icon_state = "baton"
|
||||
item_state = "classic_baton"
|
||||
flags = FPRINT | TABLEPASS
|
||||
slot_flags = SLOT_BELT
|
||||
force = 10
|
||||
|
||||
/obj/item/weapon/melee/classic_baton/attack(mob/M as mob, mob/living/user as mob)
|
||||
if ((CLUMSY in user.mutations) && prob(50))
|
||||
user << "\red You club yourself over the head."
|
||||
@@ -128,6 +138,7 @@ ENERGY SHIELD (where else should i even put this)
|
||||
for(var/mob/O in viewers(M))
|
||||
if (O.client) O.show_message("\red <B>[M] has been stunned with the police baton by [user]!</B>", 1, "\red You hear someone fall", 2)
|
||||
|
||||
//ENERGY SHIELD
|
||||
/obj/item/weapon/shield/energy/IsShield()
|
||||
if(active)
|
||||
return 1
|
||||
|
||||
Reference in New Issue
Block a user