cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 03:56:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6133 from Heroman3003/cart-tweek

Browse Source 
Minor PDA cartridge tweaks
This commit is contained in:
Atermonera
2019-05-01 10:07:25 -08:00
committed by VirgoBot
parent e4367a8e31
commit 8e724ad32c
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/outfits/jobs/command.dm
+1 -1
View File
@@ -36,7 +36,7 @@
l_ear = /obj/item/device/radio/headset/headset_com
shoes = /obj/item/clothing/shoes/brown
id_type = /obj/item/weapon/card/id/silver/secretary
pda_type = /obj/item/device/pda/heads/hop
pda_type = /obj/item/device/pda/heads
r_hand = /obj/item/weapon/clipboard
/decl/hierarchy/outfit/job/secretary/pre_equip(mob/living/carbon/human/H)
code/game/objects/items/devices/PDA/cart.dm
+8 -7
View File
@@ -4,6 +4,7 @@ var/list/command_cartridges = list(
/obj/item/weapon/cartridge/hos,
/obj/item/weapon/cartridge/ce,
/obj/item/weapon/cartridge/rd,
/obj/item/weapon/cartridge/cmo,
/obj/item/weapon/cartridge/head,
/obj/item/weapon/cartridge/lawyer // Internal Affaris,
)
@@ -149,7 +150,7 @@ var/list/civilian_cartridges = list(
*/
/obj/item/weapon/cartridge/service
name = "\improper Serv-U Pro"
name = "\improper Serv-U Pro cartridge"
desc = "A data cartridge designed to serve YOU!"
/obj/item/weapon/cartridge/signal
@@ -175,12 +176,12 @@ var/list/civilian_cartridges = list(
access_quartermaster = 1
/obj/item/weapon/cartridge/miner
name = "\improper Drill-Jockey 4.5"
name = "\improper Drill-Jockey 4.5 cartridge"
desc = "It's covered in some sort of sand."
icon_state = "cart-q"
/obj/item/weapon/cartridge/head
name = "\improper Easy-Record DELUXE"
name = "\improper Easy-Record DELUXE cartridge"
icon_state = "cart-h"
access_status_display = 1
@@ -193,7 +194,7 @@ var/list/civilian_cartridges = list(
access_security = 1
/obj/item/weapon/cartridge/hos
name = "\improper R.O.B.U.S.T. DELUXE"
name = "\improper R.O.B.U.S.T. DELUXE cartridge"
icon_state = "cart-hos"
access_status_display = 1
access_security = 1
@@ -203,21 +204,21 @@ var/list/civilian_cartridges = list(
. = ..()
/obj/item/weapon/cartridge/ce
name = "\improper Power-On DELUXE"
name = "\improper Power-On DELUXE cartridge"
icon_state = "cart-ce"
access_status_display = 1
access_engine = 1
access_atmos = 1
/obj/item/weapon/cartridge/cmo
name = "\improper Med-U DELUXE"
name = "\improper Med-U DELUXE cartridge"
icon_state = "cart-cmo"
access_status_display = 1
access_reagent_scanner = 1
access_medical = 1
/obj/item/weapon/cartridge/rd
name = "\improper Signal Ace DELUXE"
name = "\improper Signal Ace DELUXE cartridge"
icon_state = "cart-rd"
access_status_display = 1
access_reagent_scanner = 1
code/modules/research/designs/pdas.dm
+11 -6
View File
@@ -61,32 +61,37 @@
build_path = /obj/item/weapon/cartridge/quartermaster
sort_string = "VBAAI"
/datum/design/item/pda_cartridge/head
id = "cart_head"
build_path = /obj/item/weapon/cartridge/head
sort_string = "VBAAJ"
/datum/design/item/pda_cartridge/hop
id = "cart_hop"
build_path = /obj/item/weapon/cartridge/hop
sort_string = "VBAAJ"
sort_string = "VBAAK"
/datum/design/item/pda_cartridge/hos
id = "cart_hos"
build_path = /obj/item/weapon/cartridge/hos
sort_string = "VBAAK"
sort_string = "VBAAL"
/datum/design/item/pda_cartridge/ce
id = "cart_ce"
build_path = /obj/item/weapon/cartridge/ce
sort_string = "VBAAL"
sort_string = "VBAAM"
/datum/design/item/pda_cartridge/cmo
id = "cart_cmo"
build_path = /obj/item/weapon/cartridge/cmo
sort_string = "VBAAM"
sort_string = "VBAAN"
/datum/design/item/pda_cartridge/rd
id = "cart_rd"
build_path = /obj/item/weapon/cartridge/rd
sort_string = "VBAAN"
sort_string = "VBAAO"
/datum/design/item/pda_cartridge/captain
id = "cart_captain"
build_path = /obj/item/weapon/cartridge/captain
sort_string = "VBAAO"
sort_string = "VBAAP"