cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-24 05:06:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #201 from LikelyMeowness/master

Browse Source 
Zipties Part Deux
This commit is contained in:
skull132
2014-08-02 18:01:38 +03:00
parent ac86f670b5 95a9324952
commit 4dca6039ab
10 changed files with 212 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/jobs/security.dm
+2 -2
View File
@@ -236,8 +236,8 @@
siemens_coefficient = 0.9
/obj/item/clothing/under/rank/navy/officer/blue
name = "Blue Officer Uniform"
desc = "A blue service uniform worn by a security officer."
name = "Internal Advisor Uniform"
desc = "A blue service uniform worn by Advisors."
icon_state = "officerblueclothes"
item_state = "officerblueclothes"
item_color = "officerblueclothes"
code/modules/economy/Job_Departments.dm
+5 -1
View File
@@ -65,10 +65,14 @@ var/list/station_departments = list("Command", "Medical", "Engineering", "Scienc
/datum/job/warden/department = "Security"
/datum/job/detective/department = "Security"
/datum/job/forensicetech/department = "Security"
/datum/job/officer/department = "Security"
/datum/job/investigator/department = "Security"
/datum/job/internaladviser/department = "Security"
/datum/job/intern_sec/department = "Security"
/datum/job/intern_med/department = "Medical"
code/modules/mob/new_player/preferences_setup.dm
+23 -7
View File
@@ -599,14 +599,30 @@ datum/preferences
clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
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)
if(FT)
clothes_s = new /icon('icons/mob/uniform.dmi', "redshirt2_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), 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)
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(INV)
clothes_s = new /icon('icons/mob/uniform.dmi', "redshirt2_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
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(INTAD)
clothes_s = new /icon('icons/mob/uniform.dmi', "officerblueclothes_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
switch(backbag)
if(2)
clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)