cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-25 21:56:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

New stuff plus forgotten files.

Browse Source
This commit is contained in:
suethecake
2014-09-07 12:11:46 -06:00
parent ea9bbe3780
commit ab50f9407b
11 changed files with 11349 additions and 11256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/jobs/security.dm
+14
View File
@@ -225,6 +225,13 @@
item_state = "wardentanclothes"
item_color = "wardentanclothes"
/obj/item/clothing/under/rank/navy/det
name = "Investigator's uniform"
desc = "A smart pair of khakis and a dress shirt."
icon_state = "wardentanclothes"
item_state = "wardentanclothes"
item_color = "wardentanclothes"
/obj/item/clothing/under/rank/navy/officer
name = "Naval Officer Uniform"
desc = "A service unfirom worn by an officer of the NanoTrasen Naval branch."
@@ -247,4 +254,11 @@
desc = "A tan service uniform worn by a security officer."
icon_state = "officertanclothes"
item_state = "officertanclothes"
item_color = "officertanclothes"
/obj/item/clothing/under/rank/navy/det/forensics
name = "Technician's uniform"
desc = "A tan service uniform worn by a forensics officer."
icon_state = "officertanclothes"
item_state = "officertanclothes"
item_color = "officertanclothes"
code/modules/economy/Job_Departments.dm
+2
View File
@@ -67,6 +67,8 @@ var/list/station_departments = list("Command", "Medical", "Engineering", "Scienc
/datum/job/detective/department = "Security"
/datum/job/forensics/department = "Security"
/datum/job/officer/department = "Security"
/datum/job/intern_sec/department = "Security"
code/modules/mob/new_player/preferences_setup.dm
+16 -4
View File
@@ -600,13 +600,11 @@ datum/preferences
if(4)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
if(DETECTIVE)
clothes_s = new /icon('icons/mob/uniform.dmi', "detective_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
clothes_s = new /icon('icons/mob/uniform.dmi', "wardentanclothes_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
if(prob(1))
clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/head.dmi', "detective"), ICON_OVERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
switch(backbag)
if(2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
@@ -614,6 +612,20 @@ datum/preferences
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
if(FORENSICS)
clothes_s = new /icon('icons/mob/uniform.dmi', "polsuit_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
switch(backbag)
if(2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
if(3)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
if(4)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
if(OFFICER)
clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)