cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-24 04:26:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes

Browse Source 
Conflicts:
	icons/mob/uniform.dmi
This commit is contained in:
SinTwo
2016-05-06 21:03:18 -04:00
parent 8f5dd213ed 454cc25cba
commit 64df53f568
16 changed files with 201 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+2 -2
View File
@@ -17,7 +17,7 @@
if(prob(25))
new /obj/item/weapon/storage/backpack/dufflebag(src)
new /obj/item/clothing/under/rank/cargotech(src)
new /obj/item/clothing/under/skirt/cargotech(src)
new /obj/item/clothing/under/skirt/job/cargotech(src)
new /obj/item/clothing/under/rank/cargotech/jeans(src)
new /obj/item/clothing/under/rank/cargotech/jeans/female(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/cargo(src)
@@ -48,7 +48,7 @@
if(prob(25))
new /obj/item/weapon/storage/backpack/dufflebag(src)
new /obj/item/clothing/under/rank/cargo(src)
new /obj/item/clothing/under/skirt/cargo(src)
new /obj/item/clothing/under/skirt/job/cargo(src)
new /obj/item/clothing/under/rank/cargo/jeans(src)
new /obj/item/clothing/under/rank/cargo/jeans/female(src)
new /obj/item/clothing/shoes/brown(src)
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+1 -1
View File
@@ -20,7 +20,7 @@
new /obj/item/clothing/accessory/storage/brown_vest(src)
new /obj/item/blueprints(src)
new /obj/item/clothing/under/rank/chief_engineer(src)
new /obj/item/clothing/under/skirt/engineer/chief_engineer(src)
new /obj/item/clothing/under/skirt/job/engineer/chief_engineer(src)
new /obj/item/clothing/head/hardhat/white(src)
new /obj/item/clothing/head/welding(src)
new /obj/item/clothing/gloves/yellow(src)
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+1 -1
View File
@@ -192,7 +192,7 @@
new /obj/item/clothing/under/rank/medical/navyblue(src)
new /obj/item/clothing/head/surgery/navyblue(src)
new /obj/item/clothing/under/rank/chief_medical_officer(src)
new /obj/item/clothing/under/skirt/medical/chief_medical_officer(src)
new /obj/item/clothing/under/skirt/job/medical/chief_medical_officer(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt(src)
new /obj/item/weapon/cartridge/cmo(src)
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+16 -16
View File
@@ -246,9 +246,9 @@
new /obj/item/clothing/under/rank/atmospheric_technician(src)
new /obj/item/clothing/under/rank/atmospheric_technician(src)
new /obj/item/clothing/under/rank/atmospheric_technician(src)
new /obj/item/clothing/under/skirt/engineer/atmospheric_technician(src)
new /obj/item/clothing/under/skirt/engineer/atmospheric_technician(src)
new /obj/item/clothing/under/skirt/engineer/atmospheric_technician(src)
new /obj/item/clothing/under/skirt/job/engineer/atmospheric_technician(src)
new /obj/item/clothing/under/skirt/job/engineer/atmospheric_technician(src)
new /obj/item/clothing/under/skirt/job/engineer/atmospheric_technician(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/clothing/shoes/black(src)
@@ -276,9 +276,9 @@
new /obj/item/clothing/under/rank/engineer(src)
new /obj/item/clothing/under/rank/engineer(src)
new /obj/item/clothing/under/rank/engineer(src)
new /obj/item/clothing/under/skirt/engineer(src)
new /obj/item/clothing/under/skirt/engineer(src)
new /obj/item/clothing/under/skirt/engineer(src)
new /obj/item/clothing/under/skirt/job/engineer(src)
new /obj/item/clothing/under/skirt/job/engineer(src)
new /obj/item/clothing/under/skirt/job/engineer(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
new /obj/item/clothing/shoes/orange(src)
@@ -347,8 +347,8 @@
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/clothing/under/skirt/scientist(src)
new /obj/item/clothing/under/skirt/scientist(src)
new /obj/item/clothing/under/skirt/job/scientist(src)
new /obj/item/clothing/under/skirt/job/scientist(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
@@ -396,8 +396,8 @@
..()
new /obj/item/clothing/under/rank/chemist(src)
new /obj/item/clothing/under/rank/chemist(src)
new /obj/item/clothing/under/skirt/medical/chemist(src)
new /obj/item/clothing/under/skirt/medical/chemist(src)
new /obj/item/clothing/under/skirt/job/medical/chemist(src)
new /obj/item/clothing/under/skirt/job/medical/chemist(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/chemist(src)
@@ -418,8 +418,8 @@
..()
new /obj/item/clothing/under/rank/geneticist(src)
new /obj/item/clothing/under/rank/geneticist(src)
new /obj/item/clothing/under/skirt/medical/geneticist(src)
new /obj/item/clothing/under/skirt/medical/geneticist(src)
new /obj/item/clothing/under/skirt/job/medical/geneticist(src)
new /obj/item/clothing/under/skirt/job/medical/geneticist(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(src)
@@ -440,8 +440,8 @@
..()
new /obj/item/clothing/under/rank/virologist(src)
new /obj/item/clothing/under/rank/virologist(src)
new /obj/item/clothing/under/skirt/medical/virologist(src)
new /obj/item/clothing/under/skirt/medical/virologist(src)
new /obj/item/clothing/under/skirt/job/medical/virologist(src)
new /obj/item/clothing/under/skirt/job/medical/virologist(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(src)
@@ -464,8 +464,8 @@
..()
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/under/skirt/medical(src)
new /obj/item/clothing/under/skirt/medical(src)
new /obj/item/clothing/under/skirt/job/medical(src)
new /obj/item/clothing/under/skirt/job/medical(src)
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/purple(src)