cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

New job -- Customs Officer

Browse Source
This commit is contained in:
ZomgPonies
2013-10-31 14:48:30 -04:00
parent 6bf566b84d
commit f71b6af899
12 changed files with 10670 additions and 10668 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/access.dm
+9 -2
View File
@@ -67,6 +67,7 @@
/var/const/access_xenoarch = 65
/var/const/access_paramedic = 66
/var/const/access_blueshield = 67
/var/const/access_customs = 68
//BEGIN CENTCOM ACCESS
/*Should leave plenty of room if we need to add more access levels.
@@ -212,7 +213,7 @@
access_hydroponics, access_library, access_lawyer, access_virology, access_psychiatrist, access_cmo, access_qm, access_clown, access_mime, access_surgery,
access_theatre, access_research, access_mining, access_mailsorting,
access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce,
access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_paramedic, access_blueshield)
access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_paramedic, access_blueshield, access_customs)
/proc/get_all_centcom_access()
return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_medical, access_cent_living, access_cent_storage, access_cent_teleporter, access_cent_creed, access_cent_captain)
@@ -233,7 +234,7 @@
if(4) //engineering and maintenance
return list(access_construction, access_maint_tunnels, access_engine, access_engine_equip, access_external_airlocks, access_tech_storage, access_atmospherics, access_ce)
if(5) //command
return list(access_heads, access_RC_announce, access_keycard_auth, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_tcomsat, access_gateway, access_all_personal_lockers, access_heads_vault, access_hop, access_captain, access_blueshield)
return list(access_heads, access_RC_announce, access_keycard_auth, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_tcomsat, access_gateway, access_all_personal_lockers, access_heads_vault, access_hop, access_captain, access_blueshield, access_customs)
if(6) //station general
return list(access_kitchen,access_bar, access_hydroponics, access_janitor, access_chapel_office, access_crematorium, access_library, access_theatre, access_lawyer, access_clown, access_mime)
if(7) //supply
@@ -391,6 +392,12 @@
return "Gateway"
if(access_sec_doors)
return "Brig"
if(access_blueshield)
return "Blueshield"
if(access_paramedic)
return "Paramedic"
if(access_customs)
return "Customs"
/proc/get_centcom_access_desc(A)
switch(A)
code/game/jobs/job/captain.dm
+1 -1
View File
@@ -68,7 +68,7 @@
access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway)
access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_customs)
equip(var/mob/living/carbon/human/H)
code/game/jobs/job/security.dm
+32 -1
View File
@@ -16,7 +16,7 @@
minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court,
access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting,
access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway)
access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_customs)
minimal_player_age = 14
equip(var/mob/living/carbon/human/H)
@@ -166,3 +166,34 @@
H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_in_backpack)
return 1
/datum/job/customs
title = "Customs Officer"
flag = CUSTOMS
department_flag = ENGSEC
faction = "Station"
total_positions = 1
spawn_positions = 1
supervisors = "the head of security"
selection_color = "#ffeeee"
access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue)
minimal_access = list(access_security, access_customs, access_maint_tunnels)
minimal_player_age = 7
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear)
switch(H.backbag)
if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(H), slot_back)
if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_sec(H), slot_back)
if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/clothing/under/fluff/milo_hachert(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/customs(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/device/pda/security(H), slot_belt)
H.equip_to_slot_or_del(new /obj/item/weapon/handcuffs(H), slot_s_store)
H.equip_to_slot_or_del(new /obj/item/device/flash(H), slot_l_store)
H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
H.equip_to_slot_or_del(new /obj/item/weapon/stamp(H), slot_in_backpack)
H.equip_to_slot_or_del(new /obj/item/weapon/stamp/denied(H), slot_in_backpack)
return 1
code/game/jobs/jobs.dm
+5 -2
View File
@@ -46,6 +46,7 @@ var/const/MIME =(1<<12)
var/const/ASSISTANT =(1<<13)
var/const/NANO =(1<<14)
var/const/BLUESHIELD =(1<<15)
var/const/CUSTOMS =(1<<16)
var/list/assistant_occupations = list(
@@ -113,7 +114,8 @@ var/list/security_positions = list(
"Head of Security",
"Warden",
"Detective",
"Security Officer"
"Security Officer",
"Customs Officer"
)
@@ -124,7 +126,8 @@ var/list/nonhuman_positions = list(
)
var/list/whitelisted_positions = list(
"Blueshield"
"Blueshield",
"Customs Officer"
)
/proc/guest_jobbans(var/job)
code/modules/clothing/head/helmet.dm
+7
View File
@@ -31,6 +31,13 @@
icon_state = "policehelm"
flags_inv = 0
/obj/item/clothing/head/helmet/customs
name = "customs officer's hat"
desc = "A serious looking hat for a serious job."
icon_state = "customshelm"
item_state = "customshelm"
flags_inv = 0
/obj/item/clothing/head/helmet/riot
name = "riot helmet"
desc = "It's a helmet specifically designed to protect against close range attacks."
code/modules/customitems/item_defines.dm
+2 -2
View File
@@ -648,8 +648,8 @@
//////////// Uniforms ////////////
/obj/item/clothing/under/fluff/milo_hachert //Field Dress Uniform - Milo Hachert - Commissar_Drew
name = "field dress uniform"
desc = "A uniform jacket, its buttons polished to a shine, coupled with a dark pair of trousers. 'Hachert' is embroidered upon the jacket’s shoulder bar."
name = "customs uniform"
desc = "A uniform jacket, its buttons polished to a shine, coupled with a dark pair of trousers. 'Customs' is embroidered upon the jacket’s shoulder bar."
icon = 'icons/obj/custom_items.dmi'
icon_state = "milohachert"
item_state = "milohachert"
code/modules/mob/mob.dm
-30
View File
@@ -384,36 +384,6 @@ var/list/slot_equipment_priority = list( \
// M.Login() //wat
return
/client/verb/changes()
set name = "Changelog"
set category = "OOC"
getFiles(
'html/postcardsmall.jpg',
'html/somerights20.png',
'html/88x31.png',
'html/bug-minus.png',
'html/cross-circle.png',
'html/hard-hat-exclamation.png',
'html/image-minus.png',
'html/image-plus.png',
'html/music-minus.png',
'html/music-plus.png',
'html/tick-circle.png',
'html/wrench-screwdriver.png',
'html/spell-check.png',
'html/burn-exclamation.png',
'html/chevron.png',
'html/chevron-expand.png',
'html/changelog.css',
'html/changelog.js',
'html/changelog.html'
)
src << browse('html/changelog.html', "window=changes;size=675x650")
if(prefs.lastchangelog != changelog_hash)
prefs.lastchangelog = changelog_hash
prefs.save_preferences()
winset(src, "rpane.changelog", "background-color=none;font-style=;")
/mob/verb/observe()
set name = "Observe"
set category = "OOC"