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

- Went through all the clothing stuff and only gave the ONESIZEFITSALL flag to the clothing items that actually have a fat sprite. Fixes issue 393

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4418 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-08-15 14:25:54 +00:00
parent 23a13baa8e
commit 55f405f98b
7 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/clothing/clothing.dm
View File

@@ -142,7 +142,7 @@ BLIND // can't see anything
protective_temperature = T0C + 50
heat_transfer_coefficient = 0.30
permeability_coefficient = 0.90
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
flags = FPRINT | TABLEPASS
slot_flags = SLOT_ICLOTHING
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
var/has_sensor = 1//For the crew computer 2 = unable to change mode

16
code/modules/clothing/under/color.dm
View File

@@ -3,6 +3,7 @@
icon_state = "black"
item_state = "bl_suit"
color = "black"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/color/blackf
name = "feminine black jumpsuit"
@@ -16,18 +17,21 @@
icon_state = "blue"
item_state = "b_suit"
color = "blue"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/color/green
name = "green jumpsuit"
icon_state = "green"
item_state = "g_suit"
color = "green"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/color/grey
name = "grey jumpsuit"
icon_state = "grey"
item_state = "gy_suit"
color = "grey"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/color/orange
name = "orange jumpsuit"
@@ -37,30 +41,35 @@
color = "orange"
has_sensor = 2
sensor_mode = 3
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/color/pink
name = "pink jumpsuit"
icon_state = "pink"
item_state = "p_suit"
color = "pink"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/color/red
name = "red jumpsuit"
icon_state = "red"
item_state = "r_suit"
color = "red"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/color/white
name = "white jumpsuit"
icon_state = "white"
item_state = "w_suit"
color = "white"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/color/yellow
name = "yellow jumpsuit"
icon_state = "yellow"
item_state = "y_suit"
color = "yellow"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/psyche
name = "psychedelic"
@@ -79,6 +88,7 @@
desc = "aqua"
icon_state = "aqua"
color = "aqua"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/purple
name = "purple"
@@ -110,12 +120,14 @@
desc = "lightbrown"
icon_state = "lightbrown"
color = "lightbrown"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/brown
name = "brown"
desc = "brown"
icon_state = "brown"
color = "brown"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/yellowgreen
name = "yellowgreen"
@@ -128,6 +140,7 @@
desc = "darkblue"
icon_state = "darkblue"
color = "darkblue"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/lightred
name = "lightred"
@@ -139,4 +152,5 @@
name = "darkred"
desc = "darkred"
icon_state = "darkred"
color = "darkred"
color = "darkred"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL

10
code/modules/clothing/under/jobs/civilian.dm
View File

@@ -6,6 +6,7 @@
icon_state = "ba_suit"
item_state = "ba_suit"
color = "ba_suit"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
@@ -14,6 +15,7 @@
icon_state = "captain"
item_state = "caparmor"
color = "captain"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/cargo
@@ -30,6 +32,7 @@
icon_state = "cargotech"
item_state = "lb_suit"
color = "cargo"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/chaplain
@@ -38,6 +41,7 @@
icon_state = "chaplain"
item_state = "bl_suit"
color = "chapblack"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/chef
@@ -45,6 +49,7 @@
name = "chef's uniform"
icon_state = "chef"
color = "chef"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/clown
@@ -53,6 +58,7 @@
icon_state = "clown"
item_state = "clown"
color = "clown"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/head_of_personnel
@@ -61,6 +67,7 @@
icon_state = "hop"
item_state = "b_suit"
color = "hop"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/hydroponics
@@ -70,6 +77,7 @@
item_state = "g_suit"
color = "hydroponics"
permeability_coefficient = 0.50
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/janitor
@@ -78,6 +86,7 @@
icon_state = "janitor"
color = "janitor"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/lawyer
@@ -138,6 +147,7 @@
icon_state = "mime"
item_state = "mime"
color = "mime"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/miner
desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."

3
code/modules/clothing/under/jobs/engineering.dm
View File

@@ -6,6 +6,7 @@
item_state = "g_suit"
color = "chief"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/atmospheric_technician
desc = "It's a jumpsuit worn by atmospheric technicians."
@@ -13,6 +14,7 @@
icon_state = "atmos"
item_state = "atmos_suit"
color = "atmos"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/engineer
desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding."
@@ -21,6 +23,7 @@
item_state = "engi_suit"
color = "engine"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10)
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/roboticist
desc = "It's a slimming black with reinforced seams; great for industrial work."

7
code/modules/clothing/under/jobs/medsci.dm
View File

@@ -8,6 +8,7 @@
item_state = "g_suit"
color = "director"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/scientist
desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
@@ -17,6 +18,7 @@
color = "toxinswhite"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/chemist
@@ -48,6 +50,7 @@
color = "geneticswhite"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/virologist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
@@ -75,24 +78,28 @@
color = "medical"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/medical/blue
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
icon_state = "scrubsblue"
color = "scrubsblue"
flags = FPRINT | TABLEPASS
/obj/item/clothing/under/rank/medical/green
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
icon_state = "scrubsgreen"
color = "scrubsgreen"
flags = FPRINT | TABLEPASS
/obj/item/clothing/under/rank/medical/purple
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
icon_state = "scrubspurple"
color = "scrubspurple"
flags = FPRINT | TABLEPASS

4
code/modules/clothing/under/jobs/security.dm
View File

@@ -15,6 +15,7 @@
item_state = "r_suit"
color = "warden"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/security
name = "security officer's jumpsuit"
@@ -23,6 +24,7 @@
item_state = "r_suit"
color = "secred"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/*
* Detective
@@ -34,6 +36,7 @@
item_state = "det"
color = "detective"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/head/det_hat
@@ -53,6 +56,7 @@
item_state = "r_suit"
color = "hosred"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/head/helmet/HoS

4
code/modules/clothing/under/miscellaneous.dm
View File

@@ -15,7 +15,6 @@
/obj/item/clothing/under/scratch
name = "white suit"
desc = "A white suit, suitable for an excellent host"
flags = FPRINT | TABLEPASS
icon_state = "scratch"
item_state = "scratch"
color = "scratch"
@@ -25,6 +24,7 @@
name = "amish suit"
icon_state = "sl_suit"
color = "sl_suit"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/waiter
name = "waiter's outfit"
@@ -32,6 +32,7 @@
icon_state = "waiter"
item_state = "waiter"
color = "waiter"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/rank/mailman
name = "mailman's jumpsuit"
@@ -101,6 +102,7 @@
desc = "A jumpsuit with owl wings. Photorealistic owl feathers! Twooooo!"
icon_state = "owl"
color = "owl"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/johnny
name = "johnny~~ jumpsuit"