shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-29105

Browse Source
This commit is contained in:
LetterJay
2017-09-02 07:11:32 -05:00
committed by GitHub
parent 8731fb7e1c 2bfc7872fa
commit 3e0ead1204
1577 changed files with 55829 additions and 215217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/jobs/access.dm
+1 -1
View File
@@ -373,7 +373,7 @@
return list("VIP Guest","Custodian","Thunderdome Overseer","CentCom Official","Medical Officer","Death Commando","Research Officer","Special Ops Officer","Admiral","CentCom Commander","Emergency Response Team Commander","Security Response Officer","Engineer Response Officer", "Medical Response Officer","CentCom Bartender")
/obj/item/proc/GetJobName() //Used in secHUD icon generation
var/obj/item/weapon/card/id/I = GetID()
var/obj/item/card/id/I = GetID()
if(!I)
return
var/jobName = I.assignment
code/modules/jobs/job_types/captain.dm
+9 -9
View File
@@ -32,7 +32,7 @@ Captain
name = "Captain"
jobtype = /datum/job/captain
id = /obj/item/weapon/card/id/gold
id = /obj/item/card/id/gold
belt = /obj/item/device/pda/captain
glasses = /obj/item/clothing/glasses/sunglasses
ears = /obj/item/device/radio/headset/heads/captain/alt
@@ -41,13 +41,13 @@ Captain
suit = /obj/item/clothing/suit/armor/vest/capcarapace
shoes = /obj/item/clothing/shoes/sneakers/brown
head = /obj/item/clothing/head/caphat
backpack_contents = list(/obj/item/weapon/melee/classic_baton/telescopic=1, /obj/item/weapon/station_charter=1)
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/station_charter=1)
backpack = /obj/item/weapon/storage/backpack/captain
satchel = /obj/item/weapon/storage/backpack/satchel/cap
duffelbag = /obj/item/weapon/storage/backpack/duffelbag/captain
backpack = /obj/item/storage/backpack/captain
satchel = /obj/item/storage/backpack/satchel/cap
duffelbag = /obj/item/storage/backpack/duffelbag/captain
implants = list(/obj/item/weapon/implant/mindshield)
implants = list(/obj/item/implant/mindshield)
accessory = /obj/item/clothing/accessory/medal/gold/captain
/*
@@ -90,11 +90,11 @@ Head of Personnel
name = "Head of Personnel"
jobtype = /datum/job/hop
id = /obj/item/weapon/card/id/silver
id = /obj/item/card/id/silver
belt = /obj/item/device/pda/heads/hop
ears = /obj/item/device/radio/headset/heads/hop
uniform = /obj/item/clothing/under/rank/head_of_personnel
shoes = /obj/item/clothing/shoes/sneakers/brown
head = /obj/item/clothing/head/hopcap
backpack_contents = list(/obj/item/weapon/storage/box/ids=1,\
/obj/item/weapon/melee/classic_baton/telescopic=1, /obj/item/device/modular_computer/tablet/preset/advanced = 1)
backpack_contents = list(/obj/item/storage/box/ids=1,\
/obj/item/melee/classic_baton/telescopic=1, /obj/item/device/modular_computer/tablet/preset/advanced = 1)
code/modules/jobs/job_types/cargo_service.dm
+20 -20
View File
@@ -26,7 +26,7 @@ Quartermaster
uniform = /obj/item/clothing/under/rank/cargo
shoes = /obj/item/clothing/shoes/sneakers/brown
glasses = /obj/item/clothing/glasses/sunglasses
l_hand = /obj/item/weapon/clipboard
l_hand = /obj/item/clipboard
/*
Cargo Technician
@@ -84,18 +84,18 @@ Shaft Miner
shoes = /obj/item/clothing/shoes/workboots/mining
gloves = /obj/item/clothing/gloves/color/black
uniform = /obj/item/clothing/under/rank/miner/lavaland
l_pocket = /obj/item/weapon/reagent_containers/hypospray/medipen/survival
l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival
r_pocket = /obj/item/device/flashlight/seclite
backpack_contents = list(
/obj/item/weapon/storage/bag/ore=1,\
/obj/item/weapon/kitchen/knife/combat/survival=1,\
/obj/item/weapon/mining_voucher=1,\
/obj/item/storage/bag/ore=1,\
/obj/item/kitchen/knife/combat/survival=1,\
/obj/item/mining_voucher=1,\
/obj/item/stack/marker_beacon/ten=1)
backpack = /obj/item/weapon/storage/backpack/explorer
satchel = /obj/item/weapon/storage/backpack/satchel/explorer
duffelbag = /obj/item/weapon/storage/backpack/duffelbag
box = /obj/item/weapon/storage/box/survival_mining
backpack = /obj/item/storage/backpack/explorer
satchel = /obj/item/storage/backpack/satchel/explorer
duffelbag = /obj/item/storage/backpack/duffelbag
box = /obj/item/storage/box/survival_mining
/datum/outfit/job/miner/asteroid
name = "Shaft Miner (Asteroid)"
@@ -107,14 +107,14 @@ Shaft Miner
suit = /obj/item/clothing/suit/hooded/explorer
mask = /obj/item/clothing/mask/gas/explorer
glasses = /obj/item/clothing/glasses/meson
suit_store = /obj/item/weapon/tank/internals/oxygen
suit_store = /obj/item/tank/internals/oxygen
internals_slot = slot_s_store
backpack_contents = list(
/obj/item/weapon/storage/bag/ore=1,
/obj/item/weapon/kitchen/knife/combat/survival=1,
/obj/item/weapon/mining_voucher=1,
/obj/item/storage/bag/ore=1,
/obj/item/kitchen/knife/combat/survival=1,
/obj/item/mining_voucher=1,
/obj/item/device/t_scanner/adv_mining_scanner/lesser=1,
/obj/item/weapon/gun/energy/kinetic_accelerator=1,\
/obj/item/gun/energy/kinetic_accelerator=1,\
/obj/item/stack/marker_beacon/ten=1)
/datum/outfit/job/miner/equipped/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -163,7 +163,7 @@ Bartender
ears = /obj/item/device/radio/headset/headset_srv
uniform = /obj/item/clothing/under/rank/bartender
suit = /obj/item/clothing/suit/armor/vest
backpack_contents = list(/obj/item/weapon/storage/box/beanbag=1)
backpack_contents = list(/obj/item/storage/box/beanbag=1)
shoes = /obj/item/clothing/shoes/laceup
/*
@@ -195,7 +195,7 @@ Cook
uniform = /obj/item/clothing/under/rank/chef
suit = /obj/item/clothing/suit/toggle/chef
head = /obj/item/clothing/head/chefhat
backpack_contents = list(/obj/item/weapon/sharpener = 1)
backpack_contents = list(/obj/item/sharpener = 1)
/datum/outfit/job/cook/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -209,9 +209,9 @@ Cook
/datum/outfit/job/cook/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
var/list/possible_boxes = subtypesof(/obj/item/weapon/storage/box/ingredients)
var/list/possible_boxes = subtypesof(/obj/item/storage/box/ingredients)
var/chosen_box = pick(possible_boxes)
var/obj/item/weapon/storage/box/I = new chosen_box(src)
var/obj/item/storage/box/I = new chosen_box(src)
H.equip_to_slot_or_del(I,slot_in_backpack)
/*
@@ -248,8 +248,8 @@ Botanist
gloves =/obj/item/clothing/gloves/botanic_leather
suit_store = /obj/item/device/plant_analyzer
backpack = /obj/item/weapon/storage/backpack/botany
satchel = /obj/item/weapon/storage/backpack/satchel/hyd
backpack = /obj/item/storage/backpack/botany
satchel = /obj/item/storage/backpack/satchel/hyd
/*
code/modules/jobs/job_types/civilian.dm
+16 -16
View File
@@ -28,21 +28,21 @@ Clown
uniform = /obj/item/clothing/under/rank/clown
shoes = /obj/item/clothing/shoes/clown_shoes
mask = /obj/item/clothing/mask/gas/clown_hat
l_pocket = /obj/item/weapon/bikehorn
l_pocket = /obj/item/bikehorn
backpack_contents = list(
/obj/item/weapon/stamp/clown = 1,
/obj/item/weapon/reagent_containers/spray/waterflower = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1,
/obj/item/stamp/clown = 1,
/obj/item/reagent_containers/spray/waterflower = 1,
/obj/item/reagent_containers/food/snacks/grown/banana = 1,
/obj/item/device/instrument/bikehorn = 1,
)
implants = list(/obj/item/weapon/implant/sad_trombone)
implants = list(/obj/item/implant/sad_trombone)
backpack = /obj/item/weapon/storage/backpack/clown
satchel = /obj/item/weapon/storage/backpack/clown
duffelbag = /obj/item/weapon/storage/backpack/duffelbag/clown //strangely has a duffel
backpack = /obj/item/storage/backpack/clown
satchel = /obj/item/storage/backpack/clown
duffelbag = /obj/item/storage/backpack/duffelbag/clown //strangely has a duffel
box = /obj/item/weapon/storage/box/hug/survival
box = /obj/item/storage/box/hug/survival
/datum/outfit/job/clown/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -91,11 +91,11 @@ Mime
gloves = /obj/item/clothing/gloves/color/white
head = /obj/item/clothing/head/beret
suit = /obj/item/clothing/suit/suspenders
backpack_contents = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing=1)
backpack_contents = list(/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing=1)
accessory = /obj/item/clothing/accessory/pocketprotector/cosmetology
backpack = /obj/item/weapon/storage/backpack/mime
satchel = /obj/item/weapon/storage/backpack/mime
backpack = /obj/item/storage/backpack/mime
satchel = /obj/item/storage/backpack/mime
/datum/outfit/job/mime/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -134,14 +134,14 @@ Curator
belt = /obj/item/device/pda/curator
uniform = /obj/item/clothing/under/rank/curator
l_hand = /obj/item/weapon/storage/bag/books
l_hand = /obj/item/storage/bag/books
r_pocket = /obj/item/key/displaycase
l_pocket = /obj/item/device/laser_pointer
accessory = /obj/item/clothing/accessory/pocketprotector/full
backpack_contents = list(
/obj/item/weapon/melee/curator_whip = 1,
/obj/item/melee/curator_whip = 1,
/obj/item/soapstone = 1,
/obj/item/weapon/barcodescanner = 1
/obj/item/barcodescanner = 1
)
@@ -182,7 +182,7 @@ Lawyer
uniform = /obj/item/clothing/under/lawyer/bluesuit
suit = /obj/item/clothing/suit/toggle/lawyer
shoes = /obj/item/clothing/shoes/laceup
l_hand = /obj/item/weapon/storage/briefcase/lawyer
l_hand = /obj/item/storage/briefcase/lawyer
l_pocket = /obj/item/device/laser_pointer
r_pocket = /obj/item/clothing/accessory/lawyers_badge
code/modules/jobs/job_types/civilian_chaplain.dm
+5 -5
View File
@@ -22,7 +22,7 @@ Chaplain
if(H.mind)
H.mind.isholy = TRUE
var/obj/item/weapon/storage/book/bible/booze/B = new
var/obj/item/storage/book/bible/booze/B = new
if(SSreligion.religion)
B.deity_name = SSreligion.deity
@@ -31,8 +31,8 @@ Chaplain
B.item_state = SSreligion.bible_item_state
to_chat(H, "There is already an established religion onboard the station. You are an acolyte of [SSreligion.deity]. Defer to the Chaplain.")
H.equip_to_slot_or_del(B, slot_in_backpack)
var/nrt = SSreligion.holy_weapon_type || /obj/item/weapon/nullrod
var/obj/item/weapon/nullrod/N = new nrt(H)
var/nrt = SSreligion.holy_weapon_type || /obj/item/nullrod
var/obj/item/nullrod/N = new nrt(H)
H.equip_to_slot_or_del(N, slot_in_backpack)
return
@@ -91,5 +91,5 @@ Chaplain
uniform = /obj/item/clothing/under/rank/chaplain
backpack_contents = list(/obj/item/device/camera/spooky = 1)
accessory = /obj/item/clothing/accessory/pocketprotector/cosmetology
backpack = /obj/item/weapon/storage/backpack/cultpack
satchel = /obj/item/weapon/storage/backpack/cultpack
backpack = /obj/item/storage/backpack/cultpack
satchel = /obj/item/storage/backpack/cultpack
code/modules/jobs/job_types/engineering.dm
+20 -20
View File
@@ -33,8 +33,8 @@ Chief Engineer
name = "Chief Engineer"
jobtype = /datum/job/chief_engineer
id = /obj/item/weapon/card/id/silver
belt = /obj/item/weapon/storage/belt/utility/chief/full
id = /obj/item/card/id/silver
belt = /obj/item/storage/belt/utility/chief/full
l_pocket = /obj/item/device/pda/heads/ce
ears = /obj/item/device/radio/headset/heads/ce
uniform = /obj/item/clothing/under/rank/chief_engineer
@@ -42,12 +42,12 @@ Chief Engineer
head = /obj/item/clothing/head/hardhat/white
gloves = /obj/item/clothing/gloves/color/black/ce
accessory = /obj/item/clothing/accessory/pocketprotector/full
backpack_contents = list(/obj/item/weapon/melee/classic_baton/telescopic=1, /obj/item/device/modular_computer/tablet/preset/advanced=1)
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/device/modular_computer/tablet/preset/advanced=1)
backpack = /obj/item/weapon/storage/backpack/industrial
satchel = /obj/item/weapon/storage/backpack/satchel/eng
duffelbag = /obj/item/weapon/storage/backpack/duffelbag/engineering
box = /obj/item/weapon/storage/box/engineer
backpack = /obj/item/storage/backpack/industrial
satchel = /obj/item/storage/backpack/satchel/eng
duffelbag = /obj/item/storage/backpack/duffelbag/engineering
box = /obj/item/storage/box/engineer
pda_slot = slot_l_store
/datum/outfit/job/ce/rig
@@ -56,7 +56,7 @@ Chief Engineer
mask = /obj/item/clothing/mask/breath
suit = /obj/item/clothing/suit/space/hardsuit/engine/elite
shoes = /obj/item/clothing/shoes/magboots/advance
suit_store = /obj/item/weapon/tank/internals/oxygen
suit_store = /obj/item/tank/internals/oxygen
gloves = /obj/item/clothing/gloves/color/yellow
head = null
internals_slot = slot_s_store
@@ -89,7 +89,7 @@ Station Engineer
name = "Station Engineer"
jobtype = /datum/job/engineer
belt = /obj/item/weapon/storage/belt/utility/full/engi
belt = /obj/item/storage/belt/utility/full/engi
l_pocket = /obj/item/device/pda/engineering
ears = /obj/item/device/radio/headset/headset_eng
uniform = /obj/item/clothing/under/rank/engineer
@@ -98,10 +98,10 @@ Station Engineer
r_pocket = /obj/item/device/t_scanner
accessory = /obj/item/clothing/accessory/pocketprotector/full
backpack = /obj/item/weapon/storage/backpack/industrial
satchel = /obj/item/weapon/storage/backpack/satchel/eng
duffelbag = /obj/item/weapon/storage/backpack/duffelbag/engineering
box = /obj/item/weapon/storage/box/engineer
backpack = /obj/item/storage/backpack/industrial
satchel = /obj/item/storage/backpack/satchel/eng
duffelbag = /obj/item/storage/backpack/duffelbag/engineering
box = /obj/item/storage/box/engineer
pda_slot = slot_l_store
backpack_contents = list(/obj/item/device/modular_computer/tablet/preset/advanced=1)
@@ -114,7 +114,7 @@ Station Engineer
mask = /obj/item/clothing/mask/breath
suit = /obj/item/clothing/suit/space/hardsuit/engine
suit_store = /obj/item/weapon/tank/internals/oxygen
suit_store = /obj/item/tank/internals/oxygen
head = null
internals_slot = slot_s_store
@@ -145,17 +145,17 @@ Atmospheric Technician
name = "Atmospheric Technician"
jobtype = /datum/job/atmos
belt = /obj/item/weapon/storage/belt/utility/atmostech
belt = /obj/item/storage/belt/utility/atmostech
l_pocket = /obj/item/device/pda/atmos
ears = /obj/item/device/radio/headset/headset_eng
uniform = /obj/item/clothing/under/rank/atmospheric_technician
r_pocket = /obj/item/device/analyzer
accessory = /obj/item/clothing/accessory/pocketprotector/full
backpack = /obj/item/weapon/storage/backpack/industrial
satchel = /obj/item/weapon/storage/backpack/satchel/eng
duffelbag = /obj/item/weapon/storage/backpack/duffelbag/engineering
box = /obj/item/weapon/storage/box/engineer
backpack = /obj/item/storage/backpack/industrial
satchel = /obj/item/storage/backpack/satchel/eng
duffelbag = /obj/item/storage/backpack/duffelbag/engineering
box = /obj/item/storage/box/engineer
pda_slot = slot_l_store
backpack_contents = list(/obj/item/device/modular_computer/tablet/preset/advanced=1)
@@ -164,5 +164,5 @@ Atmospheric Technician
mask = /obj/item/clothing/mask/gas
suit = /obj/item/clothing/suit/space/hardsuit/engine/atmos
suit_store = /obj/item/weapon/tank/internals/oxygen
suit_store = /obj/item/tank/internals/oxygen
internals_slot = slot_s_store
code/modules/jobs/job_types/job.dm
+11 -11
View File
@@ -131,29 +131,29 @@
var/jobtype = null
uniform = /obj/item/clothing/under/color/grey
id = /obj/item/weapon/card/id
id = /obj/item/card/id
ears = /obj/item/device/radio/headset
belt = /obj/item/device/pda
back = /obj/item/weapon/storage/backpack
back = /obj/item/storage/backpack
shoes = /obj/item/clothing/shoes/sneakers/black
var/backpack = /obj/item/weapon/storage/backpack
var/satchel = /obj/item/weapon/storage/backpack/satchel
var/duffelbag = /obj/item/weapon/storage/backpack/duffelbag
var/box = /obj/item/weapon/storage/box/survival
var/backpack = /obj/item/storage/backpack
var/satchel = /obj/item/storage/backpack/satchel
var/duffelbag = /obj/item/storage/backpack/duffelbag
var/box = /obj/item/storage/box/survival
var/pda_slot = slot_belt
/datum/outfit/job/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
switch(H.backbag)
if(GBACKPACK)
back = /obj/item/weapon/storage/backpack //Grey backpack
back = /obj/item/storage/backpack //Grey backpack
if(GSATCHEL)
back = /obj/item/weapon/storage/backpack/satchel //Grey satchel
back = /obj/item/storage/backpack/satchel //Grey satchel
if(GDUFFELBAG)
back = /obj/item/weapon/storage/backpack/duffelbag //Grey Duffel bag
back = /obj/item/storage/backpack/duffelbag //Grey Duffel bag
if(LSATCHEL)
back = /obj/item/weapon/storage/backpack/satchel/leather //Leather Satchel
back = /obj/item/storage/backpack/satchel/leather //Leather Satchel
if(DSATCHEL)
back = satchel //Department satchel
if(DDUFFELBAG)
@@ -175,7 +175,7 @@
if(!J)
J = SSjob.GetJob(H.job)
var/obj/item/weapon/card/id/C = H.wear_id
var/obj/item/card/id/C = H.wear_id
if(istype(C))
C.access = J.get_access()
C.registered_name = H.real_name
code/modules/jobs/job_types/medical.dm
+19 -19
View File
@@ -31,19 +31,19 @@ Chief Medical Officer
name = "Chief Medical Officer"
jobtype = /datum/job/cmo
id = /obj/item/weapon/card/id/silver
id = /obj/item/card/id/silver
belt = /obj/item/device/pda/heads/cmo
ears = /obj/item/device/radio/headset/heads/cmo
uniform = /obj/item/clothing/under/rank/chief_medical_officer
shoes = /obj/item/clothing/shoes/sneakers/brown
suit = /obj/item/clothing/suit/toggle/labcoat/cmo
l_hand = /obj/item/weapon/storage/firstaid/regular
l_hand = /obj/item/storage/firstaid/regular
suit_store = /obj/item/device/flashlight/pen
backpack_contents = list(/obj/item/weapon/melee/classic_baton/telescopic=1)
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
backpack = /obj/item/weapon/storage/backpack/medic
satchel = /obj/item/weapon/storage/backpack/satchel/med
duffelbag = /obj/item/weapon/storage/backpack/duffelbag/med
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel/med
duffelbag = /obj/item/storage/backpack/duffelbag/med
/*
Medical Doctor
@@ -73,12 +73,12 @@ Medical Doctor
uniform = /obj/item/clothing/under/rank/medical
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat
l_hand = /obj/item/weapon/storage/firstaid/regular
l_hand = /obj/item/storage/firstaid/regular
suit_store = /obj/item/device/flashlight/pen
backpack = /obj/item/weapon/storage/backpack/medic
satchel = /obj/item/weapon/storage/backpack/satchel/med
duffelbag = /obj/item/weapon/storage/backpack/duffelbag/med
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel/med
duffelbag = /obj/item/storage/backpack/duffelbag/med
/*
Chemist
@@ -112,9 +112,9 @@ Chemist
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat/chemist
accessory = /obj/item/clothing/accessory/pocketprotector/full
backpack = /obj/item/weapon/storage/backpack/chemistry
satchel = /obj/item/weapon/storage/backpack/satchel/chem
duffelbag = /obj/item/weapon/storage/backpack/duffelbag/med
backpack = /obj/item/storage/backpack/chemistry
satchel = /obj/item/storage/backpack/satchel/chem
duffelbag = /obj/item/storage/backpack/duffelbag/med
/*
Geneticist
@@ -148,9 +148,9 @@ Geneticist
suit = /obj/item/clothing/suit/toggle/labcoat/genetics
suit_store = /obj/item/device/flashlight/pen
backpack = /obj/item/weapon/storage/backpack/genetics
satchel = /obj/item/weapon/storage/backpack/satchel/gen
duffelbag = /obj/item/weapon/storage/backpack/duffelbag/med
backpack = /obj/item/storage/backpack/genetics
satchel = /obj/item/storage/backpack/satchel/gen
duffelbag = /obj/item/storage/backpack/duffelbag/med
/*
Virologist
@@ -185,6 +185,6 @@ Virologist
suit = /obj/item/clothing/suit/toggle/labcoat/virologist
suit_store = /obj/item/device/flashlight/pen
backpack = /obj/item/weapon/storage/backpack/virology
satchel = /obj/item/weapon/storage/backpack/satchel/vir
duffelbag = /obj/item/weapon/storage/backpack/duffelbag/med
backpack = /obj/item/storage/backpack/virology
satchel = /obj/item/storage/backpack/satchel/vir
duffelbag = /obj/item/storage/backpack/duffelbag/med
code/modules/jobs/job_types/science.dm
+11 -11
View File
@@ -35,19 +35,19 @@ Research Director
name = "Research Director"
jobtype = /datum/job/rd
id = /obj/item/weapon/card/id/silver
id = /obj/item/card/id/silver
belt = /obj/item/device/pda/heads/rd
ears = /obj/item/device/radio/headset/heads/rd
uniform = /obj/item/clothing/under/rank/research_director
shoes = /obj/item/clothing/shoes/sneakers/brown
suit = /obj/item/clothing/suit/toggle/labcoat
l_hand = /obj/item/weapon/clipboard
l_hand = /obj/item/clipboard
l_pocket = /obj/item/device/laser_pointer
accessory = /obj/item/clothing/accessory/pocketprotector/full
backpack_contents = list(/obj/item/weapon/melee/classic_baton/telescopic=1, /obj/item/device/modular_computer/tablet/preset/advanced=1)
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/device/modular_computer/tablet/preset/advanced=1)
backpack = /obj/item/weapon/storage/backpack/science
satchel = /obj/item/weapon/storage/backpack/satchel/tox
backpack = /obj/item/storage/backpack/science
satchel = /obj/item/storage/backpack/satchel/tox
/datum/outfit/job/rd/rig
name = "Research Director (Hardsuit)"
@@ -55,7 +55,7 @@ Research Director
l_hand = null
mask = /obj/item/clothing/mask/breath
suit = /obj/item/clothing/suit/space/hardsuit/rd
suit_store = /obj/item/weapon/tank/internals/oxygen
suit_store = /obj/item/tank/internals/oxygen
internals_slot = slot_s_store
/*
@@ -89,8 +89,8 @@ Scientist
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat/science
backpack = /obj/item/weapon/storage/backpack/science
satchel = /obj/item/weapon/storage/backpack/satchel/tox
backpack = /obj/item/storage/backpack/science
satchel = /obj/item/storage/backpack/satchel/tox
accessory = /obj/item/clothing/accessory/pocketprotector/full
/*
@@ -118,13 +118,13 @@ Roboticist
name = "Roboticist"
jobtype = /datum/job/roboticist
belt = /obj/item/weapon/storage/belt/utility/full
belt = /obj/item/storage/belt/utility/full
l_pocket = /obj/item/device/pda/roboticist
ears = /obj/item/device/radio/headset/headset_sci
uniform = /obj/item/clothing/under/rank/roboticist
suit = /obj/item/clothing/suit/toggle/labcoat
backpack = /obj/item/weapon/storage/backpack/science
satchel = /obj/item/weapon/storage/backpack/satchel/tox
backpack = /obj/item/storage/backpack/science
satchel = /obj/item/storage/backpack/satchel/tox
pda_slot = slot_l_store
code/modules/jobs/job_types/security.dm
+30 -30
View File
@@ -39,7 +39,7 @@ Head of Security
name = "Head of Security"
jobtype = /datum/job/hos
id = /obj/item/weapon/card/id/silver
id = /obj/item/card/id/silver
belt = /obj/item/device/pda/heads/hos
ears = /obj/item/device/radio/headset/heads/hos/alt
uniform = /obj/item/clothing/under/rank/head_of_security
@@ -48,17 +48,17 @@ Head of Security
gloves = /obj/item/clothing/gloves/color/black/hos
head = /obj/item/clothing/head/HoS/beret
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
suit_store = /obj/item/weapon/gun/energy/e_gun
suit_store = /obj/item/gun/energy/e_gun
r_pocket = /obj/item/device/assembly/flash/handheld
l_pocket = /obj/item/weapon/restraints/handcuffs
backpack_contents = list(/obj/item/weapon/melee/baton/loaded=1)
l_pocket = /obj/item/restraints/handcuffs
backpack_contents = list(/obj/item/melee/baton/loaded=1)
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel/sec
duffelbag = /obj/item/weapon/storage/backpack/duffelbag/sec
box = /obj/item/weapon/storage/box/security
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
duffelbag = /obj/item/storage/backpack/duffelbag/sec
box = /obj/item/storage/box/security
implants = list(/obj/item/weapon/implant/mindshield)
implants = list(/obj/item/implant/mindshield)
/*
Warden
@@ -100,16 +100,16 @@ Warden
head = /obj/item/clothing/head/warden
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
r_pocket = /obj/item/device/assembly/flash/handheld
l_pocket = /obj/item/weapon/restraints/handcuffs
suit_store = /obj/item/weapon/gun/energy/e_gun/advtaser
backpack_contents = list(/obj/item/weapon/melee/baton/loaded=1)
l_pocket = /obj/item/restraints/handcuffs
suit_store = /obj/item/gun/energy/e_gun/advtaser
backpack_contents = list(/obj/item/melee/baton/loaded=1)
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel/sec
duffelbag = /obj/item/weapon/storage/backpack/duffelbag/sec
box = /obj/item/weapon/storage/box/security
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
duffelbag = /obj/item/storage/backpack/duffelbag/sec
box = /obj/item/storage/box/security
implants = list(/obj/item/weapon/implant/mindshield)
implants = list(/obj/item/implant/mindshield)
/*
@@ -146,13 +146,13 @@ Detective
gloves = /obj/item/clothing/gloves/color/black
head = /obj/item/clothing/head/fedora/det_hat
l_pocket = /obj/item/toy/crayon/white
r_pocket = /obj/item/weapon/lighter
backpack_contents = list(/obj/item/weapon/storage/box/evidence=1,\
r_pocket = /obj/item/lighter
backpack_contents = list(/obj/item/storage/box/evidence=1,\
/obj/item/device/detective_scanner=1,\
/obj/item/weapon/melee/classic_baton=1)
/obj/item/melee/classic_baton=1)
mask = /obj/item/clothing/mask/cigarette
implants = list(/obj/item/weapon/implant/mindshield)
implants = list(/obj/item/implant/mindshield)
/datum/outfit/job/detective/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -242,7 +242,7 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
qdel(H.ears)
H.equip_to_slot_or_del(new ears(H),slot_ears)
var/obj/item/weapon/card/id/W = H.wear_id
var/obj/item/card/id/W = H.wear_id
W.access |= dep_access
var/teleport = 0
@@ -281,17 +281,17 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
head = /obj/item/clothing/head/helmet/sec
suit = /obj/item/clothing/suit/armor/vest/alt
shoes = /obj/item/clothing/shoes/jackboots
l_pocket = /obj/item/weapon/restraints/handcuffs
l_pocket = /obj/item/restraints/handcuffs
r_pocket = /obj/item/device/assembly/flash/handheld
suit_store = /obj/item/weapon/gun/energy/e_gun/advtaser
backpack_contents = list(/obj/item/weapon/melee/baton/loaded=1)
suit_store = /obj/item/gun/energy/e_gun/advtaser
backpack_contents = list(/obj/item/melee/baton/loaded=1)
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel/sec
duffelbag = /obj/item/weapon/storage/backpack/duffelbag/sec
box = /obj/item/weapon/storage/box/security
backpack = /obj/item/storage/backpack/security
satchel = /obj/item/storage/backpack/satchel/sec
duffelbag = /obj/item/storage/backpack/duffelbag/sec
box = /obj/item/storage/box/security
implants = list(/obj/item/weapon/implant/mindshield)
implants = list(/obj/item/implant/mindshield)
/obj/item/device/radio/headset/headset_sec/alt/department/Initialize()