cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16327 from TheCaramelion/weapon-removal

Browse Source 
Removes /obj/item/weapon and /obj/item/device
This commit is contained in:
Heroman3003
2024-09-29 18:39:34 +10:00
committed by GitHub
parent f88820729f ab79537e6f
commit 55942407f2
2381 changed files with 61026 additions and 61006 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/atmospherics.dm
+1 -1
View File
@@ -82,7 +82,7 @@ Pipelines + Other Objects -> Pipe network
return (src.connect_types & target.connect_types)
/obj/machinery/atmospherics/attackby(atom/A, mob/user as mob)
if(istype(A, /obj/item/device/pipe_painter))
if(istype(A, /obj/item/pipe_painter))
return
..()
code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm
+6 -6
View File
@@ -5,7 +5,7 @@
desc = "An oxygen generator using algae to convert carbon dioxide to oxygen."
icon = 'icons/obj/machines/algae_vr.dmi'
icon_state = "algae-off"
circuit = /obj/item/weapon/circuitboard/algae_farm
circuit = /obj/item/circuitboard/algae_farm
anchored = TRUE
density = TRUE
power_channel = EQUIP
@@ -123,7 +123,7 @@
icon_state = "algae-on"
return 1
/obj/machinery/atmospherics/binary/algae_farm/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/machinery/atmospherics/binary/algae_farm/attackby(obj/item/W as obj, mob/user as mob)
add_fingerprint(user)
if(default_deconstruction_screwdriver(user, W))
return
@@ -149,12 +149,12 @@
var/bin_rating = 0
var/manip_rating = 0
for(var/obj/item/weapon/stock_parts/P in component_parts)
if(istype(P, /obj/item/weapon/stock_parts/capacitor))
for(var/obj/item/stock_parts/P in component_parts)
if(istype(P, /obj/item/stock_parts/capacitor))
cap_rating += P.rating
if(istype(P, /obj/item/weapon/stock_parts/matter_bin))
if(istype(P, /obj/item/stock_parts/matter_bin))
bin_rating += P.rating
if(istype(P, /obj/item/weapon/stock_parts/manipulator))
if(istype(P, /obj/item/stock_parts/manipulator))
manip_rating += P.rating
power_per_mole = round(initial(power_per_mole) / cap_rating)
code/ATMOSPHERICS/components/binary_devices/circulator.dm
+1 -1
View File
@@ -91,7 +91,7 @@
return 1
/obj/machinery/atmospherics/binary/circulator/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/machinery/atmospherics/binary/circulator/attackby(obj/item/W as obj, mob/user as mob)
if(W.has_tool_quality(TOOL_WRENCH))
playsound(src, W.usesound, 75, 1)
anchored = !anchored
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+1 -1
View File
@@ -278,7 +278,7 @@
update_icon()
add_fingerprint(usr)
/obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/W as obj, var/mob/user as mob)
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if (unlocked)
code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm
+2 -2
View File
@@ -81,7 +81,7 @@
if (kin_energy > 1000000)
add_overlay(image('icons/obj/pipeturbine.dmi', "hi-turb"))
/obj/machinery/atmospherics/pipeturbine/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/machinery/atmospherics/pipeturbine/attackby(obj/item/W as obj, mob/user as mob)
if(W.has_tool_quality(TOOL_WRENCH))
anchored = !anchored
playsound(src, W.usesound, 50, 1)
@@ -255,7 +255,7 @@
turbine.kin_energy -= power_generated
add_avail(power_generated)
/obj/machinery/power/turbinemotor/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/machinery/power/turbinemotor/attackby(obj/item/W as obj, mob/user as mob)
if(W.has_tool_quality(TOOL_WRENCH))
anchored = !anchored
playsound(src, W.usesound, 50, 1)
code/ATMOSPHERICS/components/binary_devices/pump.dm
+1 -1
View File
@@ -238,7 +238,7 @@ Thus, the two variables affect pump operation are set in New():
if(old_stat != stat)
update_icon()
/obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/W as obj, var/mob/user as mob)
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if (!(stat & NOPOWER) && use_power)
code/ATMOSPHERICS/components/omni_devices/omni_base.dm
+1 -1
View File
@@ -79,7 +79,7 @@
if(old_stat != stat)
update_icon()
/obj/machinery/atmospherics/omni/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/machinery/atmospherics/omni/attackby(var/obj/item/W as obj, var/mob/user as mob)
if(!W.has_tool_quality(TOOL_WRENCH))
return ..()
code/ATMOSPHERICS/components/portables_connector.dm
+1 -1
View File
@@ -146,7 +146,7 @@
return null
/obj/machinery/atmospherics/portables_connector/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/machinery/atmospherics/portables_connector/attackby(var/obj/item/W as obj, var/mob/user as mob)
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if (connected_device)
code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
+1 -1
View File
@@ -51,7 +51,7 @@
if(old_stat != stat)
update_icon()
/obj/machinery/atmospherics/trinary/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/machinery/atmospherics/trinary/attackby(var/obj/item/W as obj, var/mob/user as mob)
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if(!can_unwrench())
code/ATMOSPHERICS/components/tvalve.dm
+1 -1
View File
@@ -326,7 +326,7 @@
else
go_to_side()
/obj/machinery/atmospherics/tvalve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/machinery/atmospherics/tvalve/attackby(var/obj/item/W as obj, var/mob/user as mob)
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if(!can_unwrench())
code/ATMOSPHERICS/components/unary/cold_sink.dm
+5 -5
View File
@@ -10,7 +10,7 @@
anchored = TRUE
use_power = USE_POWER_OFF
idle_power_usage = 5 // 5 Watts for thermostat related circuitry
circuit = /obj/item/weapon/circuitboard/unary_atmos/cooler
circuit = /obj/item/circuitboard/unary_atmos/cooler
var/heatsink_temperature = T20C // The constant temperature reservoir into which the freezer pumps heat. Probably the hull of the station or something.
var/internal_volume = 600 // L
@@ -142,12 +142,12 @@
var/manip_rating = 0
var/bin_rating = 0
for(var/obj/item/weapon/stock_parts/P in component_parts)
if(istype(P, /obj/item/weapon/stock_parts/capacitor))
for(var/obj/item/stock_parts/P in component_parts)
if(istype(P, /obj/item/stock_parts/capacitor))
cap_rating += P.rating
if(istype(P, /obj/item/weapon/stock_parts/manipulator))
if(istype(P, /obj/item/stock_parts/manipulator))
manip_rating += P.rating
if(istype(P, /obj/item/weapon/stock_parts/matter_bin))
if(istype(P, /obj/item/stock_parts/matter_bin))
bin_rating += P.rating
max_power_rating = initial(max_power_rating) * cap_rating / 2 //more powerful
code/ATMOSPHERICS/components/unary/heat_exchanger.dm
+1 -1
View File
@@ -66,7 +66,7 @@
return 1
/obj/machinery/atmospherics/unary/heat_exchanger/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/machinery/atmospherics/unary/heat_exchanger/attackby(var/obj/item/W as obj, var/mob/user as mob)
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
var/turf/T = src.loc
code/ATMOSPHERICS/components/unary/heat_source.dm
+4 -4
View File
@@ -10,7 +10,7 @@
anchored = TRUE
use_power = USE_POWER_OFF
idle_power_usage = 5 //5 Watts for thermostat related circuitry
circuit = /obj/item/weapon/circuitboard/unary_atmos/heater
circuit = /obj/item/circuitboard/unary_atmos/heater
var/max_temperature = T20C + 680
var/internal_volume = 600 //L
@@ -131,10 +131,10 @@
var/cap_rating = 0
var/bin_rating = 0
for(var/obj/item/weapon/stock_parts/P in component_parts)
if(istype(P, /obj/item/weapon/stock_parts/capacitor))
for(var/obj/item/stock_parts/P in component_parts)
if(istype(P, /obj/item/stock_parts/capacitor))
cap_rating += P.rating
if(istype(P, /obj/item/weapon/stock_parts/matter_bin))
if(istype(P, /obj/item/stock_parts/matter_bin))
bin_rating += P.rating
max_power_rating = initial(max_power_rating) * cap_rating / 2
code/ATMOSPHERICS/components/unary/outlet_injector.dm
+1 -1
View File
@@ -163,7 +163,7 @@
update_use_power(injecting ? USE_POWER_IDLE : USE_POWER_OFF)
update_icon()
/obj/machinery/atmospherics/unary/outlet_injector/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/machinery/atmospherics/unary/outlet_injector/attackby(var/obj/item/W as obj, var/mob/user as mob)
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
code/ATMOSPHERICS/components/unary/vent_pump.dm
+2 -2
View File
@@ -391,7 +391,7 @@
/obj/machinery/atmospherics/unary/vent_pump/attackby(obj/item/W, mob/user)
if(W.has_tool_quality(TOOL_WELDER))
var/obj/item/weapon/weldingtool/WT = W.get_welder()
var/obj/item/weldingtool/WT = W.get_welder()
if (WT.remove_fuel(0,user))
to_chat(user, "<span class='notice'>Now welding the vent.</span>")
if(do_after(user, 20 * WT.toolspeed))
@@ -428,7 +428,7 @@
if(old_stat != stat)
update_icon()
/obj/machinery/atmospherics/unary/vent_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/machinery/atmospherics/unary/vent_pump/attackby(var/obj/item/W as obj, var/mob/user as mob)
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if (!(stat & NOPOWER) && use_power)
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+1 -1
View File
@@ -269,7 +269,7 @@
if(old_stat != stat)
update_icon()
/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/W as obj, var/mob/user as mob)
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if (!(stat & NOPOWER) && use_power)
code/ATMOSPHERICS/components/valve.dm
+1 -1
View File
@@ -287,7 +287,7 @@
else
open()
/obj/machinery/atmospherics/valve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/machinery/atmospherics/valve/attackby(var/obj/item/W as obj, var/mob/user as mob)
if (!W.has_tool_quality(TOOL_WRENCH))
return ..()
if (istype(src, /obj/machinery/atmospherics/valve/digital) && !src.allowed(user))
code/ATMOSPHERICS/pipes/pipe_base.dm
+2 -2
View File
@@ -109,11 +109,11 @@
qdel(meter)
. = ..()
/obj/machinery/atmospherics/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/machinery/atmospherics/pipe/attackby(var/obj/item/W as obj, var/mob/user as mob)
if (istype(src, /obj/machinery/atmospherics/pipe/tank))
return ..()
if(istype(W,/obj/item/device/pipe_painter))
if(istype(W,/obj/item/pipe_painter))
return 0
if (!W.has_tool_quality(TOOL_WRENCH))
code/ATMOSPHERICS/pipes/tank.dm
+1 -1
View File
@@ -67,7 +67,7 @@
return null
/obj/machinery/atmospherics/pipe/tank/attackby(var/obj/item/W as obj, var/mob/user as mob)
if(istype(W, /obj/item/device/pipe_painter))
if(istype(W, /obj/item/pipe_painter))
return
/obj/machinery/atmospherics/pipe/tank/air
code/ZAS/Phoron.dm
+2 -2
View File
@@ -45,7 +45,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
//Clothing and backpacks can be contaminated.
if(flags & PHORONGUARD)
return 0
else if(istype(src,/obj/item/weapon/storage/backpack))
else if(istype(src,/obj/item/storage/backpack))
return 0 //Cannot be washed :(
//VOREStation Addition start
else if(isbelly(loc))
@@ -82,7 +82,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
suit_contamination() //Phoron can sometimes get through such an open suit.
//Cannot wash backpacks currently.
// if(istype(back,/obj/item/weapon/storage/backpack))
// if(istype(back,/obj/item/storage/backpack))
// back.contaminate()
/mob/proc/pl_effects()
code/__defines/is_helpers.dm
+2 -2
View File
@@ -13,13 +13,13 @@
#define isitem(D) istype(D, /obj/item)
#define isradio(A) istype(A, /obj/item/device/radio)
#define isradio(A) istype(A, /obj/item/radio)
#define isairlock(A) istype(A, /obj/machinery/door/airlock)
#define isorgan(A) istype(A, /obj/item/organ/external)
#define isstorage(A) istype(A, /obj/item/weapon/storage)
#define isstorage(A) istype(A, /obj/item/storage)
#define ismecha(A) istype(A, /obj/mecha)
code/__defines/machinery.dm
+10 -10
View File
@@ -172,15 +172,15 @@ if (!(DATUM.datum_flags & DF_ISPROCESSING)) {\
#define LOGIN_TYPE_ROBOT 3
// Computer Hardware
#define PART_CPU /obj/item/weapon/computer_hardware/processor_unit // CPU. Without it the computer won't run. Better CPUs can run more programs at once.
#define PART_NETWORK /obj/item/weapon/computer_hardware/network_card // Network Card component of this computer. Allows connection to NTNet
#define PART_HDD /obj/item/weapon/computer_hardware/hard_drive // Hard Drive component of this computer. Stores programs and files.
#define PART_CPU /obj/item/computer_hardware/processor_unit // CPU. Without it the computer won't run. Better CPUs can run more programs at once.
#define PART_NETWORK /obj/item/computer_hardware/network_card // Network Card component of this computer. Allows connection to NTNet
#define PART_HDD /obj/item/computer_hardware/hard_drive // Hard Drive component of this computer. Stores programs and files.
// Optional hardware (improves functionality, but is not critical for computer to work in most cases)
#define PART_BATTERY /obj/item/weapon/computer_hardware/battery_module // An internal power source for this computer. Can be recharged.
#define PART_CARD /obj/item/weapon/computer_hardware/card_slot // ID Card slot component of this computer. Mostly for HoP modification console that needs ID slot for modification.
#define PART_PRINTER /obj/item/weapon/computer_hardware/nano_printer // Nano Printer component of this computer, for your everyday paperwork needs.
//#define PART_DRIVE /obj/item/weapon/computer_hardware/hard_drive/portable // Portable data storage
//#define PART_AI /obj/item/weapon/computer_hardware/ai_slot // AI slot, an intellicard housing that allows modifications of AIs.
#define PART_TESLA /obj/item/weapon/computer_hardware/tesla_link // Tesla Link, Allows remote charging from nearest APC.
//#define PART_SCANNER /obj/item/weapon/computer_hardware/scanner // One of several optional scanner attachments.
#define PART_BATTERY /obj/item/computer_hardware/battery_module // An internal power source for this computer. Can be recharged.
#define PART_CARD /obj/item/computer_hardware/card_slot // ID Card slot component of this computer. Mostly for HoP modification console that needs ID slot for modification.
#define PART_PRINTER /obj/item/computer_hardware/nano_printer // Nano Printer component of this computer, for your everyday paperwork needs.
//#define PART_DRIVE /obj/item/computer_hardware/hard_drive/portable // Portable data storage
//#define PART_AI /obj/item/computer_hardware/ai_slot // AI slot, an intellicard housing that allows modifications of AIs.
#define PART_TESLA /obj/item/computer_hardware/tesla_link // Tesla Link, Allows remote charging from nearest APC.
//#define PART_SCANNER /obj/item/computer_hardware/scanner // One of several optional scanner attachments.
code/__defines/plants.dm
+9 -9
View File
@@ -88,21 +88,21 @@ GLOBAL_LIST_INIT(plant_item_products, list(
/obj/item/stack/material/wax = 20,
/obj/item/stack/material/log = 30,
/obj/item/stack/material/resin = 10,
/obj/item/weapon/material/shard/shrapnel = 2,
/obj/item/weapon/ore = 5,
/obj/item/weapon/ore/iron = 2,
/obj/item/weapon/ore/coal = 2,
/obj/item/weapon/reagent_containers/food/snacks/meat = 3,
/obj/item/material/shard/shrapnel = 2,
/obj/item/ore = 5,
/obj/item/ore/iron = 2,
/obj/item/ore/coal = 2,
/obj/item/reagent_containers/food/snacks/meat = 3,
/obj/random/meat = 1,
/obj/item/weapon/reagent_containers/food/drinks/smallchocmilk = 2,
/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 2,
/obj/item/reagent_containers/food/drinks/smallchocmilk = 2,
/obj/item/reagent_containers/food/drinks/smallmilk = 2,
/obj/item/ammo_casing/a145 = 1,
/obj/item/ammo_casing/chemdart/small = 1,
/obj/item/ammo_casing/chemdart = 1,
/obj/item/organ/internal/brain/grey = 1,
/obj/item/organ/internal/heart/grey = 1,
/obj/item/weapon/spacecash/c1 = 3,
/obj/item/weapon/spacecash/c5 = 1
/obj/item/spacecash/c1 = 3,
/obj/item/spacecash/c5 = 1
))
GLOBAL_LIST_INIT(forbidden_plant_growth_sprites, list(
code/_helpers/atmospherics.dm
+2 -2
View File
@@ -35,7 +35,7 @@
/atom/proc/atmosanalyze(var/mob/user)
return
/obj/item/weapon/tank/atmosanalyze(var/mob/user)
/obj/item/tank/atmosanalyze(var/mob/user)
return atmosanalyzer_scan(src, src.air_contents, user)
/obj/machinery/portable_atmospherics/atmosanalyze(var/mob/user)
@@ -74,5 +74,5 @@
/obj/machinery/power/rad_collector/atmosanalyze(var/mob/user)
if(P) return atmosanalyzer_scan(src, src.P.air_contents, user)
/obj/item/weapon/flamethrower/atmosanalyze(var/mob/user)
/obj/item/flamethrower/atmosanalyze(var/mob/user)
if(ptank) return atmosanalyzer_scan(src, ptank.air_contents, user)
code/_helpers/game.dm
+3 -3
View File
@@ -219,14 +219,14 @@
return hear
/proc/get_mobs_in_radio_ranges(var/list/obj/item/device/radio/radios)
/proc/get_mobs_in_radio_ranges(var/list/obj/item/radio/radios)
set background = 1
. = list()
// Returns a list of mobs who can hear any of the radios given in @radios
var/list/speaker_coverage = list()
for(var/obj/item/device/radio/R as anything in radios)
for(var/obj/item/radio/R as anything in radios)
var/turf/speaker = get_turf(R)
if(speaker)
for(var/turf/T in hear(R.canhear_range,speaker))
@@ -248,7 +248,7 @@
/mob/living/silicon/robot/can_hear_radio(var/list/hearturfs)
var/turf/T = get_turf(src)
var/obj/item/device/radio/borg/R = hearturfs[T] // this should be an assoc list of turf-to-radio
var/obj/item/radio/borg/R = hearturfs[T] // this should be an assoc list of turf-to-radio
// We heard it on our own radio? We use power for that.
if(istype(R) && R.myborg == src)
code/_helpers/global_lists_vr.dm
+79 -79
View File
@@ -42,14 +42,14 @@ var/global/list/vantag_choices_list = list(
//Blacklist to exclude items from object ingestion. Digestion blacklist located in digest_act_vr.dm
var/global/list/item_vore_blacklist = list(
/obj/item/weapon/hand_tele,
/obj/item/weapon/card/id/gold/captain/spare,
/obj/item/weapon/gun,
/obj/item/weapon/pinpointer,
/obj/item/hand_tele,
/obj/item/card/id/gold/captain/spare,
/obj/item/gun,
/obj/item/pinpointer,
/obj/item/clothing/shoes/magboots,
/obj/item/areaeditor/blueprints,
/obj/item/clothing/head/helmet/space,
/obj/item/weapon/disk/nuclear,
/obj/item/disk/nuclear,
/obj/item/clothing/suit/storage/hooded/wintercoat/roiz)
//Classic Vore sounds
@@ -154,94 +154,94 @@ var/global/list/global_vore_egg_types = list(
"Spotted Pink")
var/global/list/tf_vore_egg_types = list(
"Unathi" = /obj/item/weapon/storage/vore_egg/unathi,
"Tajara" = /obj/item/weapon/storage/vore_egg/tajaran,
"Akula" = /obj/item/weapon/storage/vore_egg/shark,
"Skrell" = /obj/item/weapon/storage/vore_egg/skrell,
"Sergal" = /obj/item/weapon/storage/vore_egg/sergal,
"Nevrean" = /obj/item/weapon/storage/vore_egg/nevrean,
"Human" = /obj/item/weapon/storage/vore_egg/human,
"Slime" = /obj/item/weapon/storage/vore_egg/slime,
"Egg" = /obj/item/weapon/storage/vore_egg,
"Xenochimera" = /obj/item/weapon/storage/vore_egg/scree,
"Xenomorph" = /obj/item/weapon/storage/vore_egg/xenomorph,
"Chocolate" = /obj/item/weapon/storage/vore_egg/chocolate,
"Boney" = /obj/item/weapon/storage/vore_egg/owlpellet,
"Slime Glob" = /obj/item/weapon/storage/vore_egg/slimeglob,
"Chicken" = /obj/item/weapon/storage/vore_egg/chicken,
"Synthetic" = /obj/item/weapon/storage/vore_egg/synthetic,
"Bluespace Floppy" = /obj/item/weapon/storage/vore_egg/floppy,
"Bluespace Compressed File" = /obj/item/weapon/storage/vore_egg/file,
"Bluespace CD" = /obj/item/weapon/storage/vore_egg/cd,
"Escape Pod" = /obj/item/weapon/storage/vore_egg/escapepod,
"Cooking Error" = /obj/item/weapon/storage/vore_egg/badrecipe,
"Web Cocoon" = /obj/item/weapon/storage/vore_egg/cocoon,
"Honeycomb" = /obj/item/weapon/storage/vore_egg/honeycomb,
"Bug Cocoon" = /obj/item/weapon/storage/vore_egg/bugcocoon,
"Rock" = /obj/item/weapon/storage/vore_egg/rock,
"Yellow" = /obj/item/weapon/storage/vore_egg/yellow,
"Blue" = /obj/item/weapon/storage/vore_egg/blue,
"Green" = /obj/item/weapon/storage/vore_egg/green,
"Orange" = /obj/item/weapon/storage/vore_egg/orange,
"Purple" = /obj/item/weapon/storage/vore_egg/purple,
"Red" = /obj/item/weapon/storage/vore_egg/red,
"Rainbow" = /obj/item/weapon/storage/vore_egg/rainbow,
"Spotted Pink" = /obj/item/weapon/storage/vore_egg/pinkspots)
"Unathi" = /obj/item/storage/vore_egg/unathi,
"Tajara" = /obj/item/storage/vore_egg/tajaran,
"Akula" = /obj/item/storage/vore_egg/shark,
"Skrell" = /obj/item/storage/vore_egg/skrell,
"Sergal" = /obj/item/storage/vore_egg/sergal,
"Nevrean" = /obj/item/storage/vore_egg/nevrean,
"Human" = /obj/item/storage/vore_egg/human,
"Slime" = /obj/item/storage/vore_egg/slime,
"Egg" = /obj/item/storage/vore_egg,
"Xenochimera" = /obj/item/storage/vore_egg/scree,
"Xenomorph" = /obj/item/storage/vore_egg/xenomorph,
"Chocolate" = /obj/item/storage/vore_egg/chocolate,
"Boney" = /obj/item/storage/vore_egg/owlpellet,
"Slime Glob" = /obj/item/storage/vore_egg/slimeglob,
"Chicken" = /obj/item/storage/vore_egg/chicken,
"Synthetic" = /obj/item/storage/vore_egg/synthetic,
"Bluespace Floppy" = /obj/item/storage/vore_egg/floppy,
"Bluespace Compressed File" = /obj/item/storage/vore_egg/file,
"Bluespace CD" = /obj/item/storage/vore_egg/cd,
"Escape Pod" = /obj/item/storage/vore_egg/escapepod,
"Cooking Error" = /obj/item/storage/vore_egg/badrecipe,
"Web Cocoon" = /obj/item/storage/vore_egg/cocoon,
"Honeycomb" = /obj/item/storage/vore_egg/honeycomb,
"Bug Cocoon" = /obj/item/storage/vore_egg/bugcocoon,
"Rock" = /obj/item/storage/vore_egg/rock,
"Yellow" = /obj/item/storage/vore_egg/yellow,
"Blue" = /obj/item/storage/vore_egg/blue,
"Green" = /obj/item/storage/vore_egg/green,
"Orange" = /obj/item/storage/vore_egg/orange,
"Purple" = /obj/item/storage/vore_egg/purple,
"Red" = /obj/item/storage/vore_egg/red,
"Rainbow" = /obj/item/storage/vore_egg/rainbow,
"Spotted Pink" = /obj/item/storage/vore_egg/pinkspots)
var/global/list/edible_trash = list(/obj/item/broken_device,
/obj/item/clothing/accessory/collar,
/obj/item/device/communicator,
/obj/item/communicator,
/obj/item/clothing/mask,
/obj/item/clothing/glasses,
/obj/item/clothing/gloves,
/obj/item/clothing/head,
/obj/item/clothing/shoes,
/obj/item/device/aicard,
/obj/item/device/flashlight,
/obj/item/device/mmi/digital/posibrain,
/obj/item/device/paicard,
/obj/item/device/pda,
/obj/item/device/radio/headset,
/obj/item/aicard,
/obj/item/flashlight,
/obj/item/mmi/digital/posibrain,
/obj/item/paicard,
/obj/item/pda,
/obj/item/radio/headset,
/obj/item/inflatable/torn,
/obj/item/organ,
/obj/item/stack/material/cardboard,
/obj/item/toy,
/obj/item/trash,
/obj/item/weapon/digestion_remains,
/obj/item/weapon/bananapeel,
/obj/item/weapon/book,
/obj/item/weapon/bone,
/obj/item/weapon/broken_bottle,
/obj/item/weapon/card/emag_broken,
/obj/item/digestion_remains,
/obj/item/bananapeel,
/obj/item/book,
/obj/item/bone,
/obj/item/broken_bottle,
/obj/item/card/emag_broken,
/obj/item/trash/cigbutt,
/obj/item/weapon/circuitboard/broken,
/obj/item/weapon/clipboard,
/obj/item/weapon/corncob,
/obj/item/weapon/dice,
/obj/item/weapon/flame,
/obj/item/weapon/light,
/obj/item/weapon/lipstick,
/obj/item/weapon/material/shard,
/obj/item/weapon/newspaper,
/obj/item/weapon/paper,
/obj/item/weapon/paperplane,
/obj/item/weapon/pen,
/obj/item/weapon/photo,
/obj/item/weapon/reagent_containers/food,
/obj/item/weapon/reagent_containers/glass/rag,
/obj/item/weapon/soap,
/obj/item/weapon/spacecash,
/obj/item/weapon/storage/box/khcrystal,
/obj/item/weapon/storage/box/matches,
/obj/item/weapon/storage/box/wings,
/obj/item/weapon/storage/fancy/candle_box,
/obj/item/weapon/storage/fancy/cigarettes,
/obj/item/weapon/storage/fancy/crayons,
/obj/item/weapon/storage/fancy/egg_box,
/obj/item/weapon/storage/wallet,
/obj/item/weapon/storage/vore_egg,
/obj/item/weapon/bikehorn/tinytether,
/obj/item/weapon/entrepreneur,
/obj/item/circuitboard/broken,
/obj/item/clipboard,
/obj/item/corncob,
/obj/item/dice,
/obj/item/flame,
/obj/item/light,
/obj/item/lipstick,
/obj/item/material/shard,
/obj/item/newspaper,
/obj/item/paper,
/obj/item/paperplane,
/obj/item/pen,
/obj/item/photo,
/obj/item/reagent_containers/food,
/obj/item/reagent_containers/glass/rag,
/obj/item/soap,
/obj/item/spacecash,
/obj/item/storage/box/khcrystal,
/obj/item/storage/box/matches,
/obj/item/storage/box/wings,
/obj/item/storage/fancy/candle_box,
/obj/item/storage/fancy/cigarettes,
/obj/item/storage/fancy/crayons,
/obj/item/storage/fancy/egg_box,
/obj/item/storage/wallet,
/obj/item/storage/vore_egg,
/obj/item/bikehorn/tinytether,
/obj/item/entrepreneur,
/obj/item/capture_crystal,
/obj/item/roulette_ball,
/obj/item/pizzabox
code/_helpers/mobs.dm
+1 -1
View File
@@ -136,7 +136,7 @@ Proc for attack log creation, because really why not
return (thing in R.module.modules)
/proc/get_exposed_defense_zone(var/atom/movable/target)
var/obj/item/weapon/grab/G = locate() in target
var/obj/item/grab/G = locate() in target
if(G && G.state >= GRAB_NECK) //works because mobs are currently not allowed to upgrade to NECK if they are grabbing two people.
return pick(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_LEG, BP_R_LEG)
else
code/_helpers/unsorted.dm
+33 -33
View File
@@ -315,16 +315,16 @@ Turf and target are seperate in case you want to teleport some distance from a t
var/search_pda = 1
for(var/A in searching)
if( search_id && istype(A,/obj/item/weapon/card/id) )
var/obj/item/weapon/card/id/ID = A
if( search_id && istype(A,/obj/item/card/id) )
var/obj/item/card/id/ID = A
if(ID.registered_name == oldname)
ID.registered_name = newname
ID.name = "[newname]'s ID Card ([ID.assignment])"
if(!search_pda) break
search_id = 0
else if( search_pda && istype(A,/obj/item/device/pda) )
var/obj/item/device/pda/PDA = A
else if( search_pda && istype(A,/obj/item/pda) )
var/obj/item/pda/PDA = A
if(PDA.owner == oldname)
PDA.owner = newname
PDA.name = "PDA-[newname] ([PDA.ownjob])"
@@ -1030,13 +1030,13 @@ Turf and target are seperate in case you want to teleport some distance from a t
//Quick type checks for some tools
var/global/list/common_tools = list(
/obj/item/stack/cable_coil,
/obj/item/weapon/tool/wrench,
/obj/item/weapon/weldingtool,
/obj/item/weapon/tool/screwdriver,
/obj/item/weapon/tool/wirecutters,
/obj/item/device/multitool,
/obj/item/weapon/tool/crowbar,
/obj/item/weapon/tool/transforming)
/obj/item/tool/wrench,
/obj/item/weldingtool,
/obj/item/tool/screwdriver,
/obj/item/tool/wirecutters,
/obj/item/multitool,
/obj/item/tool/crowbar,
/obj/item/tool/transforming)
/proc/istool(O)
if(O && is_type_in_list(O, common_tools))
@@ -1045,32 +1045,32 @@ var/global/list/common_tools = list(
/proc/is_wire_tool(obj/item/I)
if(istype(I, /obj/item/device/multitool) || I.has_tool_quality(TOOL_WIRECUTTER))
if(istype(I, /obj/item/multitool) || I.has_tool_quality(TOOL_WIRECUTTER))
return TRUE
if(istype(I, /obj/item/device/assembly/signaler))
if(istype(I, /obj/item/assembly/signaler))
return TRUE
return
/proc/is_hot(obj/item/W as obj)
switch(W.type)
if(/obj/item/weapon/weldingtool)
var/obj/item/weapon/weldingtool/WT = W
if(/obj/item/weldingtool)
var/obj/item/weldingtool/WT = W
if(WT.isOn())
return 3800
else
return 0
if(/obj/item/weapon/tool/transforming)
var/obj/item/weapon/tool/transforming/TT = W
if(/obj/item/tool/transforming)
var/obj/item/tool/transforming/TT = W
if(TT.possible_tooltypes[TT.current_tooltype] == TOOL_WELDER)
return 3800
else
return 0
if(/obj/item/weapon/flame/lighter)
if(/obj/item/flame/lighter)
if(W:lit)
return 1500
else
return 0
if(/obj/item/weapon/flame/match)
if(/obj/item/flame/match)
if(W:lit)
return 1000
else
@@ -1080,9 +1080,9 @@ var/global/list/common_tools = list(
return 1000
else
return 0
if(/obj/item/weapon/pickaxe/plasmacutter)
if(/obj/item/pickaxe/plasmacutter)
return 3800
if(/obj/item/weapon/melee/energy)
if(/obj/item/melee/energy)
return 3500
else
return 0
@@ -1113,12 +1113,12 @@ var/global/list/common_tools = list(
return TRUE
return ( \
W.has_tool_quality(TOOL_SCREWDRIVER) || \
istype(W, /obj/item/weapon/pen) || \
istype(W, /obj/item/weapon/weldingtool) || \
istype(W, /obj/item/weapon/flame/lighter/zippo) || \
istype(W, /obj/item/weapon/flame/match) || \
istype(W, /obj/item/pen) || \
istype(W, /obj/item/weldingtool) || \
istype(W, /obj/item/flame/lighter/zippo) || \
istype(W, /obj/item/flame/match) || \
istype(W, /obj/item/clothing/mask/smokable/cigarette) || \
istype(W, /obj/item/weapon/shovel) \
istype(W, /obj/item/shovel) \
)
// check if mob is lying down on something we can operate him on.
@@ -1153,12 +1153,12 @@ Checks if that loc and dir has a item on the wall
TODO - Fix this ancient list of wall items. Preferably make it dynamically populated. ~Leshana
*/
var/list/WALLITEMS = list(
/obj/machinery/power/apc, /obj/machinery/alarm, /obj/item/device/radio/intercom, /obj/structure/frame,
/obj/machinery/power/apc, /obj/machinery/alarm, /obj/item/radio/intercom, /obj/structure/frame,
/obj/structure/extinguisher_cabinet, /obj/structure/reagent_dispensers/peppertank,
/obj/machinery/status_display, /obj/machinery/requests_console, /obj/machinery/light_switch, /obj/structure/sign,
/obj/machinery/newscaster, /obj/machinery/firealarm, /obj/structure/noticeboard, /obj/machinery/button/remote,
/obj/machinery/computer/security/telescreen, /obj/machinery/embedded_controller/radio,
/obj/item/weapon/storage/secure/safe, /obj/machinery/door_timer, /obj/machinery/flasher, /obj/machinery/keycard_auth,
/obj/item/storage/secure/safe, /obj/machinery/door_timer, /obj/machinery/flasher, /obj/machinery/keycard_auth,
/obj/structure/mirror, /obj/structure/fireaxecabinet, /obj/machinery/computer/security/telescreen/entertainment
)
/proc/gotwallitem(loc, dir)
@@ -1463,12 +1463,12 @@ var/mob/dview/dview_mob = new
var/typename = "[type]"
var/static/list/TYPES_SHORTCUTS = list(
/obj/effect/decal/cleanable = "CLEANABLE",
/obj/item/device/radio/headset = "HEADSET",
/obj/item/radio/headset = "HEADSET",
/obj/item/clothing/head/helmet/space = "SPESSHELMET",
/obj/item/weapon/book/manual = "MANUAL",
/obj/item/weapon/reagent_containers/food/drinks = "DRINK",
/obj/item/weapon/reagent_containers/food = "FOOD",
/obj/item/weapon/reagent_containers = "REAGENT_CONTAINERS",
/obj/item/book/manual = "MANUAL",
/obj/item/reagent_containers/food/drinks = "DRINK",
/obj/item/reagent_containers/food = "FOOD",
/obj/item/reagent_containers = "REAGENT_CONTAINERS",
/obj/machinery/atmospherics = "ATMOS_MECH",
/obj/machinery/portable_atmospherics = "PORT_ATMOS",
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = "MECHA_MISSILE_RACK",
code/_onclick/hud/hud.dm
+3 -3
View File
@@ -480,7 +480,7 @@ var/list/global_huds = list(
* All these do is manage the amount of huds on screen and set the HUD.
*/
///Add an ammo hud to the user informing of the ammo count of G
/datum/hud/proc/add_ammo_hud(mob/living/user, obj/item/weapon/gun/G)
/datum/hud/proc/add_ammo_hud(mob/living/user, obj/item/gun/G)
if(length(ammo_hud_list) >= MAX_AMMO_HUD_POSSIBLE)
return
var/obj/screen/ammo/ammo_hud = new
@@ -490,7 +490,7 @@ var/list/global_huds = list(
ammo_hud.update_hud(user, G)
///Remove the ammo hud related to the gun G from the user
/datum/hud/proc/remove_ammo_hud(mob/living/user, obj/item/weapon/gun/G)
/datum/hud/proc/remove_ammo_hud(mob/living/user, obj/item/gun/G)
var/obj/screen/ammo/ammo_hud = ammo_hud_list[G]
if(isnull(ammo_hud))
return
@@ -504,7 +504,7 @@ var/list/global_huds = list(
i++
///Update the ammo hud related to the gun G
/datum/hud/proc/update_ammo_hud(mob/living/user, obj/item/weapon/gun/G)
/datum/hud/proc/update_ammo_hud(mob/living/user, obj/item/gun/G)
var/obj/screen/ammo/ammo_hud = ammo_hud_list[G]
ammo_hud?.update_hud(user, G)
code/_onclick/hud/human.dm
+1 -1
View File
@@ -250,7 +250,7 @@
internals = new /obj/screen()
internals.icon = HUD.ui_style
internals.icon_state = "internal0"
if(istype(internal, /obj/item/weapon/tank)) //Internals on already? Iight, prove it
if(istype(internal, /obj/item/tank)) //Internals on already? Iight, prove it
internals.icon_state = "internal1"
internals.name = "internal"
internals.screen_loc = ui_internal
code/_onclick/hud/minihud_mapper.dm
+1 -1
View File
@@ -1,6 +1,6 @@
// Specific types
/datum/mini_hud/mapper
var/obj/item/device/mapping_unit/owner
var/obj/item/mapping_unit/owner
/datum/mini_hud/mapper/New(var/datum/hud/other, owner)
src.owner = owner
code/_onclick/hud/minihud_rigmech.dm
+6 -6
View File
@@ -1,6 +1,6 @@
// Specific types
/datum/mini_hud/rig
var/obj/item/weapon/rig/owner_rig
var/obj/item/rig/owner_rig
var/obj/screen/rig/power/power
var/obj/screen/rig/health/health
var/obj/screen/rig/air/air
@@ -8,7 +8,7 @@
needs_processing = TRUE
/datum/mini_hud/rig/New(var/datum/hud/other, var/obj/item/weapon/rig/owner)
/datum/mini_hud/rig/New(var/datum/hud/other, var/obj/item/rig/owner)
owner_rig = owner
power = new ()
health = new ()
@@ -36,8 +36,8 @@
qdel(src)
return
var/obj/item/weapon/cell/rigcell = owner_rig.cell
var/obj/item/weapon/tank/rigtank = owner_rig.air_supply
var/obj/item/cell/rigcell = owner_rig.cell
var/obj/item/tank/rigtank = owner_rig.air_supply
var/charge_percentage = rigcell ? rigcell.charge / rigcell.maxcharge : 0
var/air_percentage = rigtank ? CLAMP(rigtank.air_contents.total_moles / 17.4693, 0, 1) : 0
@@ -85,7 +85,7 @@
qdel(src)
return
var/obj/item/weapon/cell/mechcell = owner_mech.cell
var/obj/item/cell/mechcell = owner_mech.cell
var/obj/machinery/portable_atmospherics/canister/mechtank = owner_mech.internal_tank
var/charge_percentage = mechcell ? mechcell.charge / mechcell.maxcharge : 0
@@ -146,7 +146,7 @@
var/mob/living/carbon/human/user = usr
if(!istype(user) || user.stat || user.incapacitated())
return
var/obj/item/weapon/rig/owner_rig = master
var/obj/item/rig/owner_rig = master
if(user != owner_rig.wearer)
return
user.toggle_internals()
code/_onclick/hud/screen_objects.dm
+9 -9
View File
@@ -69,8 +69,8 @@
/obj/screen/close/Click()
if(master)
if(istype(master, /obj/item/weapon/storage))
var/obj/item/weapon/storage/S = master
if(istype(master, /obj/item/storage))
var/obj/item/storage/S = master
S.close(usr)
return 1
@@ -101,7 +101,7 @@
name = "grab"
/obj/screen/grab/Click()
var/obj/item/weapon/grab/G = master
var/obj/item/grab/G = master
G.s_click(src)
return 1
@@ -361,7 +361,7 @@
tankcheck = list(C.r_hand, C.l_hand, C.back)
// Rigs are a fucking pain since they keep an air tank in nullspace.
var/obj/item/weapon/rig/Rig = C.get_rig()
var/obj/item/rig/Rig = C.get_rig()
if(Rig)
if(Rig.air_supply && !Rig.offline)
from = "in"
@@ -369,8 +369,8 @@
tankcheck |= Rig.air_supply
for(var/i=1, i<tankcheck.len+1, ++i)
if(istype(tankcheck[i], /obj/item/weapon/tank))
var/obj/item/weapon/tank/t = tankcheck[i]
if(istype(tankcheck[i], /obj/item/tank))
var/obj/item/tank/t = tankcheck[i]
if (!isnull(t.manipulated_by) && t.manipulated_by != C.real_name && findtext(t.desc,breathes))
contents.Add(t.air_contents.total_moles) //Someone messed with the tank and put unknown gasses
continue //in it, so we're going to believe the tank is what it says it is
@@ -772,7 +772,7 @@
var/obj/screen/mapper/powbutton/powbutton
var/obj/screen/mapper/mapbutton/mapbutton
var/obj/item/device/mapping_unit/owner
var/obj/item/mapping_unit/owner
var/obj/screen/mapper/extras_holder/extras_holder
/obj/screen/movable/mapper_holder/Initialize(mapload, newowner)
@@ -965,7 +965,7 @@
var/warned = FALSE
var/static/list/ammo_screen_loc_list = list(ui_ammo_hud1, ui_ammo_hud2, ui_ammo_hud3 ,ui_ammo_hud4)
/obj/screen/ammo/proc/add_hud(var/mob/living/user, var/obj/item/weapon/gun/G)
/obj/screen/ammo/proc/add_hud(var/mob/living/user, var/obj/item/gun/G)
if(!user?.client)
return
@@ -981,7 +981,7 @@
/obj/screen/ammo/proc/remove_hud(var/mob/living/user)
user?.client?.screen -= src
/obj/screen/ammo/proc/update_hud(var/mob/living/user, var/obj/item/weapon/gun/G)
/obj/screen/ammo/proc/update_hud(var/mob/living/user, var/obj/item/gun/G)
if(!user?.client?.screen.Find(src))
return
code/_onclick/rig.dm
+2 -2
View File
@@ -54,7 +54,7 @@
return 1
/mob/living/carbon/brain/can_use_rig()
return istype(loc, /obj/item/device/mmi)
return istype(loc, /obj/item/mmi)
/mob/living/silicon/ai/can_use_rig()
return carded
@@ -65,7 +65,7 @@
/mob/living/proc/HardsuitClickOn(var/atom/A, var/alert_ai = 0)
if(!can_use_rig())
return 0
var/obj/item/weapon/rig/rig = get_rig()
var/obj/item/rig/rig = get_rig()
if(istype(rig) && !rig.offline && rig.selected_module)
if(src != rig.wearer)
if(rig.ai_can_move_suit(src, check_user_module = 1))
code/controllers/hooks-defs.dm
+2 -2
View File
@@ -68,14 +68,14 @@
/**
* Employee reassignment hook.
* Called in card.dm when someone's card is reassigned at the HoP's desk.
* Parameters: var/obj/item/weapon/card/id
* Parameters: var/obj/item/card/id
*/
/hook/reassign_employee
/**
* Employee terminated hook.
* Called in card.dm when someone's card is terminated at the HoP's desk.
* Parameters: var/obj/item/weapon/card/id
* Parameters: var/obj/item/card/id
*/
/hook/terminate_employee
code/controllers/subsystems/circuits.dm
+38 -38
View File
@@ -37,47 +37,47 @@ SUBSYSTEM_DEF(circuit)
var/list/category_list = circuit_fabricator_recipe_list[category]
category_list += IC // Populating the fabricator categories
for(var/obj/item/device/electronic_assembly/A as anything in typesof(/obj/item/device/electronic_assembly))
for(var/obj/item/electronic_assembly/A as anything in typesof(/obj/item/electronic_assembly))
var/path = A
all_assemblies[initial(A.name)] = path
cached_assemblies[path] = new path
circuit_fabricator_recipe_list["Assemblies"] = list(
/obj/item/device/electronic_assembly/default,
/obj/item/device/electronic_assembly/calc,
/obj/item/device/electronic_assembly/clam,
/obj/item/device/electronic_assembly/simple,
/obj/item/device/electronic_assembly/hook,
/obj/item/device/electronic_assembly/pda,
/obj/item/device/electronic_assembly/tiny/default,
/obj/item/device/electronic_assembly/tiny/cylinder,
/obj/item/device/electronic_assembly/tiny/scanner,
/obj/item/device/electronic_assembly/tiny/hook,
/obj/item/device/electronic_assembly/tiny/box,
/obj/item/device/electronic_assembly/medium/default,
/obj/item/device/electronic_assembly/medium/box,
/obj/item/device/electronic_assembly/medium/clam,
/obj/item/device/electronic_assembly/medium/medical,
/obj/item/device/electronic_assembly/medium/gun,
/obj/item/device/electronic_assembly/medium/radio,
/obj/item/device/electronic_assembly/large/default,
/obj/item/device/electronic_assembly/large/scope,
/obj/item/device/electronic_assembly/large/terminal,
/obj/item/device/electronic_assembly/large/arm,
/obj/item/device/electronic_assembly/large/tall,
/obj/item/device/electronic_assembly/large/industrial,
/obj/item/device/electronic_assembly/drone/default,
/obj/item/device/electronic_assembly/drone/arms,
/obj/item/device/electronic_assembly/drone/secbot,
/obj/item/device/electronic_assembly/drone/medbot,
/obj/item/device/electronic_assembly/drone/genbot,
/obj/item/device/electronic_assembly/drone/android,
/obj/item/device/electronic_assembly/wallmount/tiny,
/obj/item/device/electronic_assembly/wallmount/light,
/obj/item/device/electronic_assembly/wallmount,
/obj/item/device/electronic_assembly/wallmount/heavy,
/obj/item/weapon/implant/integrated_circuit,
/obj/item/electronic_assembly/default,
/obj/item/electronic_assembly/calc,
/obj/item/electronic_assembly/clam,
/obj/item/electronic_assembly/simple,
/obj/item/electronic_assembly/hook,
/obj/item/electronic_assembly/pda,
/obj/item/electronic_assembly/tiny/default,
/obj/item/electronic_assembly/tiny/cylinder,
/obj/item/electronic_assembly/tiny/scanner,
/obj/item/electronic_assembly/tiny/hook,
/obj/item/electronic_assembly/tiny/box,
/obj/item/electronic_assembly/medium/default,
/obj/item/electronic_assembly/medium/box,
/obj/item/electronic_assembly/medium/clam,
/obj/item/electronic_assembly/medium/medical,
/obj/item/electronic_assembly/medium/gun,
/obj/item/electronic_assembly/medium/radio,
/obj/item/electronic_assembly/large/default,
/obj/item/electronic_assembly/large/scope,
/obj/item/electronic_assembly/large/terminal,
/obj/item/electronic_assembly/large/arm,
/obj/item/electronic_assembly/large/tall,
/obj/item/electronic_assembly/large/industrial,
/obj/item/electronic_assembly/drone/default,
/obj/item/electronic_assembly/drone/arms,
/obj/item/electronic_assembly/drone/secbot,
/obj/item/electronic_assembly/drone/medbot,
/obj/item/electronic_assembly/drone/genbot,
/obj/item/electronic_assembly/drone/android,
/obj/item/electronic_assembly/wallmount/tiny,
/obj/item/electronic_assembly/wallmount/light,
/obj/item/electronic_assembly/wallmount,
/obj/item/electronic_assembly/wallmount/heavy,
/obj/item/implant/integrated_circuit,
/obj/item/clothing/under/circuitry,
/obj/item/clothing/gloves/circuitry,
/obj/item/clothing/glasses/circuitry,
@@ -88,7 +88,7 @@ SUBSYSTEM_DEF(circuit)
)
circuit_fabricator_recipe_list["Tools"] = list(
/obj/item/device/integrated_electronics/wirer,
/obj/item/device/integrated_electronics/debugger,
/obj/item/device/integrated_electronics/detailer
/obj/item/integrated_electronics/wirer,
/obj/item/integrated_electronics/debugger,
/obj/item/integrated_electronics/detailer
)
code/controllers/subsystems/supply.dm
+10 -10
View File
@@ -46,13 +46,13 @@ SUBSYSTEM_DEF(supply)
/datum/controller/subsystem/supply/proc/forbidden_atoms_check(atom/A)
if(isliving(A))
return 1
if(istype(A,/obj/item/weapon/disk/nuclear))
if(istype(A,/obj/item/disk/nuclear))
return 1
if(istype(A,/obj/machinery/nuclearbomb))
return 1
if(istype(A,/obj/item/device/radio/beacon))
if(istype(A,/obj/item/radio/beacon))
return 1
if(istype(A,/obj/item/device/perfect_tele_beacon)) //VOREStation Addition: Translocator beacons
if(istype(A,/obj/item/perfect_tele_beacon)) //VOREStation Addition: Translocator beacons
return 1 //VOREStation Addition: Translocator beacons
if(istype(A,/obj/machinery/power/quantumpad)) // //VOREStation Add: Quantum pads
return 1 //VOREStation Add: Quantum pads
@@ -94,8 +94,8 @@ SUBSYSTEM_DEF(supply)
)
// Sell manifests
if(find_slip && istype(A,/obj/item/weapon/paper/manifest))
var/obj/item/weapon/paper/manifest/slip = A
if(find_slip && istype(A,/obj/item/paper/manifest))
var/obj/item/paper/manifest/slip = A
if(!slip.is_copy && slip.stamped && slip.stamped.len) //yes, the clown stamp will work. clown is the highest authority on the station, it makes sense
points += points_per_slip
EC.contents[EC.contents.len]["value"] = points_per_slip
@@ -112,8 +112,8 @@ SUBSYSTEM_DEF(supply)
EC.value += EC.contents[EC.contents.len]["value"]
//Sell spacebucks
if(istype(A, /obj/item/weapon/spacecash))
var/obj/item/weapon/spacecash/cashmoney = A
if(istype(A, /obj/item/spacecash))
var/obj/item/spacecash/cashmoney = A
EC.contents[EC.contents.len]["value"] = cashmoney.worth * points_per_money
EC.contents[EC.contents.len]["quantity"] = cashmoney.worth
EC.value += EC.contents[EC.contents.len]["value"]
@@ -203,12 +203,12 @@ SUBSYSTEM_DEF(supply)
log_debug("<span class='danger'>Supply pack with invalid access restriction [SP.access] encountered!</span>")
//supply manifest generation begin
var/obj/item/weapon/paper/manifest/slip
var/obj/item/paper/manifest/slip
if(!SP.contraband)
if(A)
slip = new /obj/item/weapon/paper/manifest(A)
slip = new /obj/item/paper/manifest(A)
else
slip = new /obj/item/weapon/paper/manifest(pickedloc)
slip = new /obj/item/paper/manifest(pickedloc)
slip.is_copy = 0
slip.info = "<h3>[command_name()] Shipping Manifest</h3><hr><br>"
slip.info +="Order #[SO.ordernum]<br>"
code/controllers/subsystems/ticker.dm
+1 -1
View File
@@ -443,7 +443,7 @@ var/global/datum/controller/subsystem/ticker/ticker
//VOREStation Addition Start
if(player.client)
if(player.client.prefs.auto_backup_implant)
var/obj/item/weapon/implant/backup/imp = new(src)
var/obj/item/implant/backup/imp = new(src)
if(imp.handle_implant(player,player.zone_sel.selecting))
imp.post_implant(player)
code/controllers/subsystems/transcore_vr.dm
+7 -7
View File
@@ -50,12 +50,12 @@ SUBSYSTEM_DEF(transcore)
src.current_run.Cut()
for(var/key in databases)
var/datum/transcore_db/db = databases[key]
for(var/obj/item/weapon/implant/backup/imp as anything in db.implants)
for(var/obj/item/implant/backup/imp as anything in db.implants)
src.current_run[imp] = db
var/list/current_run = src.current_run
while(current_run.len)
var/obj/item/weapon/implant/backup/imp = current_run[current_run.len]
var/obj/item/implant/backup/imp = current_run[current_run.len]
var/datum/transcore_db/db = current_run[imp]
current_run.len--
@@ -183,7 +183,7 @@ SUBSYSTEM_DEF(transcore)
return db
// These are now just interfaces to databases
/datum/controller/subsystem/transcore/proc/m_backup(var/datum/mind/mind, var/obj/item/device/nif/nif, var/one_time = FALSE, var/database_key)
/datum/controller/subsystem/transcore/proc/m_backup(var/datum/mind/mind, var/obj/item/nif/nif, var/one_time = FALSE, var/database_key)
var/datum/transcore_db/db = db_by_key(database_key)
db.m_backup(mind=mind, nif=nif, one_time=one_time)
@@ -203,7 +203,7 @@ SUBSYSTEM_DEF(transcore)
var/datum/transcore_db/db = db_by_key(database_key)
db.remove_body(BR=BR)
/datum/controller/subsystem/transcore/proc/core_dump(var/obj/item/weapon/disk/transcore/disk, var/database_key)
/datum/controller/subsystem/transcore/proc/core_dump(var/obj/item/disk/transcore/disk, var/database_key)
var/datum/transcore_db/db = db_by_key(database_key)
db.core_dump(disk=disk)
@@ -212,12 +212,12 @@ SUBSYSTEM_DEF(transcore)
var/list/datum/transhuman/mind_record/backed_up = list() // All known mind records, indexed by MR.mindname/mind.name
var/list/datum/transhuman/mind_record/has_left = list() // Why do we even have this?
var/list/datum/transhuman/body_record/body_scans = list() // All known body records, indexed by BR.mydna.name
var/list/obj/item/weapon/implant/backup/implants = list() // All OPERATING implants that are being ticked
var/list/obj/item/implant/backup/implants = list() // All OPERATING implants that are being ticked
var/core_dumped = FALSE
var/key // Key for this DB
/datum/transcore_db/proc/m_backup(var/datum/mind/mind, var/obj/item/device/nif/nif, var/one_time = FALSE)
/datum/transcore_db/proc/m_backup(var/datum/mind/mind, var/obj/item/nif/nif, var/one_time = FALSE)
ASSERT(mind)
if(!mind.name || core_dumped)
return 0
@@ -290,7 +290,7 @@ SUBSYSTEM_DEF(transcore)
log_debug("Removed [BR.mydna.name] from transcore body DB.")
// Moves all mind records from the databaes into the disk and shuts down all backup canary processing.
/datum/transcore_db/proc/core_dump(var/obj/item/weapon/disk/transcore/disk)
/datum/transcore_db/proc/core_dump(var/obj/item/disk/transcore/disk)
ASSERT(disk)
global_announcer.autosay("An emergency core dump has been initiated!", "TransCore Oversight", "Command")
global_announcer.autosay("An emergency core dump has been initiated!", "TransCore Oversight", "Medical")
code/datums/autolathe/arms.dm
+3 -3
View File
@@ -1,6 +1,6 @@
/datum/category_item/autolathe/arms/syringegun_ammo
name = "syringe gun cartridge"
path =/obj/item/weapon/syringe_cartridge
path =/obj/item/syringe_cartridge
////////////////
/*Ammo casings*/
@@ -448,10 +448,10 @@
/datum/category_item/autolathe/arms/tacknife
name = "tactical knife"
path =/obj/item/weapon/material/knife/tacknife
path =/obj/item/material/knife/tacknife
hidden = 1
/datum/category_item/autolathe/arms/flamethrower
name = "flamethrower"
path =/obj/item/weapon/flamethrower/full
path =/obj/item/flamethrower/full
hidden = 1
code/datums/autolathe/devices.dm
+9 -9
View File
@@ -1,38 +1,38 @@
/datum/category_item/autolathe/devices/consolescreen
name = "console screen"
path =/obj/item/weapon/stock_parts/console_screen
path =/obj/item/stock_parts/console_screen
/datum/category_item/autolathe/devices/igniter
name = "igniter"
path =/obj/item/device/assembly/igniter
path =/obj/item/assembly/igniter
/datum/category_item/autolathe/devices/signaler
name = "signaler"
path =/obj/item/device/assembly/signaler
path =/obj/item/assembly/signaler
/datum/category_item/autolathe/devices/sensor_infra
name = "infrared sensor"
path =/obj/item/device/assembly/infra
path =/obj/item/assembly/infra
/datum/category_item/autolathe/devices/timer
name = "timer"
path =/obj/item/device/assembly/timer
path =/obj/item/assembly/timer
/datum/category_item/autolathe/devices/sensor_prox
name = "proximity sensor"
path =/obj/item/device/assembly/prox_sensor
path =/obj/item/assembly/prox_sensor
/datum/category_item/autolathe/devices/beartrap
name = "mechanical trap"
path =/obj/item/weapon/beartrap
path =/obj/item/beartrap
/datum/category_item/autolathe/devices/barbedwire
name = "barbed wire"
path = /obj/item/weapon/material/barbedwire
path = /obj/item/material/barbedwire
hidden = 1
resources = list(MAT_STEEL = 10000)
/datum/category_item/autolathe/devices/electropack
name = "electropack"
path =/obj/item/device/radio/electropack
path =/obj/item/radio/electropack
hidden = 1
code/datums/autolathe/devices_vr.dm
+1 -1
View File
@@ -1,3 +1,3 @@
/datum/category_item/autolathe/devices/sleevecard
name = "sleevecard"
path =/obj/item/device/paicard/sleevecard
path =/obj/item/paicard/sleevecard
code/datums/autolathe/engineering.dm
+28 -28
View File
@@ -1,112 +1,112 @@
/datum/category_item/autolathe/engineering/airlockmodule
name = "airlock electronics"
path =/obj/item/weapon/airlock_electronics
path =/obj/item/airlock_electronics
/datum/category_item/autolathe/engineering/airalarm
name = "air alarm electronics"
path =/obj/item/weapon/circuitboard/airalarm
path =/obj/item/circuitboard/airalarm
/datum/category_item/autolathe/engineering/firealarm
name = "fire alarm electronics"
path =/obj/item/weapon/circuitboard/firealarm
path =/obj/item/circuitboard/firealarm
/datum/category_item/autolathe/engineering/powermodule
name = "power control module"
path =/obj/item/weapon/module/power_control
path =/obj/item/module/power_control
/datum/category_item/autolathe/engineering/statusdisplay
name = "status display electronics"
path =/obj/item/weapon/circuitboard/status_display
path =/obj/item/circuitboard/status_display
/datum/category_item/autolathe/engineering/aistatusdisplay
name = "ai status display electronics"
path =/obj/item/weapon/circuitboard/ai_status_display
path =/obj/item/circuitboard/ai_status_display
/datum/category_item/autolathe/engineering/newscaster
name = "newscaster electronics"
path =/obj/item/weapon/circuitboard/newscaster
path =/obj/item/circuitboard/newscaster
/datum/category_item/autolathe/engineering/atm
name = "atm electronics"
path =/obj/item/weapon/circuitboard/atm
path =/obj/item/circuitboard/atm
/datum/category_item/autolathe/engineering/intercom
name = "intercom electronics"
path =/obj/item/weapon/circuitboard/intercom
path =/obj/item/circuitboard/intercom
/datum/category_item/autolathe/engineering/holopad
name = "holopad electronics"
path =/obj/item/weapon/circuitboard/holopad
path =/obj/item/circuitboard/holopad
/datum/category_item/autolathe/engineering/guestpass
name = "guestpass console electronics"
path =/obj/item/weapon/circuitboard/guestpass
path =/obj/item/circuitboard/guestpass
/datum/category_item/autolathe/engineering/entertainment
name = "entertainment camera electronics"
path =/obj/item/weapon/circuitboard/security/telescreen/entertainment
path =/obj/item/circuitboard/security/telescreen/entertainment
/datum/category_item/autolathe/engineering/keycard
name = "keycard authenticator electronics"
path =/obj/item/weapon/circuitboard/keycard_auth
path =/obj/item/circuitboard/keycard_auth
/datum/category_item/autolathe/engineering/geiger_wall
name = "wall-mounted geiger counter electronics"
path =/obj/item/weapon/circuitboard/geiger
path =/obj/item/circuitboard/geiger
/datum/category_item/autolathe/engineering/photocopier
name = "photocopier electronics"
path =/obj/item/weapon/circuitboard/photocopier
path =/obj/item/circuitboard/photocopier
/datum/category_item/autolathe/engineering/fax
name = "fax machine electronics"
path =/obj/item/weapon/circuitboard/fax
path =/obj/item/circuitboard/fax
/datum/category_item/autolathe/engineering/papershredder
name = "paper shredder electronics"
path =/obj/item/weapon/circuitboard/papershredder
path =/obj/item/circuitboard/papershredder
/datum/category_item/autolathe/engineering/microwave
name = "microwave electronics"
path =/obj/item/weapon/circuitboard/microwave
path =/obj/item/circuitboard/microwave
/datum/category_item/autolathe/engineering/washing
name = "washing machine electronics"
path =/obj/item/weapon/circuitboard/washing
path =/obj/item/circuitboard/washing
/datum/category_item/autolathe/engineering/request
name = "request console electronics"
path =/obj/item/weapon/circuitboard/request
path =/obj/item/circuitboard/request
/datum/category_item/autolathe/engineering/electrochromic
name = "electrochromic window control electronics"
path =/obj/item/weapon/circuitboard/electrochromic
path =/obj/item/circuitboard/electrochromic
/datum/category_item/autolathe/engineering/pipelayer
name = "pipe layer electronics"
path =/obj/item/weapon/circuitboard/pipelayer
path =/obj/item/circuitboard/pipelayer
/datum/category_item/autolathe/engineering/motor
name = "motor"
path =/obj/item/weapon/stock_parts/motor
path =/obj/item/stock_parts/motor
/datum/category_item/autolathe/engineering/gear
name = "gear"
path =/obj/item/weapon/stock_parts/gear
path =/obj/item/stock_parts/gear
/datum/category_item/autolathe/engineering/spring
name = "spring"
path =/obj/item/weapon/stock_parts/spring
path =/obj/item/stock_parts/spring
/datum/category_item/autolathe/engineering/rcd_ammo
name = "matter cartridge"
path =/obj/item/weapon/rcd_ammo
path =/obj/item/rcd_ammo
no_scale = TRUE //prevents material duplication exploits
/datum/category_item/autolathe/engineering/rcd
name = "rapid construction device"
path =/obj/item/weapon/rcd
path =/obj/item/rcd
/datum/category_item/autolathe/engineering/camera_assembly
name = "camera assembly"
path =/obj/item/weapon/camera_assembly
path =/obj/item/camera_assembly
code/datums/autolathe/engineering_vr.dm
+19 -19
View File
@@ -1,75 +1,75 @@
/datum/category_item/autolathe/engineering/timeclock
name = "timeclock electronics"
path =/obj/item/weapon/circuitboard/timeclock
path =/obj/item/circuitboard/timeclock
/datum/category_item/autolathe/engineering/id_restorer
name = "ID restoration console electronics"
path =/obj/item/weapon/circuitboard/id_restorer
path =/obj/item/circuitboard/id_restorer
/datum/category_item/autolathe/engineering/oven
name = "oven electronics"
path =/obj/item/weapon/circuitboard/oven
path =/obj/item/circuitboard/oven
/datum/category_item/autolathe/engineering/fryer
name = "fryer electronics"
path =/obj/item/weapon/circuitboard/fryer
path =/obj/item/circuitboard/fryer
/datum/category_item/autolathe/engineering/grill
name = "grill electronics"
path =/obj/item/weapon/circuitboard/grill
path =/obj/item/circuitboard/grill
/datum/category_item/autolathe/engineering/cerealmaker
name = "cereal maker electronics"
path =/obj/item/weapon/circuitboard/cerealmaker
path =/obj/item/circuitboard/cerealmaker
/datum/category_item/autolathe/engineering/candymachine
name = "candy machine electronics"
path =/obj/item/weapon/circuitboard/candymachine
path =/obj/item/circuitboard/candymachine
/datum/category_item/autolathe/engineering/battle_arcade
name = "battle arcade machine electronics"
path =/obj/item/weapon/circuitboard/arcade/battle
path =/obj/item/circuitboard/arcade/battle
/datum/category_item/autolathe/engineering/orion_trail
name = "orion trail aracade machine electronics"
path =/obj/item/weapon/circuitboard/arcade/orion_trail
path =/obj/item/circuitboard/arcade/orion_trail
/datum/category_item/autolathe/engineering/clawmachine
name = "claw machine electronics"
path =/obj/item/weapon/circuitboard/arcade/clawmachine
path =/obj/item/circuitboard/arcade/clawmachine
/datum/category_item/autolathe/engineering/jukebox
name = "jukebox electronics"
path =/obj/item/weapon/circuitboard/jukebox
path =/obj/item/circuitboard/jukebox
/datum/category_item/autolathe/engineering/mech_recharger
name = "mech recharging station electronics"
path =/obj/item/weapon/circuitboard/mech_recharger
path =/obj/item/circuitboard/mech_recharger
/datum/category_item/autolathe/engineering/recharge_station
name = "cyborg recharging station electronics"
path =/obj/item/weapon/circuitboard/recharge_station
path =/obj/item/circuitboard/recharge_station
/datum/category_item/autolathe/engineering/batteryrack
name = "battery rack electronics"
path =/obj/item/weapon/circuitboard/batteryrack
path =/obj/item/circuitboard/batteryrack
/datum/category_item/autolathe/engineering/grid_checker
name = "grid checker electronics"
path =/obj/item/weapon/circuitboard/grid_checker
path =/obj/item/circuitboard/grid_checker
/datum/category_item/autolathe/engineering/breakerbox
name = "breaker box electronics"
path =/obj/item/weapon/circuitboard/breakerbox
path =/obj/item/circuitboard/breakerbox
/datum/category_item/autolathe/engineering/gas_heater
name = "gas heater electronics"
path =/obj/item/weapon/circuitboard/unary_atmos/heater
path =/obj/item/circuitboard/unary_atmos/heater
/datum/category_item/autolathe/engineering/gas_cooler
name = "gas cooler electronics"
path =/obj/item/weapon/circuitboard/unary_atmos/cooler
path =/obj/item/circuitboard/unary_atmos/cooler
/datum/category_item/autolathe/engineering/arf_generator
name = "atmospheric field generator electronics"
path =/obj/item/weapon/circuitboard/arf_generator
path =/obj/item/circuitboard/arf_generator
code/datums/autolathe/general.dm
+27 -27
View File
@@ -1,57 +1,57 @@
/datum/category_item/autolathe/general/bucket
name = "bucket"
path =/obj/item/weapon/reagent_containers/glass/bucket
path =/obj/item/reagent_containers/glass/bucket
/datum/category_item/autolathe/general/cooler_bottle
name = "water-cooler bottle"
path =/obj/item/weapon/reagent_containers/glass/cooler_bottle
path =/obj/item/reagent_containers/glass/cooler_bottle
/datum/category_item/autolathe/general/drinkingglass
is_stack = TRUE
/datum/category_item/autolathe/general/drinkingglass/square
name = "half-pint glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/square
path =/obj/item/reagent_containers/food/drinks/glass2/square
/datum/category_item/autolathe/general/drinkingglass/rocks
name = "rocks glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/rocks
path =/obj/item/reagent_containers/food/drinks/glass2/rocks
/datum/category_item/autolathe/general/drinkingglass/shake
name = "milkshake glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/shake
path =/obj/item/reagent_containers/food/drinks/glass2/shake
/datum/category_item/autolathe/general/drinkingglass/cocktail
name = "cocktail glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/cocktail
path =/obj/item/reagent_containers/food/drinks/glass2/cocktail
/datum/category_item/autolathe/general/drinkingglass/shot
name = "shot glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/shot
path =/obj/item/reagent_containers/food/drinks/glass2/shot
/datum/category_item/autolathe/general/drinkingglass/pint
name = "pint glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/pint
path =/obj/item/reagent_containers/food/drinks/glass2/pint
/datum/category_item/autolathe/general/drinkingglass/mug
name = "glass mug"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/mug
path =/obj/item/reagent_containers/food/drinks/glass2/mug
/datum/category_item/autolathe/general/drinkingglass/wine
name = "wine glass"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/wine
path =/obj/item/reagent_containers/food/drinks/glass2/wine
/datum/category_item/autolathe/general/drinkingglass/metaglass
name = "metamorphic glass"
path =/obj/item/weapon/reagent_containers/food/drinks/metaglass
path =/obj/item/reagent_containers/food/drinks/metaglass
/datum/category_item/autolathe/general/drinkingglass/metaglass/metapint
name = "metamorphic pint glass"
path =/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint
path =/obj/item/reagent_containers/food/drinks/metaglass/metapint
/datum/category_item/autolathe/general/flashlight
name = "flashlight"
path =/obj/item/device/flashlight
path =/obj/item/flashlight
/datum/category_item/autolathe/general/floor_light
name = "floor light"
@@ -59,7 +59,7 @@
/datum/category_item/autolathe/general/extinguisher
name = "extinguisher"
path =/obj/item/weapon/extinguisher
path =/obj/item/extinguisher
/datum/category_item/autolathe/general/jar
name = "jar"
@@ -71,15 +71,15 @@
/datum/category_item/autolathe/general/radio_headset
name = "radio headset"
path =/obj/item/device/radio/headset
path =/obj/item/radio/headset
/datum/category_item/autolathe/general/radio_bounced
name = "station bounced radio"
path =/obj/item/device/radio/off
path =/obj/item/radio/off
/datum/category_item/autolathe/general/suit_cooler
name = "suit cooling unit"
path =/obj/item/device/suit_cooling_unit
path =/obj/item/suit_cooling_unit
/datum/category_item/autolathe/general/weldermask
name = "welding mask"
@@ -87,29 +87,29 @@
/datum/category_item/autolathe/general/spraybottle
name = "spray bottle"
path = /obj/item/weapon/reagent_containers/spray
path = /obj/item/reagent_containers/spray
/datum/category_item/autolathe/general/knife
name = "kitchen knife"
path =/obj/item/weapon/material/knife
path =/obj/item/material/knife
/datum/category_item/autolathe/general/taperecorder
name = "tape recorder"
path =/obj/item/device/taperecorder
path =/obj/item/taperecorder
/datum/category_item/autolathe/general/tube
name = "light tube"
path =/obj/item/weapon/light/tube
path =/obj/item/light/tube
is_stack = TRUE
/datum/category_item/autolathe/general/bulb
name = "light bulb"
path =/obj/item/weapon/light/bulb
path =/obj/item/light/bulb
is_stack = TRUE
/datum/category_item/autolathe/general/ashtray_glass
name = "glass ashtray"
path =/obj/item/weapon/material/ashtray/glass
path =/obj/item/material/ashtray/glass
/datum/category_item/autolathe/general/weldinggoggles
name = "welding goggles"
@@ -117,20 +117,20 @@
/datum/category_item/autolathe/general/maglight
name = "maglight"
path =/obj/item/device/flashlight/maglight
path =/obj/item/flashlight/maglight
/datum/category_item/autolathe/general/idcard
name = "ID Card"
path = /obj/item/weapon/card/id
path = /obj/item/card/id
resources = list(MAT_STEEL = 100, MAT_GLASS = 100, MAT_PLASTIC = 300)
man_rating = 2
/datum/category_item/autolathe/general/handcuffs
name = "handcuffs"
path =/obj/item/weapon/handcuffs
path =/obj/item/handcuffs
hidden = 1
/datum/category_item/autolathe/general/legcuffs
name = "legcuffs"
path =/obj/item/weapon/handcuffs/legcuffs
path =/obj/item/handcuffs/legcuffs
hidden = 1
code/datums/autolathe/general_vr.dm
+2 -2
View File
@@ -4,9 +4,9 @@
/datum/category_item/autolathe/general/drinkingglass/carafe
name = "glass carafe"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/carafe
path =/obj/item/reagent_containers/food/drinks/glass2/carafe
/datum/category_item/autolathe/general/drinkingglass/pitcher
name = "plastic pitcher"
path =/obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher
path =/obj/item/reagent_containers/food/drinks/glass2/pitcher
code/datums/autolathe/medical.dm
+11 -11
View File
@@ -1,43 +1,43 @@
/datum/category_item/autolathe/medical/scalpel
name = "scalpel"
path =/obj/item/weapon/surgical/scalpel
path =/obj/item/surgical/scalpel
/datum/category_item/autolathe/medical/circularsaw
name = "circular saw"
path =/obj/item/weapon/surgical/circular_saw
path =/obj/item/surgical/circular_saw
/datum/category_item/autolathe/medical/surgicaldrill
name = "surgical drill"
path =/obj/item/weapon/surgical/surgicaldrill
path =/obj/item/surgical/surgicaldrill
/datum/category_item/autolathe/medical/retractor
name = "retractor"
path =/obj/item/weapon/surgical/retractor
path =/obj/item/surgical/retractor
/datum/category_item/autolathe/medical/cautery
name = "cautery"
path =/obj/item/weapon/surgical/cautery
path =/obj/item/surgical/cautery
/datum/category_item/autolathe/medical/hemostat
name = "hemostat"
path =/obj/item/weapon/surgical/hemostat
path =/obj/item/surgical/hemostat
/datum/category_item/autolathe/medical/beaker
name = "glass beaker"
path =/obj/item/weapon/reagent_containers/glass/beaker
path =/obj/item/reagent_containers/glass/beaker
/datum/category_item/autolathe/medical/beaker_large
name = "large glass beaker"
path =/obj/item/weapon/reagent_containers/glass/beaker/large
path =/obj/item/reagent_containers/glass/beaker/large
/datum/category_item/autolathe/medical/vial
name = "glass vial"
path =/obj/item/weapon/reagent_containers/glass/beaker/vial
path =/obj/item/reagent_containers/glass/beaker/vial
/datum/category_item/autolathe/medical/syringe
name = "syringe"
path =/obj/item/weapon/reagent_containers/syringe
path =/obj/item/reagent_containers/syringe
/datum/category_item/autolathe/medical/implanter
name = "implanter"
path =/obj/item/weapon/implanter
path =/obj/item/implanter
code/datums/autolathe/medical_vr.dm
+2 -2
View File
@@ -1,9 +1,9 @@
/datum/category_item/autolathe/medical/autoinjector
name = "empty autoinjector"
path =/obj/item/weapon/reagent_containers/hypospray/autoinjector/empty
path =/obj/item/reagent_containers/hypospray/autoinjector/empty
resources = list(MAT_PLASTIC = 10) //for recycling purposes mostly
/datum/category_item/autolathe/medical/autoinjector/biginjector
name = "empty large autoinjector"
path =/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/empty
path =/obj/item/reagent_containers/hypospray/autoinjector/biginjector/empty
resources = list(MAT_PLASTIC = 500)
code/datums/autolathe/tools.dm
+15 -15
View File
@@ -1,65 +1,65 @@
/datum/category_item/autolathe/tools/crowbar
name = "crowbar"
path =/obj/item/weapon/tool/crowbar
path =/obj/item/tool/crowbar
/datum/category_item/autolathe/tools/multitool
name = "multitool"
path =/obj/item/device/multitool
path =/obj/item/multitool
/datum/category_item/autolathe/tools/t_scanner
name = "T-ray scanner"
path =/obj/item/device/t_scanner
path =/obj/item/t_scanner
/datum/category_item/autolathe/tools/weldertool
name = "welding tool"
path =/obj/item/weapon/weldingtool
path =/obj/item/weldingtool
/datum/category_item/autolathe/tools/electric_welder
name = "electric welding tool"
path =/obj/item/weapon/weldingtool/electric/unloaded
path =/obj/item/weldingtool/electric/unloaded
hidden = 1
/datum/category_item/autolathe/tools/screwdriver
name = "screwdriver"
path =/obj/item/weapon/tool/screwdriver
path =/obj/item/tool/screwdriver
/datum/category_item/autolathe/tools/wirecutters
name = "wirecutters"
path =/obj/item/weapon/tool/wirecutters
path =/obj/item/tool/wirecutters
/datum/category_item/autolathe/tools/wrench
name = "wrench"
path =/obj/item/weapon/tool/wrench
path =/obj/item/tool/wrench
/datum/category_item/autolathe/tools/hatchet
name = "hatchet"
path =/obj/item/weapon/material/knife/machete/hatchet
path =/obj/item/material/knife/machete/hatchet
/datum/category_item/autolathe/tools/minihoe
name = "mini hoe"
path =/obj/item/weapon/material/minihoe
path =/obj/item/material/minihoe
/datum/category_item/autolathe/tools/welder_industrial
name = "industrial welding tool"
path =/obj/item/weapon/weldingtool/largetank
path =/obj/item/weldingtool/largetank
/datum/category_item/autolathe/tools/spraybottle
name = "spray bottle"
path = /obj/item/weapon/reagent_containers/spray
path = /obj/item/reagent_containers/spray
resources = list(MAT_PLASTIC = 2000)
/datum/category_item/autolathe/devices/slowwire
name = "snare wire"
path = /obj/item/weapon/material/barbedwire/plastic
path = /obj/item/material/barbedwire/plastic
resources = list(MAT_PLASTIC = 10000)
/datum/category_item/autolathe/tools/spraynozzle
name = "spray nozzle"
path = /obj/item/weapon/reagent_containers/spray
path = /obj/item/reagent_containers/spray
resources = list(MAT_PLASTIC = 5000, MAT_STEEL = 2000)
hidden = 1
man_rating = 2
/datum/category_item/autolathe/tools/rsf
name = "rapid service fabricator"
path = /obj/item/weapon/rsf
path = /obj/item/rsf
code/datums/autolathe/tools_vr.dm
+1 -1
View File
@@ -1,3 +1,3 @@
/datum/category_item/autolathe/tools/prybar
name = "prybar"
path =/obj/item/weapon/tool/prybar
path =/obj/item/tool/prybar
code/datums/chat_message.dm
+1 -1
View File
@@ -379,7 +379,7 @@ var/list/runechat_image_cache = list()
return src
/mob/runechat_holder(datum/chatmessage/CM)
if(istype(loc, /obj/item/weapon/holder))
if(istype(loc, /obj/item/holder))
return loc
return ..()
code/datums/components/crafting/crafting.dm
+10 -10
View File
@@ -92,8 +92,8 @@
.["tool_qualities"] |= item.tool_qualities
.["other"][item.type] += 1
else
if(istype(item, /obj/item/weapon/reagent_containers))
var/obj/item/weapon/reagent_containers/container = item
if(istype(item, /obj/item/reagent_containers))
var/obj/item/reagent_containers/container = item
// if(container.is_drainable())
if(container.is_open_container()) // this isn't exactly the same
for(var/datum/reagent/reagent in container.reagents.reagent_list)
@@ -157,7 +157,7 @@
for(var/obj/item/contained_item in source.contents)
// if(contained_item.GetComponent(/datum/component/storage))
if(istype(contained_item, /obj/item/weapon/storage)) // cursed
if(istype(contained_item, /obj/item/storage)) // cursed
for(var/obj/item/subcontained_item in contained_item.contents)
available_tools[subcontained_item.type] = TRUE
for(var/behavior in subcontained_item.tool_qualities)
@@ -290,7 +290,7 @@
var/datum/reagent/reagent = path_key
var/id = initial(reagent.id)
for(var/obj/item/weapon/reagent_containers/RC in surroundings)
for(var/obj/item/reagent_containers/RC in surroundings)
// Found everything we need
if(amt <= 0 && amt_to_transfer <= 0)
break
@@ -338,8 +338,8 @@
continue
// Special case: the reagents may be needed for other recipes
if(istype(I, /obj/item/weapon/reagent_containers))
var/obj/item/weapon/reagent_containers/RC = I
if(istype(I, /obj/item/reagent_containers))
var/obj/item/reagent_containers/RC = I
if(RC.reagents.total_volume > 0)
continue
@@ -354,12 +354,12 @@
// Snowflake handling of reagent containers and storage atoms.
// If we consumed them in our crafting, we should dump their contents out before qdeling them.
if(istype(I, /obj/item/weapon/reagent_containers))
var/obj/item/weapon/reagent_containers/container = I
if(istype(I, /obj/item/reagent_containers))
var/obj/item/reagent_containers/container = I
container.reagents.clear_reagents()
// container.reagents.expose(container.loc, TOUCH)
else if(istype(I, /obj/item/weapon/storage))
var/obj/item/weapon/storage/container = I
else if(istype(I, /obj/item/storage))
var/obj/item/storage/container = I
container.spill()
container.close_all()
qdel(I)
code/datums/components/crafting/recipes.dm
+3 -3
View File
@@ -58,9 +58,9 @@
// Locate one of the things that set the material type, and update it from the default (glass)
/datum/crafting_recipe/spear/on_craft_completion(mob/user, atom/result)
var/obj/item/weapon/material/M
var/obj/item/material/M
for(var/path in parts)
var/obj/item/weapon/material/N = locate(path) in result
var/obj/item/material/N = locate(path) in result
if(istype(N, path))
if(!istype(M))
M = N
@@ -69,6 +69,6 @@
if(!istype(M))
return
var/obj/item/weapon/material/twohanded/spear/S = result
var/obj/item/material/twohanded/spear/S = result
S.set_material(M.material.name)
qdel(M)
code/datums/components/crafting/recipes/survival.dm
+20 -20
View File
@@ -1,6 +1,6 @@
/datum/crafting_recipe/shovel
name = "Wooden Shovel"
result = /obj/item/weapon/shovel/wood
result = /obj/item/shovel/wood
reqs = list(
list(/obj/item/stack/material/stick = 5),
list(/obj/item/stack/material/wood = 1),
@@ -13,7 +13,7 @@
/datum/crafting_recipe/stoneblade
name = "stone blade"
result = /obj/item/weapon/material/knife/stone
result = /obj/item/material/knife/stone
reqs = list(
list(/obj/item/stack/material/flint = 2)
)
@@ -23,9 +23,9 @@
/datum/crafting_recipe/stonewoodknife
name = "stone knife"
result = /obj/item/weapon/material/knife/stone/wood
result = /obj/item/material/knife/stone/wood
reqs = list(
list(/obj/item/weapon/material/knife/stone = 1),
list(/obj/item/material/knife/stone = 1),
list(/obj/item/stack/material/flint = 1),
list(/obj/item/stack/material/wood = 1),
list(/obj/item/stack/material/fiber = 3)
@@ -36,11 +36,11 @@
/datum/crafting_recipe/stoneboneknife
name = "stone knife"
result = /obj/item/weapon/material/knife/stone/bone
result = /obj/item/material/knife/stone/bone
reqs = list(
list(/obj/item/weapon/material/knife/stone = 1),
list(/obj/item/material/knife/stone = 1),
list(/obj/item/stack/material/flint = 1),
list(/obj/item/weapon/bone = 1),
list(/obj/item/bone = 1),
list(/obj/item/stack/material/fiber = 3)
)
time = 120
@@ -49,7 +49,7 @@
/datum/crafting_recipe/woodbucket
name = "wooden bucket"
result = /obj/item/weapon/reagent_containers/glass/bucket/wood
result = /obj/item/reagent_containers/glass/bucket/wood
reqs = list(
list(/obj/item/stack/material/wood = 1),
list(/obj/item/stack/material/stick = 1),
@@ -62,15 +62,15 @@
name = "sticks"
result = /obj/item/stack/material/stick/fivestack
reqs = list(list(/obj/item/stack/material/wood = 1))
tool_paths = list(/obj/item/weapon/material/knife)
tool_paths = list(/obj/item/material/knife)
time = 200
category = CAT_MISC
/datum/crafting_recipe/stonewoodaxe
name = "stone axe"
result = /obj/item/weapon/material/knife/machete/hatchet/stone
result = /obj/item/material/knife/machete/hatchet/stone
reqs = list(
list(/obj/item/weapon/material/knife/stone = 1),
list(/obj/item/material/knife/stone = 1),
list(/obj/item/stack/material/flint = 1),
list(/obj/item/stack/material/stick = 1),
list(/obj/item/stack/material/fiber = 3)
@@ -81,11 +81,11 @@
/datum/crafting_recipe/stoneboneaxe
name = "stone axe"
result = /obj/item/weapon/material/knife/machete/hatchet/stone/bone
result = /obj/item/material/knife/machete/hatchet/stone/bone
reqs = list(
list(/obj/item/weapon/material/knife/stone = 1),
list(/obj/item/material/knife/stone = 1),
list(/obj/item/stack/material/flint = 1),
list(/obj/item/weapon/bone = 1),
list(/obj/item/bone = 1),
list(/obj/item/stack/material/fiber = 3)
)
time = 120
@@ -94,9 +94,9 @@
/datum/crafting_recipe/stonewoodspear
name = "stone spear"
result = /obj/item/weapon/material/twohanded/spear/flint
result = /obj/item/material/twohanded/spear/flint
reqs = list(
list(/obj/item/weapon/material/knife/stone = 1),
list(/obj/item/material/knife/stone = 1),
list(/obj/item/stack/material/flint = 1),
list(/obj/item/stack/material/wood = 2),
list(/obj/item/stack/material/fiber = 3)
@@ -107,11 +107,11 @@
/datum/crafting_recipe/stonebonespear
name = "stone spear"
result = /obj/item/weapon/material/twohanded/spear/flint
result = /obj/item/material/twohanded/spear/flint
reqs = list(
list(/obj/item/weapon/material/knife/stone = 1),
list(/obj/item/material/knife/stone = 1),
list(/obj/item/stack/material/flint = 1),
list(/obj/item/weapon/bone = 2),
list(/obj/item/bone = 2),
list(/obj/item/stack/material/fiber = 3)
)
time = 120
@@ -120,7 +120,7 @@
/datum/crafting_recipe/ropebindings
name = "rope bindings"
result = /obj/item/weapon/handcuffs/cable/plantfiber
result = /obj/item/handcuffs/cable/plantfiber
reqs = list(list(/obj/item/stack/material/fiber = 3))
time = 60
category = CAT_MISC
code/datums/components/crafting/recipes/weapons.dm
+17 -17
View File
@@ -1,30 +1,30 @@
/datum/crafting_recipe/stunprod
name = "Stunprod"
result = /obj/item/weapon/melee/baton/cattleprod
reqs = list(list(/obj/item/weapon/handcuffs/cable = 1),
result = /obj/item/melee/baton/cattleprod
reqs = list(list(/obj/item/handcuffs/cable = 1),
list(/obj/item/stack/rods = 1),
list(/obj/item/weapon/tool/wirecutters = 1))
list(/obj/item/tool/wirecutters = 1))
time = 40
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/spear
name = "Spear"
result = /obj/item/weapon/material/twohanded/spear
reqs = list(list(/obj/item/weapon/handcuffs/cable = 1),
result = /obj/item/material/twohanded/spear
reqs = list(list(/obj/item/handcuffs/cable = 1),
list(/obj/item/stack/rods = 1),
list(/obj/item/weapon/material/shard = 1,
/obj/item/weapon/material/butterflyblade = 1)
list(/obj/item/material/shard = 1,
/obj/item/material/butterflyblade = 1)
)
parts = list(/obj/item/weapon/material/shard = 1,
/obj/item/weapon/material/butterflyblade = 1)
parts = list(/obj/item/material/shard = 1,
/obj/item/material/butterflyblade = 1)
time = 40
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/shortbow
name = "Shortbow"
result = /obj/item/weapon/gun/launcher/crossbow/bow
result = /obj/item/gun/launcher/crossbow/bow
reqs = list(list(/obj/item/stack/material/wood = 10),
list(/obj/item/stack/material/cloth = 5))
time = 120
@@ -33,7 +33,7 @@
/datum/crafting_recipe/arrow_sandstone
name = "Wood arrow (sandstone tip)"
result = /obj/item/weapon/arrow/standard
result = /obj/item/arrow/standard
reqs = list(list(/obj/item/stack/material/wood = 2),
list(/obj/item/stack/material/sandstone = 2))
time = 40
@@ -42,7 +42,7 @@
/datum/crafting_recipe/arrow_marble
name = "Wood arrow (marble tip)"
result = /obj/item/weapon/arrow/standard
result = /obj/item/arrow/standard
reqs = list(list(/obj/item/stack/material/wood = 2),
list(/obj/item/stack/material/marble = 2))
time = 40
@@ -51,17 +51,17 @@
/datum/crafting_recipe/primitive_shield
name = "Primitive Shield"
result = /obj/item/weapon/shield/primitive
reqs = list(list(/obj/item/stack/material/wood = 2), list(/obj/item/weapon/reagent_containers/glass/bucket/wood =1), list(/obj/item/stack/material/cloth = 5))
result = /obj/item/shield/primitive
reqs = list(list(/obj/item/stack/material/wood = 2), list(/obj/item/reagent_containers/glass/bucket/wood =1), list(/obj/item/stack/material/cloth = 5))
time = 120
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
/datum/crafting_recipe/scopedrifle
name = "Bolt scope to bolt-action (cannot be removed)"
result = /obj/item/weapon/gun/projectile/shotgun/pump/rifle/scoped
reqs = list(list(/obj/item/device/binoculars/scope = 1),
list(/obj/item/weapon/gun/projectile/shotgun/pump/rifle = 1))
result = /obj/item/gun/projectile/shotgun/pump/rifle/scoped
reqs = list(list(/obj/item/binoculars/scope = 1),
list(/obj/item/gun/projectile/shotgun/pump/rifle = 1))
time = 180
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
code/datums/components/recursive_move.dm
+3 -3
View File
@@ -106,14 +106,14 @@
parents.Cut()
//the banana peel of testing stays
/obj/item/weapon/bananapeel/testing
/obj/item/bananapeel/testing
name = "banana peel of testing"
desc = "spams world log with debugging information"
/obj/item/weapon/bananapeel/testing/proc/shmove(var/atom/source, var/atom/old_loc, var/atom/new_loc)
/obj/item/bananapeel/testing/proc/shmove(var/atom/source, var/atom/old_loc, var/atom/new_loc)
world.log << "the [source] moved from [old_loc]([old_loc.x],[old_loc.y],[old_loc.z]) to [new_loc]([new_loc.x],[new_loc.y],[new_loc.z])"
/obj/item/weapon/bananapeel/testing/Initialize()
/obj/item/bananapeel/testing/Initialize()
. = ..()
AddComponent(/datum/component/recursive_move)
RegisterSignal(src, COMSIG_OBSERVER_MOVED, PROC_REF(shmove))
code/datums/helper_datums/teleport.dm
+8 -8
View File
@@ -1,8 +1,8 @@
var/bluespace_item_types = newlist(/obj/item/weapon/storage/backpack/holding,
/obj/item/weapon/storage/bag/trash/holding,
/obj/item/weapon/storage/pouch/holding,
/obj/item/weapon/storage/belt/utility/holding,
/obj/item/weapon/storage/belt/medical/holding
var/bluespace_item_types = newlist(/obj/item/storage/backpack/holding,
/obj/item/storage/bag/trash/holding,
/obj/item/storage/pouch/holding,
/obj/item/storage/belt/utility/holding,
/obj/item/storage/belt/medical/holding
)
//wrapper
@@ -183,11 +183,11 @@ var/bluespace_item_types = newlist(/obj/item/weapon/storage/backpack/holding,
return 1
/datum/teleport/instant/science/teleportChecks()
if(istype(teleatom, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite
if(istype(teleatom, /obj/item/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
return 0
if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/disk/nuclear)))
if(!isemptylist(teleatom.search_contents_for(/obj/item/disk/nuclear)))
if(istype(teleatom, /mob/living))
var/mob/living/MM = teleatom
MM.visible_message("<span class='danger'>\The [MM] bounces off of the portal!</span>","<span class='warning'>Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through.</span>")
@@ -200,7 +200,7 @@ var/bluespace_item_types = newlist(/obj/item/weapon/storage/backpack/holding,
var/obj/mecha/MM = teleatom
to_chat(MM.occupant, "<span class='danger'>\The [MM] would not survive the jump to a location so far away!</span>")
return 0
if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding)))
if(!isemptylist(teleatom.search_contents_for(/obj/item/storage/backpack/holding)))
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
return 0
*/ //VOREStation Removal End
code/datums/mind.dm
+5 -5
View File
@@ -348,7 +348,7 @@
switch(href_list["implant"])
if("remove")
for(var/obj/item/weapon/implant/loyalty/I in H.contents)
for(var/obj/item/implant/loyalty/I in H.contents)
for(var/obj/item/organ/external/organs in H.organs)
if(I in organs.implants)
qdel(I)
@@ -410,7 +410,7 @@
memory = null//Remove any memory they may have had.
if("crystals")
if (usr.client.holder.rights & R_FUN)
// var/obj/item/device/uplink/hidden/suplink = find_syndicate_uplink() No longer needed, uses stored in mind
// var/obj/item/uplink/hidden/suplink = find_syndicate_uplink() No longer needed, uses stored in mind
var/crystals
crystals = tcrystals
crystals = tgui_input_number(usr, "Amount of telecrystals for [key]", crystals)
@@ -433,7 +433,7 @@
return null
/datum/mind/proc/take_uplink()
var/obj/item/device/uplink/hidden/H = find_syndicate_uplink()
var/obj/item/uplink/hidden/H = find_syndicate_uplink()
if(H)
qdel(H)
@@ -448,10 +448,10 @@
var/is_currently_brigged = 0
if(istype(T.loc,/area/security/brig))
is_currently_brigged = 1
for(var/obj/item/weapon/card/id/card in current)
for(var/obj/item/card/id/card in current)
is_currently_brigged = 0
break // if they still have ID they're not brigged
for(var/obj/item/device/pda/P in current)
for(var/obj/item/pda/P in current)
if(P.id)
is_currently_brigged = 0
break // if they still have ID they're not brigged
code/datums/outfits/costumes/halloween.dm
+11 -11
View File
@@ -6,7 +6,7 @@
mask = /obj/item/clothing/mask/surgical
head = /obj/item/clothing/head/welding
suit = /obj/item/clothing/suit/storage/apron
r_hand = /obj/item/weapon/material/twohanded/fireaxe/foam
r_hand = /obj/item/material/twohanded/fireaxe/foam
/decl/hierarchy/outfit/costume/masked_killer/post_equip(var/mob/living/carbon/human/H)
var/victim = get_mannequin(H.ckey)
@@ -22,10 +22,10 @@
l_pocket = /obj/item/toy/sword
/decl/hierarchy/outfit/costume/professional/post_equip(var/mob/living/carbon/human/H)
var/obj/item/weapon/storage/briefcase/new_briefcase = new(H)
var/obj/item/storage/briefcase/new_briefcase = new(H)
for(var/obj/item/briefcase_item in new_briefcase)
qdel(briefcase_item)
new_briefcase.contents += new /obj/item/weapon/gun/projectile/pistol/toy
new_briefcase.contents += new /obj/item/gun/projectile/pistol/toy
new_briefcase.contents += new /obj/item/ammo_magazine/mfoam_dart/pistol
new_briefcase.contents += new /obj/item/clothing/mask/gas/clown_hat
H.equip_to_slot_or_del(new_briefcase, slot_l_hand)
@@ -38,7 +38,7 @@
glasses = /obj/item/clothing/glasses/fakesunglasses
mask = /obj/item/clothing/mask/fakemoustache
head = /obj/item/clothing/head/beret
r_hand = /obj/item/weapon/gun/projectile/revolver/capgun
r_hand = /obj/item/gun/projectile/revolver/capgun
/decl/hierarchy/outfit/costume/horrorcop/post_equip(var/mob/living/carbon/human/H)
var/obj/item/clothing/under/U = H.w_uniform
@@ -55,7 +55,7 @@
head = /obj/item/clothing/head/cowboy
gloves = /obj/item/clothing/gloves/fingerless
suit = /obj/item/clothing/accessory/poncho
r_hand = /obj/item/weapon/gun/projectile/revolver/capgun
r_hand = /obj/item/gun/projectile/revolver/capgun
/decl/hierarchy/outfit/costume/cowboy/post_equip(var/mob/living/carbon/human/H)
var/obj/item/clothing/under/U = H.w_uniform
@@ -72,7 +72,7 @@
head = /obj/item/clothing/head/beanie
gloves = /obj/item/clothing/gloves/fingerless
suit = /obj/item/clothing/suit/storage/flannel/red
r_hand = /obj/item/weapon/material/twohanded/fireaxe/foam
r_hand = /obj/item/material/twohanded/fireaxe/foam
/decl/hierarchy/outfit/costume/firefighter
name = OUTFIT_COSTUME("Firefighter")
@@ -87,14 +87,14 @@
uniform = /obj/item/clothing/under/kilt
shoes = /obj/item/clothing/shoes/boots/jackboots
head = /obj/item/clothing/head/beret
r_hand = /obj/item/weapon/material/sword/foam
r_hand = /obj/item/material/sword/foam
/decl/hierarchy/outfit/costume/vampire
name = OUTFIT_COSTUME("Vampire")
uniform = /obj/item/clothing/under/suit_jacket/really_black
shoes = /obj/item/clothing/shoes/dress
gloves = /obj/item/clothing/gloves/white
r_hand = /obj/item/weapon/bedsheet/red
r_hand = /obj/item/bedsheet/red
/decl/hierarchy/outfit/costume/vampire_hunter
name = OUTFIT_COSTUME("Vampire Hunter")
@@ -102,8 +102,8 @@
suit = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless
shoes = /obj/item/clothing/shoes/boots/jackboots
gloves = /obj/item/clothing/gloves/fingerless
l_pocket = /obj/item/weapon/gun/projectile/revolver/toy/crossbow/halloween
r_pocket = /obj/item/device/flashlight/color/red
l_pocket = /obj/item/gun/projectile/revolver/toy/crossbow/halloween
r_pocket = /obj/item/flashlight/color/red
/decl/hierarchy/outfit/costume/pirate
name = OUTFIT_COSTUME("Pirate")
@@ -127,4 +127,4 @@
shoes = /obj/item/clothing/shoes/brown
head = /obj/item/clothing/head/marine
suit = /obj/item/clothing/suit/marine
r_hand = /obj/item/weapon/gun/projectile/revolver/toy/sawnoff
r_hand = /obj/item/gun/projectile/revolver/toy/sawnoff
code/datums/outfits/horror_killers.dm
+17 -17
View File
@@ -5,14 +5,14 @@
gloves = /obj/item/clothing/gloves/black
mask = /obj/item/clothing/mask/gas/clown_hat
head = /obj/item/clothing/head/chaplain_hood
l_ear = /obj/item/device/radio/headset
l_ear = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/thermal/plain/monocle
suit = /obj/item/clothing/suit/storage/hooded/chaplain_hoodie
r_pocket = /obj/item/weapon/bikehorn
r_hand = /obj/item/weapon/material/twohanded/fireaxe
r_pocket = /obj/item/bikehorn
r_hand = /obj/item/material/twohanded/fireaxe
id_slot = slot_wear_id
id_type = /obj/item/weapon/card/id/syndicate/station_access
id_type = /obj/item/card/id/syndicate/station_access
id_pda_assignment = "Tunnel Clown!"
/decl/hierarchy/outfit/masked_killer
@@ -22,12 +22,12 @@
gloves = /obj/item/clothing/gloves/sterile/latex
mask = /obj/item/clothing/mask/surgical
head = /obj/item/clothing/head/welding
l_ear = /obj/item/device/radio/headset
l_ear = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/thermal/plain/monocle
suit = /obj/item/clothing/suit/storage/apron
l_pocket = /obj/item/weapon/material/knife/tacknife
r_pocket = /obj/item/weapon/surgical/scalpel
r_hand = /obj/item/weapon/material/twohanded/fireaxe
l_pocket = /obj/item/material/knife/tacknife
r_pocket = /obj/item/surgical/scalpel
r_hand = /obj/item/material/twohanded/fireaxe
/decl/hierarchy/outfit/masked_killer/post_equip(var/mob/living/carbon/human/H)
var/victim = get_mannequin(H.ckey)
@@ -39,24 +39,24 @@
uniform = /obj/item/clothing/under/suit_jacket{ starting_accessories=list(/obj/item/clothing/accessory/wcoat) }
shoes = /obj/item/clothing/shoes/black
gloves = /obj/item/clothing/gloves/black
l_ear = /obj/item/device/radio/headset
l_ear = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/sunglasses
l_pocket = /obj/item/weapon/melee/energy/sword
l_pocket = /obj/item/melee/energy/sword
mask = /obj/item/clothing/mask/gas/clown_hat
id_slot = slot_wear_id
id_type = /obj/item/weapon/card/id/syndicate/station_access
id_type = /obj/item/card/id/syndicate/station_access
pda_slot = slot_belt
pda_type = /obj/item/device/pda/heads
pda_type = /obj/item/pda/heads
/decl/hierarchy/outfit/professional/post_equip(var/mob/living/carbon/human/H)
var/obj/item/weapon/storage/secure/briefcase/sec_briefcase = new(H)
var/obj/item/storage/secure/briefcase/sec_briefcase = new(H)
for(var/obj/item/briefcase_item in sec_briefcase)
qdel(briefcase_item)
for(var/i=3, i>0, i--)
sec_briefcase.contents += new /obj/item/weapon/spacecash/c1000
sec_briefcase.contents += new /obj/item/weapon/gun/energy/crossbow
sec_briefcase.contents += new /obj/item/weapon/gun/projectile/revolver/mateba
sec_briefcase.contents += new /obj/item/spacecash/c1000
sec_briefcase.contents += new /obj/item/gun/energy/crossbow
sec_briefcase.contents += new /obj/item/gun/projectile/revolver/mateba
sec_briefcase.contents += new /obj/item/ammo_magazine/s357
sec_briefcase.contents += new /obj/item/weapon/plastique
sec_briefcase.contents += new /obj/item/plastique
H.equip_to_slot_or_del(sec_briefcase, slot_l_hand)
code/datums/outfits/jobs/cargo.dm
+13 -13
View File
@@ -1,30 +1,30 @@
/decl/hierarchy/outfit/job/cargo
l_ear = /obj/item/device/radio/headset/headset_cargo
l_ear = /obj/item/radio/headset/headset_cargo
hierarchy_type = /decl/hierarchy/outfit/job/cargo
/decl/hierarchy/outfit/job/cargo/qm
name = OUTFIT_JOB_NAME("Cargo")
uniform = /obj/item/clothing/under/rank/cargo
l_ear = /obj/item/device/radio/headset/headset_qm //VOREStation Add
l_ear = /obj/item/radio/headset/headset_qm //VOREStation Add
shoes = /obj/item/clothing/shoes/brown
glasses = /obj/item/clothing/glasses/sunglasses
l_hand = /obj/item/weapon/clipboard
id_type = /obj/item/weapon/card/id/cargo/head
pda_type = /obj/item/device/pda/quartermaster
l_hand = /obj/item/clipboard
id_type = /obj/item/card/id/cargo/head
pda_type = /obj/item/pda/quartermaster
/decl/hierarchy/outfit/job/cargo/cargo_tech
name = OUTFIT_JOB_NAME("Cargo technician")
uniform = /obj/item/clothing/under/rank/cargotech
id_type = /obj/item/weapon/card/id/cargo
pda_type = /obj/item/device/pda/cargo
id_type = /obj/item/card/id/cargo
pda_type = /obj/item/pda/cargo
/decl/hierarchy/outfit/job/cargo/mining
name = OUTFIT_JOB_NAME("Shaft miner")
uniform = /obj/item/clothing/under/rank/miner
l_ear = /obj/item/device/radio/headset/headset_mine
backpack = /obj/item/weapon/storage/backpack/industrial
satchel_one = /obj/item/weapon/storage/backpack/satchel/eng
id_type = /obj/item/weapon/card/id/cargo/miner
pda_type = /obj/item/device/pda/shaftminer
backpack_contents = list(/obj/item/weapon/tool/crowbar = 1, /obj/item/weapon/storage/bag/ore = 1)
l_ear = /obj/item/radio/headset/headset_mine
backpack = /obj/item/storage/backpack/industrial
satchel_one = /obj/item/storage/backpack/satchel/eng
id_type = /obj/item/card/id/cargo/miner
pda_type = /obj/item/pda/shaftminer
backpack_contents = list(/obj/item/tool/crowbar = 1, /obj/item/storage/bag/ore = 1)
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
code/datums/outfits/jobs/civilian.dm
+31 -31
View File
@@ -1,6 +1,6 @@
/decl/hierarchy/outfit/job/assistant
name = OUTFIT_JOB_NAME(JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant
id_type = /obj/item/weapon/card/id/generic //VOREStation Edit
id_type = /obj/item/card/id/generic //VOREStation Edit
/decl/hierarchy/outfit/job/assistant/visitor
name = OUTFIT_JOB_NAME(JOB_ALT_VISITOR)
@@ -10,7 +10,7 @@
//VOREStation Add - Interns
/decl/hierarchy/outfit/job/assistant/intern
name = OUTFIT_JOB_NAME(JOB_INTERN)
id_type = /obj/item/weapon/card/id/civilian
id_type = /obj/item/card/id/civilian
//VOREStation Add End - Interns
/decl/hierarchy/outfit/job/assistant/resident
@@ -19,14 +19,14 @@
uniform = /obj/item/clothing/under/color/white
/decl/hierarchy/outfit/job/service
l_ear = /obj/item/device/radio/headset/headset_service
l_ear = /obj/item/radio/headset/headset_service
hierarchy_type = /decl/hierarchy/outfit/job/service
/decl/hierarchy/outfit/job/service/bartender
name = OUTFIT_JOB_NAME(JOB_BARTENDER)
uniform = /obj/item/clothing/under/rank/bartender
id_type = /obj/item/weapon/card/id/civilian/service/bartender //VOREStation Edit
pda_type = /obj/item/device/pda/bar
id_type = /obj/item/card/id/civilian/service/bartender //VOREStation Edit
pda_type = /obj/item/pda/bar
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/bar = 1)
/decl/hierarchy/outfit/job/service/bartender/post_equip(mob/living/carbon/human/H)
@@ -45,8 +45,8 @@
uniform = /obj/item/clothing/under/rank/chef
suit = /obj/item/clothing/suit/chef
head = /obj/item/clothing/head/chefhat
id_type = /obj/item/weapon/card/id/civilian/service/chef //VOREStation Edit
pda_type = /obj/item/device/pda/chef
id_type = /obj/item/card/id/civilian/service/chef //VOREStation Edit
pda_type = /obj/item/pda/chef
/decl/hierarchy/outfit/job/service/chef/cook
name = OUTFIT_JOB_NAME(JOB_ALT_COOK)
@@ -65,47 +65,47 @@
uniform = /obj/item/clothing/under/rank/hydroponics
suit = /obj/item/clothing/suit/storage/apron
gloves = /obj/item/clothing/gloves/botanic_leather
r_pocket = /obj/item/device/analyzer/plant_analyzer
backpack = /obj/item/weapon/storage/backpack/hydroponics
satchel_one = /obj/item/weapon/storage/backpack/satchel/hyd
messenger_bag = /obj/item/weapon/storage/backpack/messenger/hyd
sports_bag = /obj/item/weapon/storage/backpack/sport/hyd
id_type = /obj/item/weapon/card/id/civilian/service/botanist //VOREStation Edit
pda_type = /obj/item/device/pda/botanist
r_pocket = /obj/item/analyzer/plant_analyzer
backpack = /obj/item/storage/backpack/hydroponics
satchel_one = /obj/item/storage/backpack/satchel/hyd
messenger_bag = /obj/item/storage/backpack/messenger/hyd
sports_bag = /obj/item/storage/backpack/sport/hyd
id_type = /obj/item/card/id/civilian/service/botanist //VOREStation Edit
pda_type = /obj/item/pda/botanist
/decl/hierarchy/outfit/job/service/janitor
name = OUTFIT_JOB_NAME(JOB_JANITOR)
uniform = /obj/item/clothing/under/rank/janitor
id_type = /obj/item/weapon/card/id/civilian/service/janitor //VOREStation Edit
pda_type = /obj/item/device/pda/janitor
id_type = /obj/item/card/id/civilian/service/janitor //VOREStation Edit
pda_type = /obj/item/pda/janitor
/decl/hierarchy/outfit/job/librarian
name = OUTFIT_JOB_NAME(JOB_LIBRARIAN)
uniform = /obj/item/clothing/under/suit_jacket/red
l_hand = /obj/item/weapon/barcodescanner
id_type = /obj/item/weapon/card/id/civilian
pda_type = /obj/item/device/pda/librarian
l_hand = /obj/item/barcodescanner
id_type = /obj/item/card/id/civilian
pda_type = /obj/item/pda/librarian
/decl/hierarchy/outfit/job/librarian/journalist
id_type = /obj/item/weapon/card/id/civilian/journalist
id_type = /obj/item/card/id/civilian/journalist
/decl/hierarchy/outfit/job/internal_affairs_agent
name = OUTFIT_JOB_NAME("Internal affairs agent")
l_ear = /obj/item/device/radio/headset/ia
l_ear = /obj/item/radio/headset/ia
uniform = /obj/item/clothing/under/rank/internalaffairs
suit = /obj/item/clothing/suit/storage/toggle/internalaffairs
shoes = /obj/item/clothing/shoes/brown
glasses = /obj/item/clothing/glasses/sunglasses/big
l_hand = /obj/item/weapon/clipboard
id_type = /obj/item/weapon/card/id/civilian/internal_affairs
pda_type = /obj/item/device/pda/lawyer
l_hand = /obj/item/clipboard
id_type = /obj/item/card/id/civilian/internal_affairs
pda_type = /obj/item/pda/lawyer
/decl/hierarchy/outfit/job/chaplain
name = OUTFIT_JOB_NAME(JOB_CHAPLAIN)
uniform = /obj/item/clothing/under/rank/chaplain
l_hand = /obj/item/weapon/storage/bible
id_type = /obj/item/weapon/card/id/civilian/chaplain
pda_type = /obj/item/device/pda/chaplain
l_hand = /obj/item/storage/bible
id_type = /obj/item/card/id/civilian/chaplain
pda_type = /obj/item/pda/chaplain
/decl/hierarchy/outfit/job/explorer
name = OUTFIT_JOB_NAME(JOB_EXPLORER)
@@ -114,10 +114,10 @@
mask = /obj/item/clothing/mask/gas/explorer
suit = /obj/item/clothing/suit/storage/hooded/explorer
gloves = /obj/item/clothing/gloves/black
l_ear = /obj/item/device/radio/headset
l_ear = /obj/item/radio/headset
id_slot = slot_wear_id
id_type = /obj/item/weapon/card/id/exploration //VOREStation Edit
id_type = /obj/item/card/id/exploration //VOREStation Edit
pda_slot = slot_belt
pda_type = /obj/item/device/pda/cargo // Brown looks more rugged
r_pocket = /obj/item/device/gps/explorer
pda_type = /obj/item/pda/cargo // Brown looks more rugged
r_pocket = /obj/item/gps/explorer
id_pda_assignment = JOB_EXPLORER
code/datums/outfits/jobs/civilian_vr.dm
+29 -29
View File
@@ -1,92 +1,92 @@
/decl/hierarchy/outfit/job/assistant/worker
id_type = /obj/item/weapon/card/id/civilian/service
id_type = /obj/item/card/id/civilian/service
/decl/hierarchy/outfit/job/assistant/cargo
id_type = /obj/item/weapon/card/id/cargo
id_type = /obj/item/card/id/cargo
/decl/hierarchy/outfit/job/assistant/engineer
id_type = /obj/item/weapon/card/id/engineering
id_type = /obj/item/card/id/engineering
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
/decl/hierarchy/outfit/job/assistant/medic
id_type = /obj/item/weapon/card/id/medical
id_type = /obj/item/card/id/medical
/decl/hierarchy/outfit/job/assistant/scientist
id_type = /obj/item/weapon/card/id/science
id_type = /obj/item/card/id/science
/decl/hierarchy/outfit/job/assistant/officer
id_type = /obj/item/weapon/card/id/security
id_type = /obj/item/card/id/security
/decl/hierarchy/outfit/job/assistant/entertainer
id_type = /obj/item/weapon/card/id/civilian/entertainer
id_type = /obj/item/card/id/civilian/entertainer
/decl/hierarchy/outfit/job/assistant/entrepreneur
id_type = /obj/item/weapon/card/id/civilian/entrepreneur
l_hand = /obj/item/device/ticket_printer/train
id_type = /obj/item/card/id/civilian/entrepreneur
l_hand = /obj/item/ticket_printer/train
uniform = /obj/item/clothing/under/tropical/pink
/decl/hierarchy/outfit/job/assistant/entrepreneur/lawyer
uniform = /obj/item/clothing/under/lawyer/red
r_hand = /obj/item/weapon/clipboard
l_pocket = /obj/item/weapon/pen/fountain3
r_hand = /obj/item/clipboard
l_pocket = /obj/item/pen/fountain3
/decl/hierarchy/outfit/job/assistant/entrepreneur/private_eye
l_hand = /obj/item/weapon/storage/box/private_investigator
l_hand = /obj/item/storage/box/private_investigator
suit = /obj/item/clothing/suit/storage/trench
head = /obj/item/clothing/head/fedora/brown
/decl/hierarchy/outfit/job/assistant/entrepreneur/bodyguard
glasses = /obj/item/clothing/glasses/sunglasses
l_pocket = /obj/item/weapon/reagent_containers/spray/pepper
l_pocket = /obj/item/reagent_containers/spray/pepper
suit = /obj/item/clothing/accessory/sweater/blackneck
/decl/hierarchy/outfit/job/assistant/entrepreneur/personal_physician
suit = /obj/item/clothing/suit/storage/toggle/labcoat
l_pocket = /obj/item/clothing/accessory/stethoscope
r_pocket = /obj/item/device/healthanalyzer
r_pocket = /obj/item/healthanalyzer
/decl/hierarchy/outfit/job/assistant/entrepreneur/dentist
l_hand = /obj/item/weapon/storage/box/dentist
l_hand = /obj/item/storage/box/dentist
suit = /obj/item/clothing/suit/storage/toggle/labcoat
/decl/hierarchy/outfit/job/assistant/entrepreneur/fitness_instructor
l_hand = /obj/item/weapon/storage/box/fitness_trainer
l_hand = /obj/item/storage/box/fitness_trainer
/decl/hierarchy/outfit/job/assistant/entrepreneur/yoga_teacher
uniform = /obj/item/clothing/under/pants/yogapants
l_hand = /obj/item/weapon/storage/box/yoga_teacher
l_hand = /obj/item/storage/box/yoga_teacher
/decl/hierarchy/outfit/job/assistant/entrepreneur/masseuse
r_hand = /obj/item/roller/massage
/decl/hierarchy/outfit/job/assistant/entrepreneur/tradesperson
r_hand = /obj/item/weapon/storage/toolbox/brass
r_hand = /obj/item/storage/toolbox/brass
/decl/hierarchy/outfit/job/assistant/entrepreneur/streamer
l_pocket = /obj/item/device/tvcamera/streamer
l_pocket = /obj/item/tvcamera/streamer
/decl/hierarchy/outfit/job/assistant/entrepreneur/influencer
l_pocket = /obj/item/device/camera/selfie
l_pocket = /obj/item/camera/selfie
/decl/hierarchy/outfit/job/assistant/entrepreneur/paranormal_investigator
l_hand = /obj/item/weapon/storage/box/paranormal_investigator
l_hand = /obj/item/storage/box/paranormal_investigator
/decl/hierarchy/outfit/job/assistant/entrepreneur/stylist
l_hand = /obj/item/weapon/storage/box/stylist
l_hand = /obj/item/storage/box/stylist
/decl/hierarchy/outfit/job/assistant/entrepreneur/fisher
r_hand = /obj/item/weapon/material/fishing_rod/modern
l_pocket = /obj/item/weapon/material/fishing_net
r_hand = /obj/item/material/fishing_rod/modern
l_pocket = /obj/item/material/fishing_net
head = /obj/item/clothing/head/fishing
r_pocket = /obj/item/weapon/storage/box/wormcan
r_pocket = /obj/item/storage/box/wormcan
/decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary
uniform = /obj/item/clothing/under/lawyer/blue
r_hand = /obj/item/weapon/clipboard
l_pocket = /obj/item/weapon/pen/fountain3
r_hand = /obj/item/clipboard
l_pocket = /obj/item/pen/fountain3
/decl/hierarchy/outfit/job/assistant/entrepreneur/fortune_teller
l_hand = /obj/item/weapon/storage/box/fortune_teller
l_hand = /obj/item/storage/box/fortune_teller
/decl/hierarchy/outfit/job/assistant/entrepreneur/spirit_healer
l_hand = /obj/item/weapon/storage/box/spirit_healer
l_hand = /obj/item/storage/box/spirit_healer
code/datums/outfits/jobs/command.dm
+13 -13
View File
@@ -2,13 +2,13 @@
name = OUTFIT_JOB_NAME(JOB_ALT_CAPTAIN) // Keep Captain for now, not JOB_SITE_MANAGER
glasses = /obj/item/clothing/glasses/sunglasses
uniform = /obj/item/clothing/under/rank/captain
l_ear = /obj/item/device/radio/headset/heads/captain
l_ear = /obj/item/radio/headset/heads/captain
shoes = /obj/item/clothing/shoes/brown
backpack = /obj/item/weapon/storage/backpack/captain
satchel_one = /obj/item/weapon/storage/backpack/satchel/cap
messenger_bag = /obj/item/weapon/storage/backpack/messenger/com
id_type = /obj/item/weapon/card/id/gold
pda_type = /obj/item/device/pda/captain
backpack = /obj/item/storage/backpack/captain
satchel_one = /obj/item/storage/backpack/satchel/cap
messenger_bag = /obj/item/storage/backpack/messenger/com
id_type = /obj/item/card/id/gold
pda_type = /obj/item/pda/captain
/decl/hierarchy/outfit/job/captain/post_equip(var/mob/living/carbon/human/H)
..()
@@ -26,18 +26,18 @@
/decl/hierarchy/outfit/job/hop
name = OUTFIT_JOB_NAME(JOB_HEAD_OF_PERSONNEL)
uniform = /obj/item/clothing/under/rank/head_of_personnel
l_ear = /obj/item/device/radio/headset/heads/hop
l_ear = /obj/item/radio/headset/heads/hop
shoes = /obj/item/clothing/shoes/brown
id_type = /obj/item/weapon/card/id/silver/hop
pda_type = /obj/item/device/pda/heads/hop
id_type = /obj/item/card/id/silver/hop
pda_type = /obj/item/pda/heads/hop
/decl/hierarchy/outfit/job/secretary
name = OUTFIT_JOB_NAME(JOB_COMMAND_SECRETARY)
l_ear = /obj/item/device/radio/headset/headset_com
l_ear = /obj/item/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
r_hand = /obj/item/weapon/clipboard
id_type = /obj/item/card/id/silver/secretary
pda_type = /obj/item/pda/heads
r_hand = /obj/item/clipboard
/decl/hierarchy/outfit/job/secretary/pre_equip(mob/living/carbon/human/H)
..()
code/datums/outfits/jobs/command_vr.dm
+2 -2
View File
@@ -1,5 +1,5 @@
/decl/hierarchy/outfit/job/hop
id_type = /obj/item/weapon/card/id/silver/hop
id_type = /obj/item/card/id/silver/hop
/decl/hierarchy/outfit/job/secretary
id_type = /obj/item/weapon/card/id/silver/secretary
id_type = /obj/item/card/id/silver/secretary
code/datums/outfits/jobs/engineering.dm
+14 -14
View File
@@ -1,12 +1,12 @@
/decl/hierarchy/outfit/job/engineering
hierarchy_type = /decl/hierarchy/outfit/job/engineering
belt = /obj/item/weapon/storage/belt/utility/full/multitool
l_ear = /obj/item/device/radio/headset/headset_eng
belt = /obj/item/storage/belt/utility/full/multitool
l_ear = /obj/item/radio/headset/headset_eng
shoes = /obj/item/clothing/shoes/boots/workboots
r_pocket = /obj/item/device/t_scanner
backpack = /obj/item/weapon/storage/backpack/industrial
satchel_one = /obj/item/weapon/storage/backpack/satchel/eng
messenger_bag = /obj/item/weapon/storage/backpack/messenger/engi
r_pocket = /obj/item/t_scanner
backpack = /obj/item/storage/backpack/industrial
satchel_one = /obj/item/storage/backpack/satchel/eng
messenger_bag = /obj/item/storage/backpack/messenger/engi
pda_slot = slot_l_store
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
@@ -14,21 +14,21 @@
name = OUTFIT_JOB_NAME(JOB_CHIEF_ENGINEER)
head = /obj/item/clothing/head/hardhat/white
uniform = /obj/item/clothing/under/rank/chief_engineer
l_ear = /obj/item/device/radio/headset/heads/ce
l_ear = /obj/item/radio/headset/heads/ce
gloves = /obj/item/clothing/gloves/black
id_type = /obj/item/weapon/card/id/engineering/head
pda_type = /obj/item/device/pda/heads/ce
id_type = /obj/item/card/id/engineering/head
pda_type = /obj/item/pda/heads/ce
/decl/hierarchy/outfit/job/engineering/engineer
name = OUTFIT_JOB_NAME(JOB_ENGINEER)
head = /obj/item/clothing/head/hardhat
uniform = /obj/item/clothing/under/rank/engineer
id_type = /obj/item/weapon/card/id/engineering
pda_type = /obj/item/device/pda/engineering
id_type = /obj/item/card/id/engineering
pda_type = /obj/item/pda/engineering
/decl/hierarchy/outfit/job/engineering/atmos
name = OUTFIT_JOB_NAME(JOB_ATMOSPHERIC_TECHNICIAN)
uniform = /obj/item/clothing/under/rank/atmospheric_technician
belt = /obj/item/weapon/storage/belt/utility/atmostech
id_type = /obj/item/weapon/card/id/engineering/atmos
pda_type = /obj/item/device/pda/atmos
belt = /obj/item/storage/belt/utility/atmostech
id_type = /obj/item/card/id/engineering/atmos
pda_type = /obj/item/pda/atmos
code/datums/outfits/jobs/job.dm
+4 -4
View File
@@ -3,18 +3,18 @@
hierarchy_type = /decl/hierarchy/outfit/job
uniform = /obj/item/clothing/under/color/grey
l_ear = /obj/item/device/radio/headset
l_ear = /obj/item/radio/headset
shoes = /obj/item/clothing/shoes/black
id_slot = slot_wear_id
id_type = /obj/item/weapon/card/id/civilian
id_type = /obj/item/card/id/civilian
pda_slot = slot_belt
pda_type = /obj/item/device/pda
pda_type = /obj/item/pda
flags = OUTFIT_HAS_BACKPACK
/decl/hierarchy/outfit/job/equip_id(mob/living/carbon/human/H, rank, assignment)
var/obj/item/weapon/card/id/C = ..()
var/obj/item/card/id/C = ..()
var/datum/job/J = job_master.GetJob(rank)
if(J)
C.access = J.get_access()
code/datums/outfits/jobs/medical.dm
+29 -29
View File
@@ -1,31 +1,31 @@
/decl/hierarchy/outfit/job/medical
hierarchy_type = /decl/hierarchy/outfit/job/medical
l_ear = /obj/item/device/radio/headset/headset_med
l_ear = /obj/item/radio/headset/headset_med
shoes = /obj/item/clothing/shoes/white
pda_type = /obj/item/device/pda/medical
pda_type = /obj/item/pda/medical
pda_slot = slot_l_store
backpack = /obj/item/weapon/storage/backpack/medic
satchel_one = /obj/item/weapon/storage/backpack/satchel/med
messenger_bag = /obj/item/weapon/storage/backpack/messenger/med
backpack = /obj/item/storage/backpack/medic
satchel_one = /obj/item/storage/backpack/satchel/med
messenger_bag = /obj/item/storage/backpack/messenger/med
/decl/hierarchy/outfit/job/medical/cmo
name = OUTFIT_JOB_NAME(JOB_CHIEF_MEDICAL_OFFICER)
l_ear =/obj/item/device/radio/headset/heads/cmo
l_ear =/obj/item/radio/headset/heads/cmo
uniform = /obj/item/clothing/under/rank/chief_medical_officer
suit = /obj/item/clothing/suit/storage/toggle/labcoat/cmo
shoes = /obj/item/clothing/shoes/brown
l_hand = /obj/item/weapon/storage/firstaid/adv
r_pocket = /obj/item/device/healthanalyzer
id_type = /obj/item/weapon/card/id/medical/head
pda_type = /obj/item/device/pda/heads/cmo
l_hand = /obj/item/storage/firstaid/adv
r_pocket = /obj/item/healthanalyzer
id_type = /obj/item/card/id/medical/head
pda_type = /obj/item/pda/heads/cmo
/decl/hierarchy/outfit/job/medical/doctor
name = OUTFIT_JOB_NAME(JOB_MEDICAL_DOCTOR)
uniform = /obj/item/clothing/under/rank/medical
suit = /obj/item/clothing/suit/storage/toggle/labcoat
l_hand = /obj/item/weapon/storage/firstaid/regular
r_pocket = /obj/item/device/flashlight/pen
id_type = /obj/item/weapon/card/id/medical
l_hand = /obj/item/storage/firstaid/regular
r_pocket = /obj/item/flashlight/pen
id_type = /obj/item/card/id/medical
/decl/hierarchy/outfit/job/medical/doctor/emergency_physician
name = OUTFIT_JOB_NAME(JOB_ALT_EMERGENCY_PHYSICIAN)
@@ -41,8 +41,8 @@
uniform = /obj/item/clothing/under/rank/virologist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/virologist
mask = /obj/item/clothing/mask/surgical
backpack = /obj/item/weapon/storage/backpack/virology
satchel_one = /obj/item/weapon/storage/backpack/satchel/vir
backpack = /obj/item/storage/backpack/virology
satchel_one = /obj/item/storage/backpack/satchel/vir
/decl/hierarchy/outfit/job/medical/doctor/nurse
name = OUTFIT_JOB_NAME(JOB_ALT_NURSE)
@@ -63,28 +63,28 @@
name = OUTFIT_JOB_NAME(JOB_CHEMIST)
uniform = /obj/item/clothing/under/rank/chemist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/chemist
backpack = /obj/item/weapon/storage/backpack/chemistry
satchel_one = /obj/item/weapon/storage/backpack/satchel/chem
sports_bag = /obj/item/weapon/storage/backpack/sport/chem
id_type = /obj/item/weapon/card/id/medical/chemist
pda_type = /obj/item/device/pda/chemist
backpack = /obj/item/storage/backpack/chemistry
satchel_one = /obj/item/storage/backpack/satchel/chem
sports_bag = /obj/item/storage/backpack/sport/chem
id_type = /obj/item/card/id/medical/chemist
pda_type = /obj/item/pda/chemist
/decl/hierarchy/outfit/job/medical/geneticist
name = OUTFIT_JOB_NAME(JOB_GENETICIST)
uniform = /obj/item/clothing/under/rank/geneticist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/genetics
backpack = /obj/item/weapon/storage/backpack/genetics
r_pocket = /obj/item/device/flashlight/pen
satchel_one = /obj/item/weapon/storage/backpack/satchel/gen
id_type = /obj/item/weapon/card/id/medical/geneticist
pda_type = /obj/item/device/pda/geneticist
backpack = /obj/item/storage/backpack/genetics
r_pocket = /obj/item/flashlight/pen
satchel_one = /obj/item/storage/backpack/satchel/gen
id_type = /obj/item/card/id/medical/geneticist
pda_type = /obj/item/pda/geneticist
/decl/hierarchy/outfit/job/medical/psychiatrist
name = OUTFIT_JOB_NAME(JOB_PSYCHIATRIST)
uniform = /obj/item/clothing/under/rank/psych
suit = /obj/item/clothing/suit/storage/toggle/labcoat
shoes = /obj/item/clothing/shoes/laceup
id_type = /obj/item/weapon/card/id/medical/psych
id_type = /obj/item/card/id/medical/psych
/decl/hierarchy/outfit/job/medical/psychiatrist/psychologist
name = OUTFIT_JOB_NAME(JOB_ALT_PSYCHOLOGIST)
@@ -95,10 +95,10 @@
uniform = /obj/item/clothing/under/rank/medical/paramedic
suit = /obj/item/clothing/suit/storage/toggle/fr_jacket
shoes = /obj/item/clothing/shoes/boots/jackboots
l_hand = /obj/item/weapon/storage/firstaid/regular
belt = /obj/item/weapon/storage/belt/medical/emt
l_hand = /obj/item/storage/firstaid/regular
belt = /obj/item/storage/belt/medical/emt
pda_slot = slot_l_store
id_type = /obj/item/weapon/card/id/medical/emt
id_type = /obj/item/card/id/medical/emt
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
/decl/hierarchy/outfit/job/medical/paramedic/emt
code/datums/outfits/jobs/medical_vr.dm
+1 -1
View File
@@ -1,2 +1,2 @@
/decl/hierarchy/outfit/job/medical/doctor/virologist
id_type = /obj/item/weapon/card/id/medical/virologist
id_type = /obj/item/card/id/medical/virologist
code/datums/outfits/jobs/science.dm
+17 -17
View File
@@ -1,43 +1,43 @@
/decl/hierarchy/outfit/job/science
hierarchy_type = /decl/hierarchy/outfit/job/science
l_ear = /obj/item/device/radio/headset/headset_sci
l_ear = /obj/item/radio/headset/headset_sci
suit = /obj/item/clothing/suit/storage/toggle/labcoat
shoes = /obj/item/clothing/shoes/white
pda_type = /obj/item/device/pda/science
backpack = /obj/item/weapon/storage/backpack/toxins
satchel_one = /obj/item/weapon/storage/backpack/satchel/tox
messenger_bag = /obj/item/weapon/storage/backpack/messenger/tox
sports_bag = /obj/item/weapon/storage/backpack/sport/tox
pda_type = /obj/item/pda/science
backpack = /obj/item/storage/backpack/toxins
satchel_one = /obj/item/storage/backpack/satchel/tox
messenger_bag = /obj/item/storage/backpack/messenger/tox
sports_bag = /obj/item/storage/backpack/sport/tox
/decl/hierarchy/outfit/job/science/rd
name = OUTFIT_JOB_NAME("Research Director")
l_ear = /obj/item/device/radio/headset/heads/rd
l_ear = /obj/item/radio/headset/heads/rd
uniform = /obj/item/clothing/under/rank/research_director
shoes = /obj/item/clothing/shoes/brown
l_hand = /obj/item/weapon/clipboard
id_type = /obj/item/weapon/card/id/science/head
pda_type = /obj/item/device/pda/heads/rd
l_hand = /obj/item/clipboard
id_type = /obj/item/card/id/science/head
pda_type = /obj/item/pda/heads/rd
/decl/hierarchy/outfit/job/science/scientist
name = OUTFIT_JOB_NAME(JOB_SCIENTIST)
uniform = /obj/item/clothing/under/rank/scientist
id_type = /obj/item/weapon/card/id/science
id_type = /obj/item/card/id/science
suit = /obj/item/clothing/suit/storage/toggle/labcoat/science
/decl/hierarchy/outfit/job/science/xenobiologist
name = OUTFIT_JOB_NAME(JOB_XENOBIOLOGIST)
uniform = /obj/item/clothing/under/rank/scientist
id_type = /obj/item/weapon/card/id/science
id_type = /obj/item/card/id/science
suit = /obj/item/clothing/suit/storage/toggle/labcoat/science
/decl/hierarchy/outfit/job/science/roboticist
name = OUTFIT_JOB_NAME(JOB_ROBOTICIST)
uniform = /obj/item/clothing/under/rank/roboticist
shoes = /obj/item/clothing/shoes/black
belt = /obj/item/weapon/storage/belt/utility/full/multitool
id_type = /obj/item/weapon/card/id/science
belt = /obj/item/storage/belt/utility/full/multitool
id_type = /obj/item/card/id/science
pda_slot = slot_r_store
pda_type = /obj/item/device/pda/roboticist
backpack = /obj/item/weapon/storage/backpack
satchel_one = /obj/item/weapon/storage/backpack/satchel/norm
pda_type = /obj/item/pda/roboticist
backpack = /obj/item/storage/backpack
satchel_one = /obj/item/storage/backpack/satchel/norm
suit = /obj/item/clothing/suit/storage/toggle/labcoat/roboticist
code/datums/outfits/jobs/science_vr.dm
+2 -2
View File
@@ -1,8 +1,8 @@
/decl/hierarchy/outfit/job/science/xenobiologist
id_type = /obj/item/weapon/card/id/science/xenobiologist
id_type = /obj/item/card/id/science/xenobiologist
/decl/hierarchy/outfit/job/science/xenobotanist
name = OUTFIT_JOB_NAME(JOB_XENOBOTANIST)
uniform = /obj/item/clothing/under/rank/scientist
id_type = /obj/item/weapon/card/id/science/xenobotanist
id_type = /obj/item/card/id/science/xenobotanist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/science
code/datums/outfits/jobs/security.dm
+22 -22
View File
@@ -1,42 +1,42 @@
/decl/hierarchy/outfit/job/security
hierarchy_type = /decl/hierarchy/outfit/job/security
glasses = /obj/item/clothing/glasses/sunglasses/sechud
l_ear = /obj/item/device/radio/headset/headset_sec
l_ear = /obj/item/radio/headset/headset_sec
gloves = /obj/item/clothing/gloves/black
shoes = /obj/item/clothing/shoes/boots/jackboots
backpack = /obj/item/weapon/storage/backpack/security
satchel_one = /obj/item/weapon/storage/backpack/satchel/sec
backpack_contents = list(/obj/item/weapon/handcuffs = 1)
messenger_bag = /obj/item/weapon/storage/backpack/messenger/sec
sports_bag = /obj/item/weapon/storage/backpack/sport/sec
backpack = /obj/item/storage/backpack/security
satchel_one = /obj/item/storage/backpack/satchel/sec
backpack_contents = list(/obj/item/handcuffs = 1)
messenger_bag = /obj/item/storage/backpack/messenger/sec
sports_bag = /obj/item/storage/backpack/sport/sec
/decl/hierarchy/outfit/job/security/hos
name = OUTFIT_JOB_NAME(JOB_HEAD_OF_SECURITY)
l_ear = /obj/item/device/radio/headset/heads/hos
l_ear = /obj/item/radio/headset/heads/hos
uniform = /obj/item/clothing/under/rank/head_of_security
id_type = /obj/item/weapon/card/id/security/head
pda_type = /obj/item/device/pda/heads/hos
id_type = /obj/item/card/id/security/head
pda_type = /obj/item/pda/heads/hos
/decl/hierarchy/outfit/job/security/warden
name = OUTFIT_JOB_NAME(JOB_WARDEN)
uniform = /obj/item/clothing/under/rank/warden
l_pocket = /obj/item/device/flash
id_type = /obj/item/weapon/card/id/security/warden
pda_type = /obj/item/device/pda/warden
l_pocket = /obj/item/flash
id_type = /obj/item/card/id/security/warden
pda_type = /obj/item/pda/warden
/decl/hierarchy/outfit/job/security/detective
name = OUTFIT_JOB_NAME(JOB_DETECTIVE)
head = /obj/item/clothing/head/det
uniform = /obj/item/clothing/under/det
suit = /obj/item/clothing/suit/storage/det_trench
l_pocket = /obj/item/weapon/flame/lighter/zippo
l_pocket = /obj/item/flame/lighter/zippo
shoes = /obj/item/clothing/shoes/laceup
r_hand = /obj/item/weapon/storage/briefcase/crimekit
id_type = /obj/item/weapon/card/id/security/detective
pda_type = /obj/item/device/pda/detective
backpack = /obj/item/weapon/storage/backpack
satchel_one = /obj/item/weapon/storage/backpack/satchel/norm
backpack_contents = list(/obj/item/weapon/storage/box/evidence = 1)
r_hand = /obj/item/storage/briefcase/crimekit
id_type = /obj/item/card/id/security/detective
pda_type = /obj/item/pda/detective
backpack = /obj/item/storage/backpack
satchel_one = /obj/item/storage/backpack/satchel/norm
backpack_contents = list(/obj/item/storage/box/evidence = 1)
//VOREStation Edit - More cyberpunky
/decl/hierarchy/outfit/job/security/detective/forensic
@@ -49,6 +49,6 @@
/decl/hierarchy/outfit/job/security/officer
name = OUTFIT_JOB_NAME(JOB_SECURITY_OFFICER)
uniform = /obj/item/clothing/under/rank/security
l_pocket = /obj/item/device/flash
id_type = /obj/item/weapon/card/id/security
pda_type = /obj/item/device/pda/security
l_pocket = /obj/item/flash
id_type = /obj/item/card/id/security
pda_type = /obj/item/pda/security
code/datums/outfits/jobs/special_vr.dm
+15 -15
View File
@@ -4,10 +4,10 @@
gloves = /obj/item/clothing/gloves/white
shoes = /obj/item/clothing/shoes/laceup
head = /obj/item/clothing/head/beret/centcom/officer
l_ear = /obj/item/device/radio/headset/centcom
l_ear = /obj/item/radio/headset/centcom
glasses = /obj/item/clothing/glasses/omnihud/all
id_type = /obj/item/weapon/card/id/centcom
pda_type = /obj/item/device/pda/centcom
id_type = /obj/item/card/id/centcom
pda_type = /obj/item/pda/centcom
flags = OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
/decl/hierarchy/outfit/job/emergency_responder
@@ -15,11 +15,11 @@
uniform = /obj/item/clothing/under/ert
shoes = /obj/item/clothing/shoes/boots/swat
gloves = /obj/item/clothing/gloves/swat
l_ear = /obj/item/device/radio/headset/ert
l_ear = /obj/item/radio/headset/ert
glasses = /obj/item/clothing/glasses/sunglasses
back = /obj/item/weapon/storage/backpack/satchel
id_type = /obj/item/weapon/card/id/centcom/ERT
pda_type = /obj/item/device/pda/centcom
back = /obj/item/storage/backpack/satchel
id_type = /obj/item/card/id/centcom/ERT
pda_type = /obj/item/pda/centcom
flags = OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
/decl/hierarchy/outfit/job/emergency_responder/post_equip(var/mob/living/carbon/human/H)
@@ -29,12 +29,12 @@
/decl/hierarchy/outfit/job/clown
name = OUTFIT_JOB_NAME(JOB_CLOWN)
uniform = /obj/item/clothing/under/rank/clown
back = /obj/item/weapon/storage/backpack/clown
back = /obj/item/storage/backpack/clown
shoes = /obj/item/clothing/shoes/clown_shoes
mask = /obj/item/clothing/mask/gas/clown_hat
backpack_contents = list(/obj/item/weapon/stamp/clown = 1, /obj/item/weapon/bikehorn = 1)
id_type = /obj/item/weapon/card/id/civilian/clown
pda_type = /obj/item/device/pda/clown
backpack_contents = list(/obj/item/stamp/clown = 1, /obj/item/bikehorn = 1)
id_type = /obj/item/card/id/civilian/clown
pda_type = /obj/item/pda/clown
flags = 0
/decl/hierarchy/outfit/job/mime
@@ -43,11 +43,11 @@
shoes = /obj/item/clothing/shoes/mime
head = /obj/item/clothing/head/soft/mime
mask = /obj/item/clothing/mask/gas/mime
backpack_contents = list(/obj/item/weapon/pen/crayon/mime = 1)
id_type = /obj/item/weapon/card/id/civilian/mime
pda_type = /obj/item/device/pda/mime
backpack_contents = list(/obj/item/pen/crayon/mime = 1)
id_type = /obj/item/card/id/civilian/mime
pda_type = /obj/item/pda/mime
/decl/hierarchy/outfit/job/mime/post_equip(var/mob/living/carbon/human/H)
..()
if(H.backbag == 1)
H.equip_to_slot_or_del(new /obj/item/weapon/pen/crayon/mime(H), slot_l_hand)
H.equip_to_slot_or_del(new /obj/item/pen/crayon/mime(H), slot_l_hand)
code/datums/outfits/military/military.dm
+1 -1
View File
@@ -2,4 +2,4 @@
name = "Military Uniform"
hierarchy_type = /decl/hierarchy/outfit/military
l_ear = /obj/item/device/radio/headset
l_ear = /obj/item/radio/headset
code/datums/outfits/misc.dm
+9 -9
View File
@@ -4,7 +4,7 @@
head = /obj/item/clothing/head/helmet/space
suit = /obj/item/clothing/suit/space
uniform = /obj/item/clothing/under/color/grey
back = /obj/item/weapon/tank/jetpack/oxygen
back = /obj/item/tank/jetpack/oxygen
mask = /obj/item/clothing/mask/breath
flags = OUTFIT_HAS_JETPACK
@@ -14,7 +14,7 @@
head = /obj/item/clothing/head/helmet/space/emergency
suit = /obj/item/clothing/suit/space/emergency
uniform = /obj/item/clothing/under/color/grey
back = /obj/item/weapon/tank/oxygen
back = /obj/item/tank/oxygen
mask = /obj/item/clothing/mask/breath
/decl/hierarchy/outfit/soviet_soldier
@@ -23,29 +23,29 @@
shoes = /obj/item/clothing/shoes/boots/combat
head = /obj/item/clothing/head/ushanka/soviet
gloves = /obj/item/clothing/gloves/combat
back = /obj/item/weapon/storage/backpack/satchel
belt = /obj/item/weapon/gun/projectile/revolver/mateba
back = /obj/item/storage/backpack/satchel
belt = /obj/item/gun/projectile/revolver/mateba
/decl/hierarchy/outfit/soviet_soldier/admiral
name = "Soviet admiral"
head = /obj/item/clothing/head/hgpiratecap
l_ear = /obj/item/device/radio/headset/heads/captain
l_ear = /obj/item/radio/headset/heads/captain
glasses = /obj/item/clothing/glasses/thermal/plain/eyepatch
suit = /obj/item/clothing/suit/hgpirate
id_slot = slot_wear_id
id_type = /obj/item/weapon/card/id/centcom //station
id_type = /obj/item/card/id/centcom //station
id_pda_assignment = "Admiral"
/decl/hierarchy/outfit/merchant
name = "Merchant"
shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/device/radio/headset
l_ear = /obj/item/radio/headset
uniform = /obj/item/clothing/under/color/grey
id_slot = slot_wear_id
id_type = /obj/item/weapon/card/id/civilian //merchant
id_type = /obj/item/card/id/civilian //merchant
pda_slot = slot_r_store
pda_type = /obj/item/device/pda/chef //cause I like the look
pda_type = /obj/item/pda/chef //cause I like the look
id_pda_assignment = "Merchant"
/decl/hierarchy/outfit/merchant/vox
code/datums/outfits/nanotrasen.dm
+8 -8
View File
@@ -3,30 +3,30 @@
uniform = /obj/item/clothing/under/rank/centcom
shoes = /obj/item/clothing/shoes/laceup
gloves = /obj/item/clothing/gloves/white
l_ear = /obj/item/device/radio/headset/heads/hop
l_ear = /obj/item/radio/headset/heads/hop
glasses = /obj/item/clothing/glasses/sunglasses
id_slot = slot_wear_id
id_type = /obj/item/weapon/card/id/centcom //station
id_type = /obj/item/card/id/centcom //station
pda_slot = slot_r_store
pda_type = /obj/item/device/pda/heads
pda_type = /obj/item/pda/heads
/decl/hierarchy/outfit/nanotrasen/representative
name = "Nanotrasen representative"
belt = /obj/item/weapon/clipboard
belt = /obj/item/clipboard
id_pda_assignment = "NanoTrasen Navy Representative"
/decl/hierarchy/outfit/nanotrasen/officer
name = "Nanotrasen officer"
head = /obj/item/clothing/head/beret/centcom/officer
l_ear = /obj/item/device/radio/headset/heads/captain
belt = /obj/item/weapon/gun/energy
l_ear = /obj/item/radio/headset/heads/captain
belt = /obj/item/gun/energy
id_pda_assignment = "NanoTrasen Navy Officer"
/decl/hierarchy/outfit/nanotrasen/captain
name = "Nanotrasen captain"
uniform = /obj/item/clothing/under/rank/centcom_captain
l_ear = /obj/item/device/radio/headset/heads/captain
l_ear = /obj/item/radio/headset/heads/captain
head = /obj/item/clothing/head/beret/centcom/captain
belt = /obj/item/weapon/gun/energy
belt = /obj/item/gun/energy
id_pda_assignment = "NanoTrasen Navy Captain"
code/datums/outfits/outfit.dm
+10 -10
View File
@@ -52,12 +52,12 @@ var/list/outfits_decls_by_type_
var/id_pda_assignment
var/backpack = /obj/item/weapon/storage/backpack
var/satchel_one = /obj/item/weapon/storage/backpack/satchel/norm
var/satchel_two = /obj/item/weapon/storage/backpack/satchel
var/messenger_bag = /obj/item/weapon/storage/backpack/messenger
var/sports_bag = /obj/item/weapon/storage/backpack/sport
var/satchel_three = /obj/item/weapon/storage/backpack/satchel/strapless
var/backpack = /obj/item/storage/backpack
var/satchel_one = /obj/item/storage/backpack/satchel/norm
var/satchel_two = /obj/item/storage/backpack/satchel
var/messenger_bag = /obj/item/storage/backpack/messenger
var/sports_bag = /obj/item/storage/backpack/sport
var/satchel_three = /obj/item/storage/backpack/satchel/strapless
var/flags // Specific flags
@@ -84,7 +84,7 @@ var/list/outfits_decls_by_type_
/decl/hierarchy/outfit/proc/post_equip(mob/living/carbon/human/H)
if(flags & OUTFIT_HAS_JETPACK)
var/obj/item/weapon/tank/jetpack/J = locate(/obj/item/weapon/tank/jetpack) in H
var/obj/item/tank/jetpack/J = locate(/obj/item/tank/jetpack) in H
if(!J)
return
J.toggle()
@@ -95,7 +95,7 @@ var/list/outfits_decls_by_type_
rank = rank || id_pda_assignment
assignment = id_pda_assignment || assignment || rank
var/obj/item/weapon/card/id/W = equip_id(H, rank, assignment)
var/obj/item/card/id/W = equip_id(H, rank, assignment)
if(W)
rank = W.rank
assignment = W.assignment
@@ -164,7 +164,7 @@ var/list/outfits_decls_by_type_
/decl/hierarchy/outfit/proc/equip_id(mob/living/carbon/human/H, rank, assignment)
if(!id_slot || !id_type)
return
var/obj/item/weapon/card/id/W = new id_type(H)
var/obj/item/card/id/W = new id_type(H)
if(id_desc)
W.desc = id_desc
if(rank)
@@ -177,7 +177,7 @@ var/list/outfits_decls_by_type_
/decl/hierarchy/outfit/proc/equip_pda(mob/living/carbon/human/H, rank, assignment)
if(!pda_slot || !pda_type)
return
var/obj/item/device/pda/pda = new pda_type(H)
var/obj/item/pda/pda = new pda_type(H)
if(H.equip_to_slot_or_del(pda, pda_slot))
pda.owner = H.real_name
pda.ownjob = assignment
code/datums/outfits/outfit_vr.dm
+52 -52
View File
@@ -3,20 +3,20 @@
uniform = /obj/item/clothing/under/solgov/utility/army/urban
shoes = /obj/item/clothing/shoes/boots/jackboots
gloves = /obj/item/clothing/gloves/combat
l_ear = /obj/item/device/radio/headset/centcom
l_ear = /obj/item/radio/headset/centcom
r_pocket = /obj/item/ammo_magazine/m95
l_pocket = /obj/item/ammo_magazine/m95
l_hand = /obj/item/ammo_magazine/m95
r_hand = /obj/item/ammo_magazine/m95
back = /obj/item/weapon/gun/projectile/automatic/battlerifle
backpack_contents = list(/obj/item/weapon/storage/box = 1)
back = /obj/item/gun/projectile/automatic/battlerifle
backpack_contents = list(/obj/item/storage/box = 1)
hierarchy_type = /decl/hierarchy/outfit/wizard
head = /obj/item/clothing/head/helmet/combat/USDF
suit = /obj/item/clothing/suit/armor/combat/USDF
belt = /obj/item/weapon/storage/belt/security/tactical
belt = /obj/item/storage/belt/security/tactical
/decl/hierarchy/outfit/USDF/Marine/equip_id(mob/living/carbon/human/H)
var/obj/item/weapon/card/id/C = ..()
var/obj/item/card/id/C = ..()
C.name = "[H.real_name]'s military ID Card"
C.icon_state = "lifetime"
C.access = get_all_station_access()
@@ -29,17 +29,17 @@
name = "USDF officer"
head = /obj/item/clothing/head/dress/army/command
shoes = /obj/item/clothing/shoes/boots/jackboots
l_ear = /obj/item/device/radio/headset/centcom
l_ear = /obj/item/radio/headset/centcom
uniform = /obj/item/clothing/under/solgov/mildress/army/command
back = /obj/item/weapon/storage/backpack/satchel
belt = /obj/item/weapon/gun/projectile/revolver/consul
back = /obj/item/storage/backpack/satchel
belt = /obj/item/gun/projectile/revolver/consul
l_pocket = /obj/item/ammo_magazine/s44
r_pocket = /obj/item/ammo_magazine/s44
r_hand = /obj/item/clothing/accessory/holster/hip
l_hand = /obj/item/clothing/accessory/tie/black
/decl/hierarchy/outfit/USDF/Officer/equip_id(mob/living/carbon/human/H)
var/obj/item/weapon/card/id/C = ..()
var/obj/item/card/id/C = ..()
C.name = "[H.real_name]'s military ID Card"
C.icon_state = "lifetime"
C.access = get_all_station_access()
@@ -51,16 +51,16 @@
/decl/hierarchy/outfit/solcom/representative
name = "SolCom Representative"
shoes = /obj/item/clothing/shoes/laceup
l_ear = /obj/item/device/radio/headset/centcom
l_ear = /obj/item/radio/headset/centcom
uniform = /obj/item/clothing/under/suit_jacket/navy
back = /obj/item/weapon/storage/backpack/satchel
l_pocket = /obj/item/weapon/pen/blue
r_pocket = /obj/item/weapon/pen/red
r_hand = /obj/item/device/pda/centcom
l_hand = /obj/item/weapon/clipboard
back = /obj/item/storage/backpack/satchel
l_pocket = /obj/item/pen/blue
r_pocket = /obj/item/pen/red
r_hand = /obj/item/pda/centcom
l_hand = /obj/item/clipboard
/decl/hierarchy/outfit/solcom/representative/equip_id(mob/living/carbon/human/H)
var/obj/item/weapon/card/id/C = ..()
var/obj/item/card/id/C = ..()
C.name = "[H.real_name]'s SolCom ID Card"
C.icon_state = "lifetime"
C.access = get_all_station_access()
@@ -74,33 +74,33 @@
head = /obj/item/clothing/head/helmet/combat/imperial
shoes =/obj/item/clothing/shoes/leg_guard/combat/imperial
gloves = /obj/item/clothing/gloves/arm_guard/combat/imperial
l_ear = /obj/item/device/radio/headset/syndicate
l_ear = /obj/item/radio/headset/syndicate
uniform = /obj/item/clothing/under/imperial
mask = /obj/item/clothing/mask/gas/imperial
suit = /obj/item/clothing/suit/armor/combat/imperial
back = /obj/item/weapon/storage/backpack/satchel
belt = /obj/item/weapon/storage/belt/security/tactical/bandolier
l_pocket = /obj/item/weapon/cell/device/weapon
r_pocket = /obj/item/weapon/cell/device/weapon
r_hand = /obj/item/weapon/melee/energy/sword/imperial
l_hand = /obj/item/weapon/shield/energy/imperial
suit_store = /obj/item/weapon/gun/energy/imperial
back = /obj/item/storage/backpack/satchel
belt = /obj/item/storage/belt/security/tactical/bandolier
l_pocket = /obj/item/cell/device/weapon
r_pocket = /obj/item/cell/device/weapon
r_hand = /obj/item/melee/energy/sword/imperial
l_hand = /obj/item/shield/energy/imperial
suit_store = /obj/item/gun/energy/imperial
/decl/hierarchy/outfit/imperial/officer
name = "Imperial officer"
head = /obj/item/clothing/head/helmet/combat/imperial/centurion
shoes = /obj/item/clothing/shoes/leg_guard/combat/imperial
gloves = /obj/item/clothing/gloves/arm_guard/combat/imperial
l_ear = /obj/item/device/radio/headset/syndicate
l_ear = /obj/item/radio/headset/syndicate
uniform = /obj/item/clothing/under/imperial
mask = /obj/item/clothing/mask/gas/imperial
suit = /obj/item/clothing/suit/armor/combat/imperial/centurion
belt = /obj/item/weapon/storage/belt/security/tactical/bandolier
l_pocket = /obj/item/weapon/cell/device/weapon
r_pocket = /obj/item/weapon/cell/device/weapon
r_hand = /obj/item/weapon/melee/energy/sword/imperial
l_hand = /obj/item/weapon/shield/energy/imperial
suit_store = /obj/item/weapon/gun/energy/imperial
belt = /obj/item/storage/belt/security/tactical/bandolier
l_pocket = /obj/item/cell/device/weapon
r_pocket = /obj/item/cell/device/weapon
r_hand = /obj/item/melee/energy/sword/imperial
l_hand = /obj/item/shield/energy/imperial
suit_store = /obj/item/gun/energy/imperial
/*
SOUTHERN CROSS OUTFITS
@@ -112,15 +112,15 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
name = OUTFIT_JOB_NAME(JOB_EXPLORER)
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
l_ear = /obj/item/device/radio/headset/explorer
l_ear = /obj/item/radio/headset/explorer
id_slot = slot_wear_id
pda_slot = slot_l_store
pda_type = /obj/item/device/pda/explorer
id_type = /obj/item/weapon/card/id/exploration
pda_type = /obj/item/pda/explorer
id_type = /obj/item/card/id/exploration
id_pda_assignment = JOB_EXPLORER
backpack = /obj/item/weapon/storage/backpack/explorer
satchel_one = /obj/item/weapon/storage/backpack/satchel/explorer
messenger_bag = /obj/item/weapon/storage/backpack/messenger/explorer
backpack = /obj/item/storage/backpack/explorer
satchel_one = /obj/item/storage/backpack/satchel/explorer
messenger_bag = /obj/item/storage/backpack/messenger/explorer
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
/decl/hierarchy/outfit/job/pilot
@@ -130,12 +130,12 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot
gloves = /obj/item/clothing/gloves/fingerless
glasses = /obj/item/clothing/glasses/fakesunglasses/aviator
l_ear = /obj/item/device/radio/headset/pilot/alt
l_ear = /obj/item/radio/headset/pilot/alt
uniform_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1 = 1)
id_slot = slot_wear_id
pda_slot = slot_belt
pda_type = /obj/item/device/pda/pilot
id_type = /obj/item/weapon/card/id/civilian/pilot
pda_type = /obj/item/pda/pilot
id_type = /obj/item/card/id/civilian/pilot
id_pda_assignment = JOB_PILOT
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
@@ -144,30 +144,30 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
uniform = /obj/item/clothing/under/utility/blue
//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar
shoes = /obj/item/clothing/shoes/boots/winter/explorer
l_ear = /obj/item/device/radio/headset/sar
l_hand = /obj/item/weapon/storage/firstaid/regular
belt = /obj/item/weapon/storage/belt/medical/emt
l_ear = /obj/item/radio/headset/sar
l_hand = /obj/item/storage/firstaid/regular
belt = /obj/item/storage/belt/medical/emt
pda_slot = slot_l_store
pda_type = /obj/item/device/pda/sar
id_type = /obj/item/weapon/card/id/exploration/fm
pda_type = /obj/item/pda/sar
id_type = /obj/item/card/id/exploration/fm
id_pda_assignment = JOB_FIELD_MEDIC
backpack = /obj/item/weapon/storage/backpack/explorer
satchel_one = /obj/item/weapon/storage/backpack/satchel/explorer
messenger_bag = /obj/item/weapon/storage/backpack/messenger/explorer
backpack = /obj/item/storage/backpack/explorer
satchel_one = /obj/item/storage/backpack/satchel/explorer
messenger_bag = /obj/item/storage/backpack/messenger/explorer
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
/decl/hierarchy/outfit/job/pathfinder
name = OUTFIT_JOB_NAME(JOB_PATHFINDER)
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer //TODO: Uniforms.
l_ear = /obj/item/device/radio/headset/pathfinder
l_ear = /obj/item/radio/headset/pathfinder
id_slot = slot_wear_id
pda_slot = slot_l_store
pda_type = /obj/item/device/pda/pathfinder
id_type = /obj/item/weapon/card/id/exploration/head
pda_type = /obj/item/pda/pathfinder
id_type = /obj/item/card/id/exploration/head
id_pda_assignment = JOB_PATHFINDER
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
/decl/hierarchy/outfit/job/assistant/explorer
id_type = /obj/item/weapon/card/id/exploration
id_type = /obj/item/card/id/exploration
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
code/datums/outfits/pirates.dm
+2 -2
View File
@@ -5,7 +5,7 @@
shoes = /obj/item/clothing/shoes/brown
head = /obj/item/clothing/head/bandana
glasses = /obj/item/clothing/glasses/eyepatch
l_hand = /obj/item/weapon/melee/energy/sword/pirate
l_hand = /obj/item/melee/energy/sword/pirate
/decl/hierarchy/outfit/pirate/norm
@@ -13,5 +13,5 @@
name = "Pirate - Space"
head = /obj/item/clothing/head/helmet/space
suit = /obj/item/clothing/suit/pirate
back = /obj/item/weapon/tank/jetpack/oxygen
back = /obj/item/tank/jetpack/oxygen
flags = OUTFIT_HAS_JETPACK
code/datums/outfits/spec_op.dm
+13 -13
View File
@@ -2,24 +2,24 @@
name = "Special ops - Officer"
uniform = /obj/item/clothing/under/syndicate/combat
suit = /obj/item/clothing/suit/armor/swat/officer
l_ear = /obj/item/device/radio/headset/ert
l_ear = /obj/item/radio/headset/ert
glasses = /obj/item/clothing/glasses/thermal/plain/eyepatch
mask = /obj/item/clothing/mask/smokable/cigarette/cigar/havana
head = /obj/item/clothing/head/beret //deathsquad
belt = /obj/item/weapon/gun/energy/pulse_rifle/compact/admin
back = /obj/item/weapon/storage/backpack/satchel
belt = /obj/item/gun/energy/pulse_rifle/compact/admin
back = /obj/item/storage/backpack/satchel
shoes = /obj/item/clothing/shoes/boots/combat
gloves = /obj/item/clothing/gloves/combat
id_slot = slot_wear_id
id_type = /obj/item/weapon/card/id/centcom/ERT
id_type = /obj/item/card/id/centcom/ERT
id_desc = "Special operations ID."
id_pda_assignment = "Special Operations Officer"
/decl/hierarchy/outfit/spec_op_officer/space
name = "Special ops - Officer in space"
suit = /obj/item/clothing/suit/armor/swat //obj/item/clothing/suit/space/void/swat
back = /obj/item/weapon/tank/jetpack/oxygen
back = /obj/item/tank/jetpack/oxygen
mask = /obj/item/clothing/mask/gas/swat
flags = OUTFIT_HAS_JETPACK
@@ -29,13 +29,13 @@
uniform = /obj/item/clothing/under/ert
shoes = /obj/item/clothing/shoes/boots/swat
gloves = /obj/item/clothing/gloves/swat
l_ear = /obj/item/device/radio/headset/ert
belt = /obj/item/weapon/gun/energy/gun
l_ear = /obj/item/radio/headset/ert
belt = /obj/item/gun/energy/gun
glasses = /obj/item/clothing/glasses/sunglasses
back = /obj/item/weapon/storage/backpack/satchel
back = /obj/item/storage/backpack/satchel
id_slot = slot_wear_id
id_type = /obj/item/weapon/card/id/centcom/ERT
id_type = /obj/item/card/id/centcom/ERT
/decl/hierarchy/outfit/death_command
name = "Spec ops - Death commando"
@@ -55,15 +55,15 @@
name = "Spec ops - Mercenary"
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/boots/combat
l_ear = /obj/item/device/radio/headset/syndicate
belt = /obj/item/weapon/storage/belt/security
l_ear = /obj/item/radio/headset/syndicate
belt = /obj/item/storage/belt/security
glasses = /obj/item/clothing/glasses/sunglasses
gloves = /obj/item/clothing/gloves/swat
l_pocket = /obj/item/weapon/reagent_containers/pill/cyanide
l_pocket = /obj/item/reagent_containers/pill/cyanide
id_slot = slot_wear_id
id_type = /obj/item/weapon/card/id/syndicate
id_type = /obj/item/card/id/syndicate
id_pda_assignment = "Mercenary"
flags = OUTFIT_HAS_BACKPACK
code/datums/outfits/tournament.dm
+13 -13
View File
@@ -2,9 +2,9 @@
hierarchy_type = /decl/hierarchy/outfit/tournament_gear
head = /obj/item/clothing/head/helmet/thunderdome
suit = /obj/item/clothing/suit/armor/vest
l_hand = /obj/item/weapon/material/knife
r_hand = /obj/item/weapon/gun/energy/pulse_rifle/destroyer
r_pocket = /obj/item/weapon/grenade/smokebomb
l_hand = /obj/item/material/knife
r_hand = /obj/item/gun/energy/pulse_rifle/destroyer
r_pocket = /obj/item/grenade/smokebomb
shoes = /obj/item/clothing/shoes/black
/decl/hierarchy/outfit/tournament_gear/red
@@ -21,7 +21,7 @@
uniform = /obj/item/clothing/under/det
suit_store = /obj/item/clothing/suit/storage/det_trench
glasses = /obj/item/clothing/glasses/thermal/plain/monocle
r_hand = /obj/item/weapon/gun/projectile/revolver
r_hand = /obj/item/gun/projectile/revolver
l_pocket = /obj/item/ammo_magazine/s357
/decl/hierarchy/outfit/tournament_gear/chef
@@ -29,21 +29,21 @@
head = /obj/item/clothing/head/chefhat
uniform = /obj/item/clothing/under/rank/chef
suit = /obj/item/clothing/suit/chef
r_hand = /obj/item/weapon/material/kitchen/rollingpin
l_pocket = /obj/item/weapon/material/knife/tacknife
r_pocket = /obj/item/weapon/material/knife/tacknife
r_hand = /obj/item/material/kitchen/rollingpin
l_pocket = /obj/item/material/knife/tacknife
r_pocket = /obj/item/material/knife/tacknife
/decl/hierarchy/outfit/tournament_gear/janitor
name = "Tournament gear - Janitor"
uniform = /obj/item/clothing/under/rank/janitor
back = /obj/item/weapon/storage/backpack
r_hand = /obj/item/weapon/mop
l_hand = /obj/item/weapon/reagent_containers/glass/bucket
l_pocket = /obj/item/weapon/grenade/chem_grenade/cleaner
r_pocket = /obj/item/weapon/grenade/chem_grenade/cleaner
back = /obj/item/storage/backpack
r_hand = /obj/item/mop
l_hand = /obj/item/reagent_containers/glass/bucket
l_pocket = /obj/item/grenade/chem_grenade/cleaner
r_pocket = /obj/item/grenade/chem_grenade/cleaner
backpack_contents = list(/obj/item/stack/tile/floor = 6)
/decl/hierarchy/outfit/tournament_gear/janitor/post_equip(var/mob/living/carbon/human/H)
var/obj/item/weapon/reagent_containers/glass/bucket/bucket = locate(/obj/item/weapon/reagent_containers/glass/bucket) in H
var/obj/item/reagent_containers/glass/bucket/bucket = locate(/obj/item/reagent_containers/glass/bucket) in H
if(bucket)
bucket.reagents.add_reagent(/datum/reagent/water, 70)
code/datums/outfits/wizardry.dm
+6 -6
View File
@@ -1,12 +1,12 @@
/decl/hierarchy/outfit/wizard
uniform = /obj/item/clothing/under/color/lightpurple
shoes = /obj/item/clothing/shoes/sandal
l_ear = /obj/item/device/radio/headset
r_pocket = /obj/item/weapon/teleportation_scroll
l_hand = /obj/item/weapon/staff
r_hand = /obj/item/weapon/spellbook
back = /obj/item/weapon/storage/backpack
backpack_contents = list(/obj/item/weapon/storage/box = 1)
l_ear = /obj/item/radio/headset
r_pocket = /obj/item/teleportation_scroll
l_hand = /obj/item/staff
r_hand = /obj/item/spellbook
back = /obj/item/storage/backpack
backpack_contents = list(/obj/item/storage/box = 1)
hierarchy_type = /decl/hierarchy/outfit/wizard
/decl/hierarchy/outfit/wizard/blue
code/datums/riding.dm
+1 -1
View File
@@ -133,7 +133,7 @@
// I'm on a
/datum/riding/boat
keytype = /obj/item/weapon/oar
keytype = /obj/item/oar
key_name = "an oar"
nonhuman_key_exemption = TRUE // Borgs can't hold oars.
only_one_driver = TRUE // Would be pretty crazy if five people try to move at the same time.
code/datums/supplypacks/atmospherics.dm
+8 -8
View File
@@ -9,7 +9,7 @@
/datum/supply_pack/atmos/inflatable
name = "Inflatable barriers"
contains = list(/obj/item/weapon/storage/briefcase/inflatable = 3)
contains = list(/obj/item/storage/briefcase/inflatable = 3)
cost = 20
containertype = /obj/structure/closet/crate/aether
containername = "Inflatable Barrier Crate"
@@ -66,7 +66,7 @@
access = access_atmospherics
/datum/supply_pack/atmos/rapid_pipe_dispenser
contains = list(/obj/item/weapon/pipe_dispenser)
contains = list(/obj/item/pipe_dispenser)
name = "Rapid Pipe Dispenser"
cost = 100
containertype = /obj/structure/closet/crate/secure/aether
@@ -77,7 +77,7 @@
name = "Internals crate"
contains = list(
/obj/item/clothing/mask/gas = 3,
/obj/item/weapon/tank/air = 3
/obj/item/tank/air = 3
)
cost = 10
containertype = /obj/structure/closet/crate/aether
@@ -86,10 +86,10 @@
/datum/supply_pack/atmos/evacuation
name = "Emergency equipment"
contains = list(
/obj/item/weapon/storage/toolbox/emergency = 2,
/obj/item/storage/toolbox/emergency = 2,
/obj/item/clothing/suit/storage/hazardvest = 2,
/obj/item/clothing/suit/storage/vest = 2,
/obj/item/weapon/tank/emergency/oxygen/engi = 4,
/obj/item/tank/emergency/oxygen/engi = 4,
/obj/item/clothing/suit/space/emergency = 4,
/obj/item/clothing/head/helmet/space/emergency = 4,
/obj/item/clothing/mask/gas = 4
@@ -102,9 +102,9 @@
name = "Firefighting equipment"
contains = list(
/obj/item/clothing/suit/fire/heavy = 2,
/obj/item/weapon/tank/oxygen/red = 2,
/obj/item/weapon/watertank/atmos = 2,
/obj/item/device/flashlight = 2,
/obj/item/tank/oxygen/red = 2,
/obj/item/watertank/atmos = 2,
/obj/item/flashlight = 2,
/obj/item/clothing/head/hardhat/firefighter/atmos = 2
)
cost = 35
code/datums/supplypacks/contraband.dm
+36 -36
View File
@@ -8,9 +8,9 @@
num_contained = 5
contains = list(
/obj/item/seeds/bloodtomatoseed,
/obj/item/weapon/storage/pill_bottle/zoom,
/obj/item/weapon/storage/pill_bottle/happy,
/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine
/obj/item/storage/pill_bottle/zoom,
/obj/item/storage/pill_bottle/happy,
/obj/item/reagent_containers/food/drinks/bottle/pwine
)
name = "Contraband crate"
@@ -23,9 +23,9 @@
/datum/supply_pack/security/specialops
name = "Special Ops supplies"
contains = list(
/obj/item/weapon/storage/box/emps,
/obj/item/weapon/grenade/smokebomb = 4,
/obj/item/weapon/grenade/chem_grenade/incendiary
/obj/item/storage/box/emps,
/obj/item/grenade/smokebomb = 4,
/obj/item/grenade/chem_grenade/incendiary
)
cost = 25
containertype = /obj/structure/closet/crate/weapon
@@ -35,8 +35,8 @@
/datum/supply_pack/supply/moghes
name = "Moghes imports"
contains = list(
/obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew = 2,
/obj/item/weapon/reagent_containers/food/snacks/unajerky = 4
/obj/item/reagent_containers/food/drinks/bottle/redeemersbrew = 2,
/obj/item/reagent_containers/food/snacks/unajerky = 4
)
cost = 25
containertype = /obj/structure/closet/crate/unathi
@@ -46,7 +46,7 @@
/datum/supply_pack/munitions/bolt_rifles_militia
name = "Weapon - Surplus militia rifles"
contains = list(
/obj/item/weapon/gun/projectile/shotgun/pump/rifle = 3,
/obj/item/gun/projectile/shotgun/pump/rifle = 3,
/obj/item/ammo_magazine/clip/c762 = 6
)
cost = 50
@@ -59,53 +59,53 @@
num_contained = 1
contains = list(
list( //the operator,
/obj/item/weapon/gun/projectile/shotgun/pump/combat,
/obj/item/gun/projectile/shotgun/pump/combat,
/obj/item/clothing/suit/storage/vest/heavy/merc,
/obj/item/clothing/glasses/night,
/obj/item/weapon/storage/box/anti_photons,
/obj/item/storage/box/anti_photons,
/obj/item/ammo_magazine/clip/c12g/pellet,
/obj/item/ammo_magazine/clip/c12g
),
list( //the doc,
/obj/item/weapon/storage/firstaid/combat,
/obj/item/weapon/gun/projectile/dartgun,
/obj/item/weapon/reagent_containers/hypospray,
/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate,
/obj/item/weapon/reagent_containers/glass/bottle/cyanide,
/obj/item/storage/firstaid/combat,
/obj/item/gun/projectile/dartgun,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/glass/bottle/chloralhydrate,
/obj/item/reagent_containers/glass/bottle/cyanide,
/obj/item/ammo_magazine/chemdart
),
list( //the sapper,
/obj/item/weapon/melee/energy/sword/ionic_rapier,
/obj/item/weapon/storage/box/syndie_kit/space, //doesn't matter what species you are,
/obj/item/weapon/storage/box/syndie_kit/demolitions,
/obj/item/device/multitool/ai_detector,
/obj/item/weapon/plastique,
/obj/item/weapon/storage/toolbox/syndicate/powertools
/obj/item/melee/energy/sword/ionic_rapier,
/obj/item/storage/box/syndie_kit/space, //doesn't matter what species you are,
/obj/item/storage/box/syndie_kit/demolitions,
/obj/item/multitool/ai_detector,
/obj/item/plastique,
/obj/item/storage/toolbox/syndicate/powertools
),
list( //the infiltrator,
/obj/item/weapon/gun/projectile/silenced,
/obj/item/device/chameleon,
/obj/item/weapon/storage/box/syndie_kit/chameleon,
/obj/item/device/encryptionkey/syndicate,
/obj/item/weapon/card/id/syndicate,
/obj/item/gun/projectile/silenced,
/obj/item/chameleon,
/obj/item/storage/box/syndie_kit/chameleon,
/obj/item/encryptionkey/syndicate,
/obj/item/card/id/syndicate,
/obj/item/clothing/mask/gas/voice,
/obj/item/weapon/makeover
/obj/item/makeover
),
list( //the hacker,
/obj/item/weapon/gun/projectile/silenced,
/obj/item/weapon/gun/energy/ionrifle/pistol,
/obj/item/gun/projectile/silenced,
/obj/item/gun/energy/ionrifle/pistol,
/obj/item/clothing/glasses/thermal/syndi,
/obj/item/ammo_magazine/m45/ap,
/obj/item/weapon/material/knife/tacknife/combatknife,
/obj/item/device/multitool/hacktool
/obj/item/material/knife/tacknife/combatknife,
/obj/item/multitool/hacktool
),
list( //the professional,
/obj/item/weapon/gun/projectile/silenced,
/obj/item/weapon/gun/energy/ionrifle/pistol,
/obj/item/gun/projectile/silenced,
/obj/item/gun/energy/ionrifle/pistol,
/obj/item/clothing/glasses/thermal/syndi,
/obj/item/weapon/card/emag,
/obj/item/card/emag,
/obj/item/ammo_magazine/m45/ap,
/obj/item/weapon/material/knife/tacknife/combatknife,
/obj/item/material/knife/tacknife/combatknife,
/obj/item/clothing/mask/balaclava
)
)
code/datums/supplypacks/costumes.dm
+5 -5
View File
@@ -13,7 +13,7 @@
/datum/supply_pack/costumes/wizard
name = "Wizard costume"
contains = list(
/obj/item/weapon/staff,
/obj/item/staff,
/obj/item/clothing/suit/wizrobe/fake,
/obj/item/clothing/shoes/sandal,
/obj/item/clothing/head/wizard/fake
@@ -118,7 +118,7 @@
/obj/item/clothing/suit/wizrobe/marisa/fake,
/obj/item/clothing/shoes/sandal,
/obj/item/clothing/head/wizard/marisa/fake,
/obj/item/weapon/staff/broom
/obj/item/staff/broom
)
/datum/supply_pack/randomised/costumes/costume_hats
@@ -536,9 +536,9 @@
/datum/supply_pack/costumes/taurbags
name = "Saddlebags crate"
contains = list(
/obj/item/weapon/storage/backpack/saddlebag_common,
/obj/item/weapon/storage/backpack/saddlebag_common/robust,
/obj/item/weapon/storage/backpack/saddlebag_common/vest
/obj/item/storage/backpack/saddlebag_common,
/obj/item/storage/backpack/saddlebag_common/robust,
/obj/item/storage/backpack/saddlebag_common/vest
)
cost = 60
containertype = /obj/structure/closet/crate
code/datums/supplypacks/engineering.dm
+38 -38
View File
@@ -9,28 +9,28 @@
/datum/supply_pack/eng/lightbulbs
name = "Replacement lights"
contains = list(/obj/item/weapon/storage/box/lights/mixed = 3)
contains = list(/obj/item/storage/box/lights/mixed = 3)
cost = 10
containertype = /obj/structure/closet/crate/galaksi
containername = "Replacement lights"
/datum/supply_pack/eng/smescoil
name = "Superconducting Magnetic Coil"
contains = list(/obj/item/weapon/smes_coil)
contains = list(/obj/item/smes_coil)
cost = 75
containertype = /obj/structure/closet/crate/focalpoint
containername = "Superconducting Magnetic Coil crate"
/datum/supply_pack/eng/smescoil/super_capacity
name = "Superconducting Capacitance Coil"
contains = list(/obj/item/weapon/smes_coil/super_capacity)
contains = list(/obj/item/smes_coil/super_capacity)
cost = 90
containertype = /obj/structure/closet/crate/focalpoint
containername = "Superconducting Capacitance Coil crate"
/datum/supply_pack/eng/smescoil/super_io
name = "Superconducting Transmission Coil"
contains = list(/obj/item/weapon/smes_coil/super_io)
contains = list(/obj/item/smes_coil/super_io)
cost = 90
containertype = /obj/structure/closet/crate/focalpoint
containername = "Superconducting Transmission Coil crate"
@@ -79,14 +79,14 @@
/datum/supply_pack/eng/point_defense_cannon_circuit
name = "Point Defense Turret Circuit"
contains = list(/obj/item/weapon/circuitboard/pointdefense = 2)
contains = list(/obj/item/circuitboard/pointdefense = 2)
cost = 20
containertype = /obj/structure/closet/crate/heph
containername = "point defense turret circuit crate"
/datum/supply_pack/eng/point_defense_control_circuit
name = "Point Defense Controller Circuit"
contains = list(/obj/item/weapon/circuitboard/pointdefense_control = 1)
contains = list(/obj/item/circuitboard/pointdefense_control = 1)
cost = 30
containertype = /obj/structure/closet/crate/heph
containername = "point defense mainframe circuit crate"
@@ -94,10 +94,10 @@
/datum/supply_pack/eng/electrical
name = "Electrical maintenance crate"
contains = list(
/obj/item/weapon/storage/toolbox/electrical = 2,
/obj/item/storage/toolbox/electrical = 2,
/obj/item/clothing/gloves/yellow = 2,
/obj/item/weapon/cell = 2,
/obj/item/weapon/cell/high = 2
/obj/item/cell = 2,
/obj/item/cell/high = 2
)
cost = 10
containertype = /obj/structure/closet/crate/ward
@@ -106,7 +106,7 @@
/datum/supply_pack/eng/e_welders
name = "Electric welder crate"
contains = list(
/obj/item/weapon/weldingtool/electric = 3
/obj/item/weldingtool/electric = 3
)
cost = 15
containertype = /obj/structure/closet/crate/ward
@@ -115,7 +115,7 @@
/datum/supply_pack/eng/mechanical
name = "Mechanical maintenance crate"
contains = list(
/obj/item/weapon/storage/belt/utility/full = 3,
/obj/item/storage/belt/utility/full = 3,
/obj/item/clothing/suit/storage/hazardvest = 3,
/obj/item/clothing/head/welding = 2,
/obj/item/clothing/head/hardhat
@@ -135,9 +135,9 @@
name = "Solar Pack crate"
contains = list(
/obj/item/solar_assembly = 21,
/obj/item/weapon/circuitboard/solar_control,
/obj/item/weapon/tracker_electronics,
/obj/item/weapon/paper/solar
/obj/item/circuitboard/solar_control,
/obj/item/tracker_electronics,
/obj/item/paper/solar
)
cost = 20
containertype = /obj/structure/closet/crate/einstein
@@ -195,7 +195,7 @@
access = access_ce
/datum/supply_pack/eng/shield_gen
contains = list(/obj/item/weapon/circuitboard/shield_gen)
contains = list(/obj/item/circuitboard/shield_gen)
name = "Bubble shield generator circuitry"
cost = 30
containertype = /obj/structure/closet/crate/secure/focalpoint
@@ -203,7 +203,7 @@
access = access_ce
/datum/supply_pack/eng/shield_gen_ex
contains = list(/obj/item/weapon/circuitboard/shield_gen_ex)
contains = list(/obj/item/circuitboard/shield_gen_ex)
name = "Hull shield generator circuitry"
cost = 30
containertype = /obj/structure/closet/crate/secure/focalpoint
@@ -211,7 +211,7 @@
access = access_ce
/datum/supply_pack/eng/shield_cap
contains = list(/obj/item/weapon/circuitboard/shield_cap)
contains = list(/obj/item/circuitboard/shield_cap)
name = "Bubble shield capacitor circuitry"
cost = 30
containertype = /obj/structure/closet/crate/secure/focalpoint
@@ -269,10 +269,10 @@
containertype = /obj/structure/closet/crate/secure/focalpoint
access = access_tech_storage
contains = list(
/obj/item/weapon/stock_parts/micro_laser,
/obj/item/weapon/stock_parts/capacitor,
/obj/item/weapon/stock_parts/matter_bin,
/obj/item/weapon/circuitboard/pacman
/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/matter_bin,
/obj/item/circuitboard/pacman
)
/datum/supply_pack/eng/super_pacman_parts
@@ -282,10 +282,10 @@
containertype = /obj/structure/closet/crate/secure/focalpoint
access = access_tech_storage
contains = list(
/obj/item/weapon/stock_parts/micro_laser,
/obj/item/weapon/stock_parts/capacitor,
/obj/item/weapon/stock_parts/matter_bin,
/obj/item/weapon/circuitboard/pacman/super
/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/matter_bin,
/obj/item/circuitboard/pacman/super
)
/datum/supply_pack/eng/fusion_core
@@ -295,9 +295,9 @@
containertype = /obj/structure/closet/crate/secure/einstein
access = access_engine
contains = list(
/obj/item/weapon/book/manual/rust_engine,
/obj/item/book/manual/rust_engine,
/obj/machinery/power/fusion_core,
/obj/item/weapon/circuitboard/fusion_core
/obj/item/circuitboard/fusion_core
)
/datum/supply_pack/eng/fusion_fuel_injector
@@ -309,7 +309,7 @@
contains = list(
/obj/machinery/fusion_fuel_injector,
/obj/machinery/fusion_fuel_injector,
/obj/item/weapon/circuitboard/fusion_injector
/obj/item/circuitboard/fusion_injector
)
/datum/supply_pack/eng/gyrotron
@@ -320,7 +320,7 @@
access = access_engine
contains = list(
/obj/machinery/power/emitter/gyrotron,
/obj/item/weapon/circuitboard/gyrotron
/obj/item/circuitboard/gyrotron
)
/datum/supply_pack/eng/fusion_fuel_compressor
@@ -328,7 +328,7 @@
cost = 10
containername = "Fusion Fuel Compressor circuitry crate"
containertype = /obj/structure/closet/crate/einstein
contains = list(/obj/item/weapon/circuitboard/fusion_fuel_compressor)
contains = list(/obj/item/circuitboard/fusion_fuel_compressor)
/datum/supply_pack/eng/deuterium
name = "Deuterium crate"
@@ -347,12 +347,12 @@
/datum/supply_pack/eng/modern_shield
name = "Modern Shield Construction Kit"
contains = list(
/obj/item/weapon/circuitboard/shield_generator,
/obj/item/weapon/stock_parts/capacitor,
/obj/item/weapon/stock_parts/micro_laser,
/obj/item/weapon/smes_coil,
/obj/item/weapon/stock_parts/console_screen,
/obj/item/weapon/stock_parts/subspace/amplifier
/obj/item/circuitboard/shield_generator,
/obj/item/stock_parts/capacitor,
/obj/item/stock_parts/micro_laser,
/obj/item/smes_coil,
/obj/item/stock_parts/console_screen,
/obj/item/stock_parts/subspace/amplifier
)
cost = 80
containertype = /obj/structure/closet/crate/focalpoint
@@ -373,7 +373,7 @@
)
/datum/supply_pack/eng/dosimeter
contains = list(/obj/item/weapon/storage/box/dosimeter = 6)
contains = list(/obj/item/storage/box/dosimeter = 6)
name = "Dosimeters"
cost = 10
containertype = /obj/structure/closet/crate
@@ -394,7 +394,7 @@
access = access_ce
/datum/supply_pack/eng/inducer
contains = list(/obj/item/weapon/inducer = 3)
contains = list(/obj/item/inducer = 3)
name = "inducer"
cost = 90 //Relatively expensive
containertype = /obj/structure/closet/crate/xion
code/datums/supplypacks/hardsuits.dm
+10 -10
View File
@@ -10,7 +10,7 @@
/datum/supply_pack/hardsuits/eva_rig
name = "eva hardsuit (empty)"
contains = list(
/obj/item/weapon/rig/eva = 1
/obj/item/rig/eva = 1
)
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
@@ -23,7 +23,7 @@
/datum/supply_pack/hardsuits/mining_rig
name = "industrial hardsuit (empty)"
contains = list(
/obj/item/weapon/rig/industrial = 1
/obj/item/rig/industrial = 1
)
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
@@ -35,7 +35,7 @@
/datum/supply_pack/hardsuits/medical_rig
name = "medical hardsuit (empty)"
contains = list(
/obj/item/weapon/rig/medical = 1
/obj/item/rig/medical = 1
)
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
@@ -45,7 +45,7 @@
/datum/supply_pack/hardsuits/security_rig
name = "hazard hardsuit (empty)"
contains = list(
/obj/item/weapon/rig/hazard = 1
/obj/item/rig/hazard = 1
)
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
@@ -55,7 +55,7 @@
/datum/supply_pack/hardsuits/science_rig
name = "ami hardsuit (empty)"
contains = list(
/obj/item/weapon/rig/hazmat = 1
/obj/item/rig/hazmat = 1
)
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
@@ -65,7 +65,7 @@
/datum/supply_pack/hardsuits/ce_rig
name = "advanced hardsuit (empty)"
contains = list(
/obj/item/weapon/rig/ce = 1
/obj/item/rig/ce = 1
)
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
@@ -75,7 +75,7 @@
/datum/supply_pack/hardsuits/com_medical_rig
name = "commonwealth medical hardsuit (loaded)"
contains = list(
/obj/item/weapon/rig/baymed/equipped = 1
/obj/item/rig/baymed/equipped = 1
)
cost = 250
containertype = /obj/structure/closet/crate/secure/gear
@@ -85,7 +85,7 @@
/datum/supply_pack/hardsuits/com_engineering_rig
name = "commonwealth engineering hardsuit (loaded)"
contains = list(
/obj/item/weapon/rig/bayeng/equipped = 1
/obj/item/rig/bayeng/equipped = 1
)
cost = 250
containertype = /obj/structure/closet/crate/secure/gear
@@ -95,7 +95,7 @@
/datum/supply_pack/hardsuits/breacher_rig
name = "unathi breacher hardsuit (empty)"
contains = list(
/obj/item/weapon/rig/breacher = 1
/obj/item/rig/breacher = 1
)
cost = 250
containertype = /obj/structure/closet/crate/secure/gear
@@ -105,7 +105,7 @@
/datum/supply_pack/hardsuits/zero_rig
name = "null hardsuit (jets)"
contains = list(
/obj/item/weapon/rig/zero = 1
/obj/item/rig/zero = 1
)
cost = 75
containertype = /obj/structure/closet/crate/secure/gear
code/datums/supplypacks/hospitality.dm
+85 -85
View File
@@ -10,18 +10,18 @@
/datum/supply_pack/hospitality/party
name = "Party equipment"
contains = list(
/obj/item/weapon/storage/box/mixedglasses = 2,
/obj/item/weapon/storage/box/glasses/square,
/obj/item/weapon/reagent_containers/food/drinks/shaker,
/obj/item/weapon/reagent_containers/food/drinks/flask/barflask,
/obj/item/weapon/reagent_containers/food/drinks/bottle/patron,
/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager,
/obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey,
/obj/item/weapon/reagent_containers/food/drinks/bottle/jager,
/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
/obj/item/weapon/lipstick/random,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 2,
/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer = 4,
/obj/item/storage/box/mixedglasses = 2,
/obj/item/storage/box/glasses/square,
/obj/item/reagent_containers/food/drinks/shaker,
/obj/item/reagent_containers/food/drinks/flask/barflask,
/obj/item/reagent_containers/food/drinks/bottle/patron,
/obj/item/reagent_containers/food/drinks/bottle/goldschlager,
/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey,
/obj/item/reagent_containers/food/drinks/bottle/jager,
/obj/item/storage/fancy/cigarettes/dromedaryco,
/obj/item/lipstick/random,
/obj/item/reagent_containers/food/drinks/bottle/small/ale = 2,
/obj/item/reagent_containers/food/drinks/bottle/small/beer = 4,
)
cost = 10
containertype = /obj/structure/closet/crate/gilthari
@@ -30,19 +30,19 @@
/datum/supply_pack/hospitality/barsupplies
name = "Bar supplies"
contains = list(
/obj/item/weapon/storage/box/glasses/cocktail,
/obj/item/weapon/storage/box/glasses/rocks,
/obj/item/weapon/storage/box/glasses/square,
/obj/item/weapon/storage/box/glasses/pint,
/obj/item/weapon/storage/box/glasses/wine,
/obj/item/weapon/storage/box/glasses/shake,
/obj/item/weapon/storage/box/glasses/shot,
/obj/item/weapon/storage/box/glasses/mug,
/obj/item/weapon/storage/box/glasses/meta,
/obj/item/weapon/storage/box/glasses/meta/metapint,
/obj/item/weapon/reagent_containers/food/drinks/shaker,
/obj/item/weapon/storage/box/glass_extras/straws,
/obj/item/weapon/storage/box/glass_extras/sticks
/obj/item/storage/box/glasses/cocktail,
/obj/item/storage/box/glasses/rocks,
/obj/item/storage/box/glasses/square,
/obj/item/storage/box/glasses/pint,
/obj/item/storage/box/glasses/wine,
/obj/item/storage/box/glasses/shake,
/obj/item/storage/box/glasses/shot,
/obj/item/storage/box/glasses/mug,
/obj/item/storage/box/glasses/meta,
/obj/item/storage/box/glasses/meta/metapint,
/obj/item/reagent_containers/food/drinks/shaker,
/obj/item/storage/box/glass_extras/straws,
/obj/item/storage/box/glass_extras/sticks
)
cost = 10
containertype = /obj/structure/closet/crate/gilthari
@@ -59,7 +59,7 @@
name = "Surprise pack of five pizzas"
contains = list(
/obj/random/pizzabox/supplypack = 5,
/obj/item/weapon/material/knife/plastic,
/obj/item/material/knife/plastic,
/obj/item/clothing/under/pizzaguy,
/obj/item/clothing/head/pizzaguy
)
@@ -71,11 +71,11 @@
name = "Gift crate"
contains = list(
/obj/item/toy/bouquet = 3,
/obj/item/weapon/storage/fancy/heartbox = 2,
/obj/item/weapon/paper/card/smile,
/obj/item/weapon/paper/card/heart,
/obj/item/weapon/paper/card/cat,
/obj/item/weapon/paper/card/flower
/obj/item/storage/fancy/heartbox = 2,
/obj/item/paper/card/smile,
/obj/item/paper/card/heart,
/obj/item/paper/card/cat,
/obj/item/paper/card/flower
)
cost = 10
containertype = /obj/structure/closet/crate/allico
@@ -86,7 +86,7 @@
contains = list(
/obj/item/paint_brush = 2,
/obj/item/paint_palette = 2,
/obj/item/weapon/reagent_containers/glass/rag = 2,
/obj/item/reagent_containers/glass/rag = 2,
/obj/structure/easel = 1, // How does that even fit
/obj/item/canvas = 1,
/obj/item/canvas/nineteen_nineteen = 1,
@@ -101,7 +101,7 @@
/datum/supply_pack/hospitality/holywater
name = "Holy water crate"
contains = list(
/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater = 3
/obj/item/reagent_containers/food/drinks/bottle/holywater = 3
)
cost = 15
containertype = /obj/structure/closet/crate/gilthari
@@ -113,11 +113,11 @@
/datum/supply_pack/randomised/hospitality/burgers_vr
num_contained = 5
contains = list(
/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger,
/obj/item/weapon/reagent_containers/food/snacks/cheeseburger,
/obj/item/weapon/reagent_containers/food/snacks/jellyburger,
/obj/item/weapon/reagent_containers/food/snacks/tofuburger,
/obj/item/weapon/reagent_containers/food/snacks/fries
/obj/item/reagent_containers/food/snacks/bigbiteburger,
/obj/item/reagent_containers/food/snacks/cheeseburger,
/obj/item/reagent_containers/food/snacks/jellyburger,
/obj/item/reagent_containers/food/snacks/tofuburger,
/obj/item/reagent_containers/food/snacks/fries
)
name = "Burger crate"
cost = 25
@@ -127,23 +127,23 @@
/datum/supply_pack/randomised/hospitality/bakery_vr
num_contained = 5
contains = list(
/obj/item/weapon/reagent_containers/food/snacks/baguette,
/obj/item/weapon/reagent_containers/food/snacks/appletart,
/obj/item/weapon/reagent_containers/food/snacks/berrymuffin,
/obj/item/weapon/reagent_containers/food/snacks/bunbun,
/obj/item/weapon/reagent_containers/food/snacks/cherrypie,
/obj/item/weapon/reagent_containers/food/snacks/cookie,
/obj/item/weapon/reagent_containers/food/snacks/croissant,
/obj/item/weapon/reagent_containers/food/snacks/donut/normal,
/obj/item/weapon/reagent_containers/food/snacks/donut/jelly,
/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly,
/obj/item/weapon/reagent_containers/food/snacks/muffin,
/obj/item/weapon/reagent_containers/food/snacks/pie,
/obj/item/weapon/reagent_containers/food/snacks/plump_pie,
/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit,
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel,
/obj/item/weapon/reagent_containers/food/snacks/sugarcookie,
/obj/item/weapon/reagent_containers/food/snacks/waffles
/obj/item/reagent_containers/food/snacks/baguette,
/obj/item/reagent_containers/food/snacks/appletart,
/obj/item/reagent_containers/food/snacks/berrymuffin,
/obj/item/reagent_containers/food/snacks/bunbun,
/obj/item/reagent_containers/food/snacks/cherrypie,
/obj/item/reagent_containers/food/snacks/cookie,
/obj/item/reagent_containers/food/snacks/croissant,
/obj/item/reagent_containers/food/snacks/donut/normal,
/obj/item/reagent_containers/food/snacks/donut/jelly,
/obj/item/reagent_containers/food/snacks/donut/cherryjelly,
/obj/item/reagent_containers/food/snacks/muffin,
/obj/item/reagent_containers/food/snacks/pie,
/obj/item/reagent_containers/food/snacks/plump_pie,
/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit,
/obj/item/reagent_containers/food/snacks/poppypretzel,
/obj/item/reagent_containers/food/snacks/sugarcookie,
/obj/item/reagent_containers/food/snacks/waffles
)
name = "Bakery products crate"
cost = 25
@@ -153,15 +153,15 @@
/datum/supply_pack/randomised/hospitality/cakes_vr
num_contained = 2
contains = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake
/obj/item/reagent_containers/food/snacks/sliceable/applecake,
/obj/item/reagent_containers/food/snacks/sliceable/birthdaycake,
/obj/item/reagent_containers/food/snacks/sliceable/carrotcake,
/obj/item/reagent_containers/food/snacks/sliceable/cheesecake,
/obj/item/reagent_containers/food/snacks/sliceable/chocolatecake,
/obj/item/reagent_containers/food/snacks/sliceable/lemoncake,
/obj/item/reagent_containers/food/snacks/sliceable/limecake,
/obj/item/reagent_containers/food/snacks/sliceable/orangecake,
/obj/item/reagent_containers/food/snacks/sliceable/plaincake
)
name = "Cake crate"
cost = 100
@@ -171,10 +171,10 @@
/datum/supply_pack/randomised/hospitality/mexican_vr
num_contained = 5
contains = list(
/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito,
/obj/item/weapon/reagent_containers/food/snacks/enchiladas,
/obj/item/weapon/reagent_containers/food/snacks/meatburrito,
/obj/item/weapon/reagent_containers/food/snacks/taco
/obj/item/reagent_containers/food/snacks/cheeseburrito,
/obj/item/reagent_containers/food/snacks/enchiladas,
/obj/item/reagent_containers/food/snacks/meatburrito,
/obj/item/reagent_containers/food/snacks/taco
)
name = "Mexican takeout crate"
cost = 50
@@ -184,8 +184,8 @@
/datum/supply_pack/randomised/hospitality/asian_vr
num_contained = 5
contains = list(
/obj/item/weapon/reagent_containers/food/snacks/generalschicken,
/obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup
/obj/item/reagent_containers/food/snacks/generalschicken,
/obj/item/reagent_containers/food/snacks/hotandsoursoup
)
name = "Chinese takeout crate"
cost = 50
@@ -194,16 +194,16 @@
/datum/supply_pack/randomised/hospitality/jaffacake
contains = list(
/obj/item/weapon/storage/box/jaffacake,
/obj/item/weapon/storage/box/jaffacake,
/obj/item/weapon/storage/box/jaffacake,
/obj/item/weapon/storage/box/jaffacake,
/obj/item/weapon/storage/box/jaffacake,
/obj/item/weapon/storage/box/jaffacake,
/obj/item/weapon/storage/box/jaffacake,
/obj/item/weapon/storage/box/jaffacake,
/obj/item/weapon/storage/box/jaffacake,
/obj/item/weapon/storage/box/jaffacake
/obj/item/storage/box/jaffacake,
/obj/item/storage/box/jaffacake,
/obj/item/storage/box/jaffacake,
/obj/item/storage/box/jaffacake,
/obj/item/storage/box/jaffacake,
/obj/item/storage/box/jaffacake,
/obj/item/storage/box/jaffacake,
/obj/item/storage/box/jaffacake,
/obj/item/storage/box/jaffacake,
/obj/item/storage/box/jaffacake
)
name = "Desatti jaffa cake crate"
cost = 25
@@ -213,11 +213,11 @@
/datum/supply_pack/randomised/hospitality/sweets
num_contained = 5
contains = list(
/obj/item/weapon/storage/box/jaffacake,
/obj/item/weapon/storage/box/winegum,
/obj/item/weapon/storage/box/saucer,
/obj/item/weapon/storage/box/shrimpsandbananas,
/obj/item/weapon/storage/box/rhubarbcustard
/obj/item/storage/box/jaffacake,
/obj/item/storage/box/winegum,
/obj/item/storage/box/saucer,
/obj/item/storage/box/shrimpsandbananas,
/obj/item/storage/box/rhubarbcustard
)
name = "Sweets crate"
cost = 25
code/datums/supplypacks/hydroponics.dm
+30 -30
View File
@@ -9,28 +9,28 @@
/datum/supply_pack/hydro/monkey
name = "Monkey crate"
contains = list (/obj/item/weapon/storage/box/monkeycubes)
contains = list (/obj/item/storage/box/monkeycubes)
cost = 20
containertype = /obj/structure/closet/crate/freezer/nanotrasen
containername = "Monkey crate"
/datum/supply_pack/hydro/farwa
name = "Farwa crate"
contains = list (/obj/item/weapon/storage/box/monkeycubes/farwacubes)
contains = list (/obj/item/storage/box/monkeycubes/farwacubes)
cost = 20
containertype = /obj/structure/closet/crate/freezer
containername = "Farwa crate"
/datum/supply_pack/hydro/neara
name = "Neaera crate"
contains = list (/obj/item/weapon/storage/box/monkeycubes/neaeracubes)
contains = list (/obj/item/storage/box/monkeycubes/neaeracubes)
cost = 20
containertype = /obj/structure/closet/crate/freezer
containername = "Neaera crate"
/datum/supply_pack/hydro/stok
name = "Stok crate"
contains = list (/obj/item/weapon/storage/box/monkeycubes/stokcubes)
contains = list (/obj/item/storage/box/monkeycubes/stokcubes)
cost = 20
containertype = /obj/structure/closet/crate/freezer
containername = "Stok crate"
@@ -59,15 +59,15 @@
/datum/supply_pack/hydro/hydroponics
name = "Hydroponics Supply Crate"
contains = list(
/obj/item/weapon/reagent_containers/spray/plantbgone = 4,
/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 2,
/obj/item/weapon/material/knife/machete/hatchet,
/obj/item/weapon/material/minihoe,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/reagent_containers/spray/plantbgone = 4,
/obj/item/reagent_containers/glass/bottle/ammonia = 2,
/obj/item/material/knife/machete/hatchet,
/obj/item/material/minihoe,
/obj/item/analyzer/plant_analyzer,
/obj/item/clothing/gloves/botanic_leather,
/obj/item/clothing/suit/storage/apron,
/obj/item/weapon/material/minihoe,
/obj/item/weapon/storage/box/botanydisk
/obj/item/material/minihoe,
/obj/item/storage/box/botanydisk
)
cost = 20
containertype = /obj/structure/closet/crate/hydroponics
@@ -124,11 +124,11 @@
/datum/supply_pack/hydro/weedcontrol
name = "Weed control crate"
contains = list(
/obj/item/weapon/material/knife/machete/hatchet = 2,
/obj/item/weapon/reagent_containers/spray/plantbgone = 4,
/obj/item/material/knife/machete/hatchet = 2,
/obj/item/reagent_containers/spray/plantbgone = 4,
/obj/item/clothing/mask/gas = 2,
/obj/item/weapon/grenade/chem_grenade/antiweed = 2,
/obj/item/weapon/material/twohanded/fireaxe/scythe
/obj/item/grenade/chem_grenade/antiweed = 2,
/obj/item/material/twohanded/fireaxe/scythe
)
cost = 45
containertype = /obj/structure/closet/crate/grayson
@@ -172,28 +172,28 @@
/datum/supply_pack/hydro/sobaka
name = "Sobaka crate"
contains = list (/obj/item/weapon/storage/box/monkeycubes/sobakacubes)
contains = list (/obj/item/storage/box/monkeycubes/sobakacubes)
cost = 20
containertype = /obj/structure/closet/crate/freezer
containername = "Sobaka crate"
/datum/supply_pack/hydro/saru
name = "Saru crate"
contains = list (/obj/item/weapon/storage/box/monkeycubes/sarucubes)
contains = list (/obj/item/storage/box/monkeycubes/sarucubes)
cost = 20
containertype = /obj/structure/closet/crate/freezer
containername = "Saru crate"
/datum/supply_pack/hydro/sparra
name = "Sparra crate"
contains = list (/obj/item/weapon/storage/box/monkeycubes/sparracubes)
contains = list (/obj/item/storage/box/monkeycubes/sparracubes)
cost = 20
containertype = /obj/structure/closet/crate/freezer
containername = "Sparra crate"
/datum/supply_pack/hydro/wolpin
name = "Wolpin crate"
contains = list (/obj/item/weapon/storage/box/monkeycubes/wolpincubes)
contains = list (/obj/item/storage/box/monkeycubes/wolpincubes)
cost = 20
containertype = /obj/structure/closet/crate/freezer
containername = "Wolpin crate"
@@ -207,9 +207,9 @@
/datum/supply_pack/hydro/fish
name = "Fish supply crate"
contains = list(
/obj/item/weapon/reagent_containers/food/snacks/lobster = 6,
/obj/item/weapon/reagent_containers/food/snacks/cuttlefish = 8,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish = 1
/obj/item/reagent_containers/food/snacks/lobster = 6,
/obj/item/reagent_containers/food/snacks/cuttlefish = 8,
/obj/item/reagent_containers/food/snacks/sliceable/monkfish = 1
)
cost = 20
containertype = /obj/structure/closet/crate/freezer
@@ -218,14 +218,14 @@
/datum/supply_pack/hydro/fennec_food
name = "Fennec treats crate"
contains = list(
/obj/item/weapon/reagent_containers/food/snacks/locust = 6,
/obj/item/weapon/storage/box/wings/bucket = 2,
/obj/item/weapon/reagent_containers/food/snacks/grub_pink = 2,
/obj/item/weapon/reagent_containers/food/snacks/grub_blue = 2,
/obj/item/weapon/reagent_containers/food/snacks/grub_purple = 2,
/obj/item/weapon/reagent_containers/food/snacks/honey_candy = 4,
/obj/item/weapon/reagent_containers/food/snacks/scorpion = 4,
/obj/item/weapon/reagent_containers/food/snacks/ant = 4
/obj/item/reagent_containers/food/snacks/locust = 6,
/obj/item/storage/box/wings/bucket = 2,
/obj/item/reagent_containers/food/snacks/grub_pink = 2,
/obj/item/reagent_containers/food/snacks/grub_blue = 2,
/obj/item/reagent_containers/food/snacks/grub_purple = 2,
/obj/item/reagent_containers/food/snacks/honey_candy = 4,
/obj/item/reagent_containers/food/snacks/scorpion = 4,
/obj/item/reagent_containers/food/snacks/ant = 4
)
cost = 20
containertype = /obj/structure/closet/crate/fennec
code/datums/supplypacks/medical.dm
+91 -91
View File
@@ -10,16 +10,16 @@
/datum/supply_pack/med/medical
name = "Medical crate"
contains = list(
/obj/item/weapon/storage/firstaid/regular,
/obj/item/weapon/storage/firstaid/fire,
/obj/item/weapon/storage/firstaid/toxin,
/obj/item/weapon/storage/firstaid/o2,
/obj/item/weapon/storage/firstaid/adv,
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
/obj/item/weapon/reagent_containers/glass/bottle/stoxin,
/obj/item/weapon/storage/box/syringes,
/obj/item/weapon/storage/box/autoinjectors
/obj/item/storage/firstaid/regular,
/obj/item/storage/firstaid/fire,
/obj/item/storage/firstaid/toxin,
/obj/item/storage/firstaid/o2,
/obj/item/storage/firstaid/adv,
/obj/item/reagent_containers/glass/bottle/antitoxin,
/obj/item/reagent_containers/glass/bottle/inaprovaline,
/obj/item/reagent_containers/glass/bottle/stoxin,
/obj/item/storage/box/syringes,
/obj/item/storage/box/autoinjectors
)
cost = 15
containertype = /obj/structure/closet/crate/zenghu
@@ -27,21 +27,21 @@
/datum/supply_pack/med/bloodpack
name = "BloodPack crate"
contains = list(/obj/item/weapon/storage/box/bloodpacks = 3)
contains = list(/obj/item/storage/box/bloodpacks = 3)
cost = 10
containertype = /obj/structure/closet/crate/nanomed
containername = "BloodPack crate"
/datum/supply_pack/med/synthplas
name = "BloodPack (Synthplas) crate"
contains = list(/obj/item/weapon/reagent_containers/blood/synthplas = 6)
contains = list(/obj/item/reagent_containers/blood/synthplas = 6)
cost = 80
containertype = /obj/structure/closet/crate/nanomed
containername = "SynthPlas crate"
/datum/supply_pack/med/bodybag
name = "Body bag crate"
contains = list(/obj/item/weapon/storage/box/bodybags = 3)
contains = list(/obj/item/storage/box/bodybags = 3)
cost = 10
containertype = /obj/structure/closet/crate/nanomed
containername = "Body bag crate"
@@ -56,17 +56,17 @@
/datum/supply_pack/med/surgery
name = "Surgery crate"
contains = list(
/obj/item/weapon/surgical/cautery,
/obj/item/weapon/surgical/surgicaldrill,
/obj/item/surgical/cautery,
/obj/item/surgical/surgicaldrill,
/obj/item/clothing/mask/breath/medical,
/obj/item/weapon/tank/anesthetic,
/obj/item/weapon/surgical/FixOVein,
/obj/item/weapon/surgical/hemostat,
/obj/item/weapon/surgical/scalpel,
/obj/item/weapon/surgical/bonegel,
/obj/item/weapon/surgical/retractor,
/obj/item/weapon/surgical/bonesetter,
/obj/item/weapon/surgical/circular_saw
/obj/item/tank/anesthetic,
/obj/item/surgical/FixOVein,
/obj/item/surgical/hemostat,
/obj/item/surgical/scalpel,
/obj/item/surgical/bonegel,
/obj/item/surgical/retractor,
/obj/item/surgical/bonesetter,
/obj/item/surgical/circular_saw
)
cost = 25
containertype = /obj/structure/closet/crate/secure/veymed
@@ -76,8 +76,8 @@
/datum/supply_pack/med/deathalarm
name = "Death Alarm crate"
contains = list(
/obj/item/weapon/storage/box/cdeathalarm_kit,
/obj/item/weapon/storage/box/cdeathalarm_kit
/obj/item/storage/box/cdeathalarm_kit,
/obj/item/storage/box/cdeathalarm_kit
)
cost = 40
containertype = /obj/structure/closet/crate/secure/ward
@@ -87,7 +87,7 @@
/datum/supply_pack/med/clotting
name = "Clotting Medicine crate"
contains = list(
/obj/item/weapon/storage/firstaid/clotting
/obj/item/storage/firstaid/clotting
)
cost = 100
containertype = /obj/structure/closet/crate/secure/zenghu
@@ -99,9 +99,9 @@
contains = list(
/obj/item/clothing/under/rank/medical/scrubs/green = 2,
/obj/item/clothing/head/surgery/green = 2,
/obj/item/weapon/storage/box/masks,
/obj/item/weapon/storage/box/gloves,
/obj/item/weapon/storage/belt/medical = 3
/obj/item/storage/box/masks,
/obj/item/storage/box/gloves,
/obj/item/storage/belt/medical = 3
)
cost = 10
containertype = /obj/structure/closet/crate/veymed
@@ -110,9 +110,9 @@
/datum/supply_pack/med/extragear
name = "Medical surplus equipment"
contains = list(
/obj/item/weapon/storage/belt/medical = 3,
/obj/item/storage/belt/medical = 3,
/obj/item/clothing/glasses/hud/health = 3,
/obj/item/device/radio/headset/headset_med/alt = 3,
/obj/item/radio/headset/headset_med/alt = 3,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical = 3
)
cost = 10
@@ -123,21 +123,21 @@
/datum/supply_pack/med/cmogear
name = "Chief medical officer equipment"
contains = list(
/obj/item/weapon/storage/belt/medical,
/obj/item/device/radio/headset/heads/cmo,
/obj/item/storage/belt/medical,
/obj/item/radio/headset/heads/cmo,
/obj/item/clothing/under/rank/chief_medical_officer,
/obj/item/weapon/reagent_containers/hypospray/vial,
/obj/item/reagent_containers/hypospray/vial,
/obj/item/clothing/accessory/stethoscope,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/suit/storage/toggle/labcoat/cmo,
/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
/obj/item/clothing/mask/surgical,
/obj/item/clothing/shoes/white,
/obj/item/weapon/cartridge/cmo,
/obj/item/cartridge/cmo,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/device/healthanalyzer,
/obj/item/device/flashlight/pen,
/obj/item/weapon/reagent_containers/syringe
/obj/item/healthanalyzer,
/obj/item/flashlight/pen,
/obj/item/reagent_containers/syringe
)
cost = 50
containertype = /obj/structure/closet/crate/secure/nanomed
@@ -147,20 +147,20 @@
/datum/supply_pack/med/doctorgear
name = JOB_MEDICAL_DOCTOR + " equipment"
contains = list(
/obj/item/weapon/storage/belt/medical,
/obj/item/device/radio/headset/headset_med,
/obj/item/storage/belt/medical,
/obj/item/radio/headset/headset_med,
/obj/item/clothing/under/rank/medical,
/obj/item/clothing/accessory/stethoscope,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/suit/storage/toggle/labcoat,
/obj/item/clothing/mask/surgical,
/obj/item/weapon/storage/firstaid/adv,
/obj/item/storage/firstaid/adv,
/obj/item/clothing/shoes/white,
/obj/item/weapon/cartridge/medical,
/obj/item/cartridge/medical,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/device/healthanalyzer,
/obj/item/device/flashlight/pen,
/obj/item/weapon/reagent_containers/syringe
/obj/item/healthanalyzer,
/obj/item/flashlight/pen,
/obj/item/reagent_containers/syringe
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
@@ -170,20 +170,20 @@
/datum/supply_pack/med/chemistgear
name = JOB_CHEMIST + " equipment"
contains = list(
/obj/item/weapon/storage/box/beakers,
/obj/item/device/radio/headset/headset_med,
/obj/item/weapon/storage/box/autoinjectors,
/obj/item/storage/box/beakers,
/obj/item/radio/headset/headset_med,
/obj/item/storage/box/autoinjectors,
/obj/item/clothing/under/rank/chemist,
/obj/item/clothing/glasses/science,
/obj/item/clothing/suit/storage/toggle/labcoat/chemist,
/obj/item/clothing/mask/surgical,
/obj/item/clothing/shoes/white,
/obj/item/weapon/cartridge/chemistry,
/obj/item/cartridge/chemistry,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/weapon/reagent_containers/dropper,
/obj/item/device/healthanalyzer,
/obj/item/weapon/storage/box/pillbottles,
/obj/item/weapon/reagent_containers/syringe
/obj/item/reagent_containers/dropper,
/obj/item/healthanalyzer,
/obj/item/storage/box/pillbottles,
/obj/item/reagent_containers/syringe
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
@@ -193,8 +193,8 @@
/datum/supply_pack/med/paramedicgear
name = JOB_PARAMEDIC + " equipment"
contains = list(
/obj/item/weapon/storage/belt/medical/emt,
/obj/item/device/radio/headset/headset_med,
/obj/item/storage/belt/medical/emt,
/obj/item/radio/headset/headset_med,
/obj/item/clothing/under/rank/medical/scrubs/black,
/obj/item/clothing/accessory/armband/medblue,
/obj/item/clothing/glasses/hud/health,
@@ -204,13 +204,13 @@
/obj/item/clothing/mask/gas,
/obj/item/clothing/under/rank/medical/paramedic_alt,
/obj/item/clothing/accessory/stethoscope,
/obj/item/weapon/storage/firstaid/adv,
/obj/item/storage/firstaid/adv,
/obj/item/clothing/shoes/boots/jackboots,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/device/healthanalyzer,
/obj/item/weapon/cartridge/medical,
/obj/item/device/flashlight/pen,
/obj/item/weapon/reagent_containers/syringe,
/obj/item/healthanalyzer,
/obj/item/cartridge/medical,
/obj/item/flashlight/pen,
/obj/item/reagent_containers/syringe,
/obj/item/clothing/accessory/storage/white_vest
)
cost = 20
@@ -222,15 +222,15 @@
name = JOB_PSYCHIATRIST + " equipment"
contains = list(
/obj/item/clothing/under/rank/psych,
/obj/item/device/radio/headset/headset_med,
/obj/item/radio/headset/headset_med,
/obj/item/clothing/under/rank/psych/turtleneck,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/suit/storage/toggle/labcoat,
/obj/item/clothing/shoes/white,
/obj/item/weapon/clipboard,
/obj/item/weapon/folder/white,
/obj/item/weapon/pen,
/obj/item/weapon/cartridge/medical
/obj/item/clipboard,
/obj/item/folder/white,
/obj/item/pen,
/obj/item/cartridge/medical
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
@@ -250,8 +250,8 @@
/obj/item/clothing/head/surgery/blue = 3,
/obj/item/clothing/head/surgery/green = 3,
/obj/item/clothing/head/surgery/black = 3,
/obj/item/weapon/storage/box/masks,
/obj/item/weapon/storage/box/gloves
/obj/item/storage/box/masks,
/obj/item/storage/box/gloves
)
cost = 10
containertype = /obj/structure/closet/crate/secure/nanomed
@@ -261,14 +261,14 @@
/datum/supply_pack/med/autopsy
name = "Autopsy equipment"
contains = list(
/obj/item/weapon/folder/white,
/obj/item/device/camera,
/obj/item/device/camera_film = 2,
/obj/item/weapon/autopsy_scanner,
/obj/item/weapon/surgical/scalpel,
/obj/item/weapon/storage/box/masks,
/obj/item/weapon/storage/box/gloves,
/obj/item/weapon/pen
/obj/item/folder/white,
/obj/item/camera,
/obj/item/camera_film = 2,
/obj/item/autopsy_scanner,
/obj/item/surgical/scalpel,
/obj/item/storage/box/masks,
/obj/item/storage/box/gloves,
/obj/item/pen
)
cost = 20
containertype = /obj/structure/closet/crate/secure/veymed
@@ -294,8 +294,8 @@
/obj/item/clothing/suit/storage/toggle/labcoat/genetics,
/obj/item/clothing/suit/storage/toggle/labcoat/virologist,
/obj/item/clothing/suit/storage/toggle/labcoat/chemist,
/obj/item/weapon/storage/box/masks,
/obj/item/weapon/storage/box/gloves
/obj/item/storage/box/masks,
/obj/item/storage/box/gloves
)
cost = 10
containertype = /obj/structure/closet/crate/secure/nanomed
@@ -311,9 +311,9 @@
/obj/item/clothing/suit/bio_suit/cmo,
/obj/item/clothing/head/bio_hood/cmo,
/obj/item/clothing/mask/gas = 5,
/obj/item/weapon/tank/oxygen = 5,
/obj/item/weapon/storage/box/masks,
/obj/item/weapon/storage/box/gloves
/obj/item/tank/oxygen = 5,
/obj/item/storage/box/masks,
/obj/item/storage/box/gloves
)
cost = 50
containertype = /obj/structure/closet/crate/secure/nanomed
@@ -322,7 +322,7 @@
/datum/supply_pack/med/portablefreezers
name = "Portable freezers crate"
contains = list(/obj/item/weapon/storage/box/freezer = 7)
contains = list(/obj/item/storage/box/freezer = 7)
cost = 25
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Portable freezers"
@@ -330,7 +330,7 @@
/datum/supply_pack/med/virus
name = "Virus sample crate"
contains = list(/obj/item/weapon/virusdish/random = 4)
contains = list(/obj/item/virusdish/random = 4)
cost = 25
containertype = /obj/structure/closet/crate/secure/zenghu
containername = "Virus sample crate"
@@ -338,7 +338,7 @@
/datum/supply_pack/med/defib
name = "Defibrillator crate"
contains = list(/obj/item/device/defib_kit = 2)
contains = list(/obj/item/defib_kit = 2)
cost = 30
containertype = /obj/structure/closet/crate/veymed
containername = "Defibrillator crate"
@@ -388,9 +388,9 @@
/obj/item/clothing/head/bio_hood/cmo,
/obj/item/clothing/shoes/white = 7,
/obj/item/clothing/mask/gas = 7,
/obj/item/weapon/tank/oxygen = 7,
/obj/item/weapon/storage/box/masks,
/obj/item/weapon/storage/box/gloves
/obj/item/tank/oxygen = 7,
/obj/item/storage/box/masks,
/obj/item/storage/box/gloves
)
cost = 40
@@ -400,9 +400,9 @@
/obj/item/clothing/suit/bio_suit/virology = 3,
/obj/item/clothing/head/bio_hood/virology = 3,
/obj/item/clothing/mask/gas = 3,
/obj/item/weapon/tank/oxygen = 3,
/obj/item/weapon/storage/box/masks,
/obj/item/weapon/storage/box/gloves
/obj/item/tank/oxygen = 3,
/obj/item/storage/box/masks,
/obj/item/storage/box/gloves
)
cost = 40
containertype = /obj/structure/closet/crate/secure
@@ -411,7 +411,7 @@
/datum/supply_pack/med/virus
name = "Virus sample crate"
contains = list(/obj/item/weapon/virusdish/random = 4)
contains = list(/obj/item/virusdish/random = 4)
cost = 25
containertype = /obj/structure/closet/crate/secure
containername = "Virus sample crate"
@@ -423,7 +423,7 @@
/datum/supply_pack/med/compactdefib
name = "Compact Defibrillator crate"
contains = list(/obj/item/device/defib_kit/compact = 1)
contains = list(/obj/item/defib_kit/compact = 1)
cost = 90
containertype = /obj/structure/closet/crate/secure
containername = "Compact Defibrillator crate"
code/datums/supplypacks/misc.dm
+32 -32
View File
@@ -14,9 +14,9 @@
/datum/supply_pack/randomised/misc/card_packs
num_contained = 5
contains = list(
/obj/item/weapon/pack/cardemon,
/obj/item/weapon/pack/spaceball,
/obj/item/weapon/deck/holder
/obj/item/pack/cardemon,
/obj/item/pack/spaceball,
/obj/item/deck/holder
)
name = "Trading Card Crate"
cost = 10
@@ -94,7 +94,7 @@
containername = "Plushies Crate"
/datum/supply_pack/misc/eftpos
contains = list(/obj/item/device/eftpos)
contains = list(/obj/item/eftpos)
name = "EFTPOS scanner"
cost = 10
containertype = /obj/structure/closet/crate/nanotrasen
@@ -111,8 +111,8 @@
/obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout,
/obj/item/clothing/suit/holidaypriest,
/obj/item/clothing/under/wedding/bride_white,
/obj/item/weapon/storage/backpack/cultpack,
/obj/item/weapon/storage/fancy/candle_box = 3
/obj/item/storage/backpack/cultpack,
/obj/item/storage/fancy/candle_box = 3
)
cost = 10
containertype = /obj/structure/closet/crate/gilthari
@@ -151,7 +151,7 @@
/datum/supply_pack/misc/glucose_hypos
name = "Glucose Hypoinjectors"
contains = list(
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose = 5
)
cost = 25
containertype = /obj/structure/closet/crate/zenghu
@@ -160,16 +160,16 @@
/datum/supply_pack/misc/mre_rations
num_contained = 6
name = "Emergency - MREs"
contains = list(/obj/item/weapon/storage/mre,
/obj/item/weapon/storage/mre/menu2,
/obj/item/weapon/storage/mre/menu3,
/obj/item/weapon/storage/mre/menu4,
/obj/item/weapon/storage/mre/menu5,
/obj/item/weapon/storage/mre/menu6,
/obj/item/weapon/storage/mre/menu7,
/obj/item/weapon/storage/mre/menu8,
/obj/item/weapon/storage/mre/menu9,
/obj/item/weapon/storage/mre/menu10)
contains = list(/obj/item/storage/mre,
/obj/item/storage/mre/menu2,
/obj/item/storage/mre/menu3,
/obj/item/storage/mre/menu4,
/obj/item/storage/mre/menu5,
/obj/item/storage/mre/menu6,
/obj/item/storage/mre/menu7,
/obj/item/storage/mre/menu8,
/obj/item/storage/mre/menu9,
/obj/item/storage/mre/menu10)
cost = 50
containertype = /obj/structure/closet/crate/centauri
containername = "ready to eat rations"
@@ -177,7 +177,7 @@
/datum/supply_pack/misc/paste_rations
name = "Emergency - Paste"
contains = list(
/obj/item/weapon/storage/mre/menu11 = 2
/obj/item/storage/mre/menu11 = 2
)
cost = 25
containertype = /obj/structure/closet/crate/freezer/centauri
@@ -186,7 +186,7 @@
/datum/supply_pack/misc/medical_rations
name = "Emergency - VitaPaste"
contains = list(
/obj/item/weapon/storage/mre/menu13 = 2
/obj/item/storage/mre/menu13 = 2
)
cost = 40
containertype = /obj/structure/closet/crate/zenghu
@@ -204,12 +204,12 @@
/datum/supply_pack/misc/beltminer
name = "Belt-miner gear crate"
contains = list(
/obj/item/weapon/gun/energy/particle = 2,
/obj/item/weapon/cell/device/weapon = 2,
/obj/item/weapon/storage/firstaid/regular = 1,
/obj/item/device/gps = 2,
/obj/item/weapon/storage/box/traumainjectors = 1,
/obj/item/device/binoculars = 1
/obj/item/gun/energy/particle = 2,
/obj/item/cell/device/weapon = 2,
/obj/item/storage/firstaid/regular = 1,
/obj/item/gps = 2,
/obj/item/storage/box/traumainjectors = 1,
/obj/item/binoculars = 1
)
cost = 60
containertype = /obj/structure/closet/crate/secure/gear
@@ -221,7 +221,7 @@
/datum/supply_pack/misc/jetpack
name = "jetpack (empty)"
contains = list(
/obj/item/weapon/tank/jetpack = 1
/obj/item/tank/jetpack = 1
)
cost = 75
containertype = /obj/structure/closet/crate/secure/gear
@@ -236,8 +236,8 @@
name = JOB_EXPLORER + " shield"
num_contained = 2
contains = list(
/obj/item/weapon/shield/riot/explorer,
/obj/item/weapon/shield/riot/explorer/purple
/obj/item/shield/riot/explorer,
/obj/item/shield/riot/explorer/purple
)
cost = 75
containertype = /obj/structure/closet/crate/secure/gear
@@ -249,7 +249,7 @@
/datum/supply_pack/misc/music_players
name = "music players (3)"
contains = list(
/obj/item/device/walkpod = 3
/obj/item/walkpod = 3
)
cost = 150
containertype = /obj/structure/closet/crate
@@ -258,7 +258,7 @@
/datum/supply_pack/misc/juke_remotes
name = "jukebox remote speakers (2)"
contains = list(
/obj/item/device/juke_remote = 2
/obj/item/juke_remote = 2
)
cost = 300
containertype = /obj/structure/closet/crate
@@ -267,7 +267,7 @@
/datum/supply_pack/misc/explorer_headsets
name = "shortwave-capable headsets (x4)"
contains = list(
/obj/item/device/radio/headset/explorer = 4
/obj/item/radio/headset/explorer = 4
)
cost = 20
containertype = /obj/structure/closet/crate/secure/gear
@@ -282,7 +282,7 @@
/datum/supply_pack/misc/emergency_beacons
name = "emergency locator beacons (x4)"
contains = list(
/obj/item/device/emergency_beacon = 4
/obj/item/emergency_beacon = 4
)
cost = 20
containertype = /obj/structure/closet/crate
code/datums/supplypacks/munitions.dm
+36 -36
View File
@@ -12,12 +12,12 @@
/datum/supply_pack/munitions/weapons
name = "Weapons - Security basic equipment"
contains = list(
/obj/item/device/flash = 2,
/obj/item/weapon/reagent_containers/spray/pepper = 2,
/obj/item/weapon/melee/baton/loaded = 2,
/obj/item/weapon/gun/energy/taser = 2,
/obj/item/weapon/gun/projectile/colt/detective = 2,
/obj/item/weapon/storage/box/flashbangs = 2
/obj/item/flash = 2,
/obj/item/reagent_containers/spray/pepper = 2,
/obj/item/melee/baton/loaded = 2,
/obj/item/gun/energy/taser = 2,
/obj/item/gun/projectile/colt/detective = 2,
/obj/item/storage/box/flashbangs = 2
)
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
@@ -26,7 +26,7 @@
/datum/supply_pack/munitions/egunpistol
name = "Weapons - Energy sidearms"
contains = list(/obj/item/weapon/gun/energy/gun = 2)
contains = list(/obj/item/gun/energy/gun = 2)
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Energy sidearms crate"
@@ -35,9 +35,9 @@
/datum/supply_pack/munitions/flareguns
name = "Weapons - Flare guns"
contains = list(
/obj/item/weapon/gun/projectile/sec/flash,
/obj/item/gun/projectile/sec/flash,
/obj/item/ammo_magazine/m45/flash,
/obj/item/weapon/gun/projectile/shotgun/doublebarrel/flare,
/obj/item/gun/projectile/shotgun/doublebarrel/flare,
/obj/item/ammo_magazine/ammo_box/b12g/flash
)
cost = 25
@@ -48,8 +48,8 @@
/datum/supply_pack/munitions/eweapons
name = "Weapons - Experimental weapons crate"
contains = list(
/obj/item/weapon/gun/energy/xray = 2,
/obj/item/weapon/shield/energy = 2)
/obj/item/gun/energy/xray = 2,
/obj/item/shield/energy = 2)
cost = 100
containertype = /obj/structure/closet/crate/secure/science
containername = "Experimental weapons crate"
@@ -57,7 +57,7 @@
/datum/supply_pack/munitions/energyweapons
name = "Weapons - Laser rifle crate"
contains = list(/obj/item/weapon/gun/energy/laser = 2) //VOREStation Edit - Made to be consistent with the energy guns crate.
contains = list(/obj/item/gun/energy/laser = 2) //VOREStation Edit - Made to be consistent with the energy guns crate.
cost = 50
containertype = /obj/structure/closet/crate/secure/heph
containername = "Energy weapons crate"
@@ -68,7 +68,7 @@
contains = list(
/obj/item/ammo_magazine/ammo_box/b12g,
/obj/item/ammo_magazine/ammo_box/b12g/pellet,
/obj/item/weapon/gun/projectile/shotgun/pump/combat = 2
/obj/item/gun/projectile/shotgun/pump/combat = 2
)
cost = 50
containertype = /obj/structure/closet/crate/secure/weapon
@@ -81,7 +81,7 @@
contains = list(
/obj/item/ammo_magazine/ammo_box/b12g,
/obj/item/ammo_magazine/ammo_box/b12g/pellet,
/obj/item/weapon/gun/projectile/shotgun/semi = 2
/obj/item/gun/projectile/shotgun/semi = 2
)
cost = 100
containertype = /obj/structure/closet/crate/secure/weapon
@@ -90,7 +90,7 @@
/datum/supply_pack/munitions/erifle
name = "Weapons - Energy marksman"
contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2)
contains = list(/obj/item/gun/energy/sniperrifle = 2)
cost = 100
containertype = /obj/structure/closet/crate/secure/heph
containername = "Energy marksman crate"
@@ -98,7 +98,7 @@
/datum/supply_pack/munitions/burstlaser
name = "Weapons - Burst laser"
contains = list(/obj/item/weapon/gun/energy/gun/burst = 2)
contains = list(/obj/item/gun/energy/gun/burst = 2)
cost = 50
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Burst laser crate"
@@ -107,8 +107,8 @@
/datum/supply_pack/munitions/ionweapons
name = "Weapons - Electromagnetic Rifles"
contains = list(
/obj/item/weapon/gun/energy/ionrifle = 2,
/obj/item/weapon/storage/box/empslite
/obj/item/gun/energy/ionrifle = 2,
/obj/item/storage/box/empslite
)
cost = 50
containertype = /obj/structure/closet/crate/secure/ward
@@ -118,8 +118,8 @@
/datum/supply_pack/munitions/ionpistols
name = "Weapons - Electromagnetic pistols"
contains = list(
/obj/item/weapon/gun/energy/ionrifle/pistol = 2,
/obj/item/weapon/storage/box/empslite
/obj/item/gun/energy/ionrifle/pistol = 2,
/obj/item/storage/box/empslite
)
cost = 30
containertype = /obj/structure/closet/crate/secure/ward
@@ -128,7 +128,7 @@
/datum/supply_pack/munitions/bsmg
name = "Weapons - Ballistic SMGs"
contains = list(/obj/item/weapon/gun/projectile/automatic/wt550 = 2)
contains = list(/obj/item/gun/projectile/automatic/wt550 = 2)
cost = 50
containertype = /obj/structure/closet/crate/secure/ward
containername = "Ballistic weapon crate"
@@ -136,7 +136,7 @@
/datum/supply_pack/munitions/brifle
name = "Weapons - Ballistic Rifles"
contains = list(/obj/item/weapon/gun/projectile/automatic/z8 = 2)
contains = list(/obj/item/gun/projectile/automatic/z8 = 2)
cost = 80
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic weapon crate"
@@ -145,7 +145,7 @@
/datum/supply_pack/munitions/bolt_rifles_lethal
name = "Weapons - Bolt-Action Rifles"
contains = list(
/obj/item/weapon/gun/projectile/shotgun/pump/rifle = 2,
/obj/item/gun/projectile/shotgun/pump/rifle = 2,
/obj/item/ammo_magazine/ammo_box/b762 = 4,
)
cost = 60
@@ -156,8 +156,8 @@
/datum/supply_pack/munitions/bolt_rifles_competitive
name = "Weapons - Competitive shooting rifles"
contains = list(
/obj/item/device/assembly/timer,
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice = 2,
/obj/item/assembly/timer,
/obj/item/gun/projectile/shotgun/pump/rifle/practice = 2,
/obj/item/ammo_magazine/clip/c762/practice = 4,
/obj/item/target = 2,
/obj/item/target/alien = 2,
@@ -171,7 +171,7 @@
/datum/supply_pack/munitions/caseless
name = "Weapons - Prototype Caseless Rifle"
contains = list(
/obj/item/weapon/gun/projectile/caseless/prototype,
/obj/item/gun/projectile/caseless/prototype,
/obj/item/ammo_magazine/m5mmcaseless = 3
)
cost = 60
@@ -181,7 +181,7 @@
/datum/supply_pack/munitions/mrifle
name = "Weapons - Magnetic Rifles"
contains = list(/obj/item/weapon/gun/magnetic/railgun/heater = 2)
contains = list(/obj/item/gun/magnetic/railgun/heater = 2)
cost = 120
containertype = /obj/structure/closet/crate/secure/heph
containername = "Magnetic weapon crate"
@@ -189,7 +189,7 @@
/datum/supply_pack/munitions/mpistol
name = "Weapons - Magnetic Pistols"
contains = list(/obj/item/weapon/gun/magnetic/railgun/heater/pistol = 2)
contains = list(/obj/item/gun/magnetic/railgun/heater/pistol = 2)
cost = 200
containertype = /obj/structure/closet/crate/secure/heph
containername = "Magnetic weapon crate"
@@ -197,7 +197,7 @@
/datum/supply_pack/munitions/mcarbine
name = "Weapons - Magnetic Carbines"
contains = list(/obj/item/weapon/gun/magnetic/railgun/flechette/sif = 2)
contains = list(/obj/item/gun/magnetic/railgun/flechette/sif = 2)
cost = 130
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Magnetic weapon crate"
@@ -205,7 +205,7 @@
/datum/supply_pack/munitions/mshells
name = "Weapons - Magnetic Shells"
contains = list(/obj/item/weapon/magnetic_ammo = 3)
contains = list(/obj/item/magnetic_ammo = 3)
cost = 100
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Magnetic ammunition crate"
@@ -213,7 +213,7 @@
/datum/supply_pack/munitions/claymore
name = "Weapons - Melee - Claymores"
contains = list(/obj/item/weapon/material/sword = 2)
contains = list(/obj/item/material/sword = 2)
cost = 150
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Claymore crate"
@@ -264,7 +264,7 @@
/datum/supply_pack/munitions/pcellammo
name = "Ammunition - Power cell"
contains = list(/obj/item/weapon/cell/device/weapon = 3)
contains = list(/obj/item/cell/device/weapon = 3)
cost = 50
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Energy ammunition crate"
@@ -274,8 +274,8 @@
/datum/supply_pack/munitions/expeditionguns
name = "Frontier phaser (station-locked) crate"
contains = list(
/obj/item/weapon/gun/energy/locked/frontier = 2,
/obj/item/weapon/gun/energy/locked/frontier/holdout = 2,
/obj/item/gun/energy/locked/frontier = 2,
/obj/item/gun/energy/locked/frontier/holdout = 2,
)
cost = 35
containertype = /obj/structure/closet/crate/secure
@@ -285,7 +285,7 @@
/datum/supply_pack/munitions/expeditionbows
name = "Frontier bows (station-locked) crate"
contains = list(
/obj/item/weapon/gun/energy/locked/frontier/handbow=2
/obj/item/gun/energy/locked/frontier/handbow=2
)
cost = 20
containertype = /obj/structure/closet/crate/secure
@@ -336,7 +336,7 @@
/datum/supply_pack/munitions/longsword
name = "Weapons - Melee -Longsword (Steel)"
contains = list(
/obj/item/weapon/material/twohanded/longsword=2
/obj/item/material/twohanded/longsword=2
)
cost = 50
containertype = /obj/structure/closet/crate/secure
code/datums/supplypacks/recreation.dm
+49 -49
View File
@@ -14,10 +14,10 @@
/datum/supply_pack/recreation/foam_weapons
name = "Foam Weapon Crate"
contains = list(
/obj/item/weapon/material/sword/foam = 2,
/obj/item/weapon/material/twohanded/baseballbat/foam = 2,
/obj/item/weapon/material/twohanded/spear/foam = 2,
/obj/item/weapon/material/twohanded/fireaxe/foam = 2
/obj/item/material/sword/foam = 2,
/obj/item/material/twohanded/baseballbat/foam = 2,
/obj/item/material/twohanded/spear/foam = 2,
/obj/item/material/twohanded/fireaxe/foam = 2
)
cost = 50
containertype = /obj/structure/closet/crate/allico
@@ -27,8 +27,8 @@
name = "Donk-Soft Weapon Crate"
contains = list(
/obj/item/ammo_magazine/ammo_box/foam = 2,
/obj/item/weapon/gun/projectile/shotgun/pump/toy = 2,
/obj/item/weapon/gun/projectile/pistol/toy = 2,
/obj/item/gun/projectile/shotgun/pump/toy = 2,
/obj/item/gun/projectile/pistol/toy = 2,
/obj/item/ammo_magazine/mfoam_dart/pistol = 2
)
cost = 50
@@ -54,9 +54,9 @@
/datum/supply_pack/recreation/lasertag
name = "Lasertag equipment"
contains = list(
/obj/item/weapon/gun/energy/lasertag/red,
/obj/item/gun/energy/lasertag/red,
/obj/item/clothing/suit/redtag,
/obj/item/weapon/gun/energy/lasertag/blue,
/obj/item/gun/energy/lasertag/blue,
/obj/item/clothing/suit/bluetag
)
containertype = /obj/structure/closet/crate/ward
@@ -66,14 +66,14 @@
/datum/supply_pack/recreation/artscrafts
name = "Arts and Crafts supplies"
contains = list(
/obj/item/weapon/storage/fancy/crayons,
/obj/item/weapon/storage/fancy/markers,
/obj/item/device/camera,
/obj/item/device/camera_film = 2,
/obj/item/weapon/storage/photo_album,
/obj/item/weapon/packageWrap,
/obj/item/storage/fancy/crayons,
/obj/item/storage/fancy/markers,
/obj/item/camera,
/obj/item/camera_film = 2,
/obj/item/storage/photo_album,
/obj/item/packageWrap,
/obj/item/poster/custom,
/obj/item/weapon/wrapping_paper = 3,
/obj/item/wrapping_paper = 3,
/obj/structure/easel,
/obj/item/paint_brush,
/obj/item/paint_palette,
@@ -93,19 +93,19 @@
containername = "station painting supplies crate"
containertype = /obj/structure/closet/crate/grayson
contains = list(
/obj/item/device/pipe_painter = 2,
/obj/item/device/floor_painter = 2,
/obj/item/weapon/reagent_containers/glass/paint/red,
/obj/item/weapon/reagent_containers/glass/paint/green,
/obj/item/weapon/reagent_containers/glass/paint/blue,
/obj/item/weapon/reagent_containers/glass/paint/yellow,
/obj/item/weapon/reagent_containers/glass/paint/violet,
/obj/item/weapon/reagent_containers/glass/paint/cyan,
/obj/item/weapon/reagent_containers/glass/paint/orange,
/obj/item/weapon/reagent_containers/glass/paint/purple,
/obj/item/weapon/reagent_containers/glass/paint/grey,
/obj/item/weapon/reagent_containers/glass/paint/black,
/obj/item/weapon/reagent_containers/glass/paint/white = 3
/obj/item/pipe_painter = 2,
/obj/item/floor_painter = 2,
/obj/item/reagent_containers/glass/paint/red,
/obj/item/reagent_containers/glass/paint/green,
/obj/item/reagent_containers/glass/paint/blue,
/obj/item/reagent_containers/glass/paint/yellow,
/obj/item/reagent_containers/glass/paint/violet,
/obj/item/reagent_containers/glass/paint/cyan,
/obj/item/reagent_containers/glass/paint/orange,
/obj/item/reagent_containers/glass/paint/purple,
/obj/item/reagent_containers/glass/paint/grey,
/obj/item/reagent_containers/glass/paint/black,
/obj/item/reagent_containers/glass/paint/white = 3
)
/datum/supply_pack/recreation/cheapbait
@@ -114,7 +114,7 @@
containername = "cheap bait crate"
containertype = /obj/structure/closet/crate/freezer
contains = list(
/obj/item/weapon/storage/box/wormcan/sickly = 5
/obj/item/storage/box/wormcan/sickly = 5
)
/datum/supply_pack/randomised/recreation/cheapbait
@@ -124,8 +124,8 @@
containertype = /obj/structure/closet/crate/carp
num_contained = 8
contains = list(
/obj/item/weapon/storage/box/wormcan,
/obj/item/weapon/storage/box/wormcan/deluxe
/obj/item/storage/box/wormcan,
/obj/item/storage/box/wormcan/deluxe
)
/datum/supply_pack/recreation/ltagturrets
@@ -144,7 +144,7 @@
containername = "monster bait crate"
containertype = /obj/structure/closet/crate/allico
contains = list(
/obj/item/weapon/toy/monster_bait
/obj/item/toy/monster_bait
)
/*
@@ -162,14 +162,14 @@
contains = list(
/obj/item/clothing/mask/muzzle,
/obj/item/clothing/glasses/sunglasses/blindfold,
/obj/item/weapon/handcuffs/fuzzy,
/obj/item/weapon/tape_roll,
/obj/item/handcuffs/fuzzy,
/obj/item/tape_roll,
/obj/item/stack/cable_coil/random,
/obj/item/clothing/accessory/collar/shock,
/obj/item/clothing/suit/straight_jacket,
/obj/item/weapon/handcuffs/legcuffs/fuzzy,
/obj/item/weapon/melee/fluff/holochain/mass,
/obj/item/weapon/material/twohanded/riding_crop,
/obj/item/handcuffs/legcuffs/fuzzy,
/obj/item/melee/fluff/holochain/mass,
/obj/item/material/twohanded/riding_crop,
/obj/item/clothing/under/fluff/latexmaid
)
containertype = /obj/structure/closet/crate
@@ -182,8 +182,8 @@
/obj/item/clothing/head/fluff/wolfgirl = 1,
/obj/item/clothing/shoes/fluff/wolfgirl = 1,
/obj/item/clothing/under/fluff/wolfgirl = 1,
/obj/item/weapon/melee/fluffstuff/wolfgirlsword = 1,
/obj/item/weapon/shield/fluff/wolfgirlshield = 1
/obj/item/melee/fluffstuff/wolfgirlsword = 1,
/obj/item/shield/fluff/wolfgirlshield = 1
)
cost = 50
containertype = /obj/structure/closet/crate
@@ -240,7 +240,7 @@
/datum/supply_pack/recreation/smoleworld
name = "Smole Bulding Bricks"
contains = list(
/obj/item/weapon/storage/smolebrickcase, /obj/item/weapon/storage/smolebrickcase,
/obj/item/storage/smolebrickcase, /obj/item/storage/smolebrickcase,
)
cost = 50
containertype = /obj/structure/closet/crate
@@ -250,7 +250,7 @@
name = "Snack planets pack"
num_contained = 4
contains = list(
/obj/item/weapon/storage/bagoplanets, /obj/item/weapon/storage/bagoplanets
/obj/item/storage/bagoplanets, /obj/item/storage/bagoplanets
)
cost = 25
containertype = /obj/structure/closet/crate
@@ -259,7 +259,7 @@
/datum/supply_pack/recreation/pinkpillows
name = "Pillow Crate - Pink"
contains = list(
/obj/item/weapon/bedsheet/pillow = 6
/obj/item/bedsheet/pillow = 6
)
cost = 10
containertype = /obj/structure/closet/crate
@@ -267,7 +267,7 @@
/datum/supply_pack/recreation/tealpillows
name = "Pillow Crate - Teal"
contains = list(
/obj/item/weapon/bedsheet/pillow/teal = 6
/obj/item/bedsheet/pillow/teal = 6
)
cost = 10
containertype = /obj/structure/closet/crate
@@ -275,7 +275,7 @@
/datum/supply_pack/recreation/whitepillows
name = "Pillow Crate - White"
contains = list(
/obj/item/weapon/bedsheet/pillow/white = 6
/obj/item/bedsheet/pillow/white = 6
)
cost = 10
containertype = /obj/structure/closet/crate
@@ -283,7 +283,7 @@
/datum/supply_pack/recreation/blackpillows
name = "Pillow Crate - Black"
contains = list(
/obj/item/weapon/bedsheet/pillow/black = 6
/obj/item/bedsheet/pillow/black = 6
)
cost = 10
containertype = /obj/structure/closet/crate
@@ -291,7 +291,7 @@
/datum/supply_pack/recreation/redpillows
name = "Pillow Crate - Red"
contains = list(
/obj/item/weapon/bedsheet/pillow/red = 6
/obj/item/bedsheet/pillow/red = 6
)
cost = 10
containertype = /obj/structure/closet/crate
@@ -299,7 +299,7 @@
/datum/supply_pack/recreation/greenpillows
name = "Pillow Crate - Green"
contains = list(
/obj/item/weapon/bedsheet/pillow/green = 6
/obj/item/bedsheet/pillow/green = 6
)
cost = 10
containertype = /obj/structure/closet/crate
@@ -307,7 +307,7 @@
/datum/supply_pack/recreation/orangepillows
name = "Pillow Crate - Orange"
contains = list(
/obj/item/weapon/bedsheet/pillow/orange = 6
/obj/item/bedsheet/pillow/orange = 6
)
cost = 10
containertype = /obj/structure/closet/crate
@@ -315,7 +315,7 @@
/datum/supply_pack/recreation/yellowpillows
name = "Pillow Crate - Yellow"
contains = list(
/obj/item/weapon/bedsheet/pillow/yellow = 6
/obj/item/bedsheet/pillow/yellow = 6
)
cost = 10
containertype = /obj/structure/closet/crate
code/datums/supplypacks/robotics.dm
+69 -69
View File
@@ -14,10 +14,10 @@
/datum/supply_pack/robotics/robotics_assembly
name = "Robotics assembly crate"
contains = list(
/obj/item/device/assembly/prox_sensor = 3,
/obj/item/weapon/storage/toolbox/electrical,
/obj/item/device/flash = 4,
/obj/item/weapon/cell/high = 2
/obj/item/assembly/prox_sensor = 3,
/obj/item/storage/toolbox/electrical,
/obj/item/flash = 4,
/obj/item/cell/high = 2
)
cost = 10
containertype = /obj/structure/closet/crate/secure/nanotrasen
@@ -27,8 +27,8 @@
/*/datum/supply_pack/robotics/robolimbs_basic
name = "Basic robolimb blueprints"
contains = list(
/obj/item/weapon/disk/limb/morpheus,
/obj/item/weapon/disk/limb/xion
/obj/item/disk/limb/morpheus,
/obj/item/disk/limb/xion
)
cost = 15
containertype = /obj/structure/closet/crate/secure/gear
@@ -38,13 +38,13 @@
/datum/supply_pack/robotics/robolimbs_adv
name = "All robolimb blueprints"
contains = list(
/obj/item/weapon/disk/limb/bishop,
/obj/item/weapon/disk/limb/hephaestus,
/obj/item/weapon/disk/limb/morpheus,
/obj/item/weapon/disk/limb/veymed,
/obj/item/weapon/disk/limb/wardtakahashi,
/obj/item/weapon/disk/limb/xion,
/obj/item/weapon/disk/limb/zenghu,
/obj/item/disk/limb/bishop,
/obj/item/disk/limb/hephaestus,
/obj/item/disk/limb/morpheus,
/obj/item/disk/limb/veymed,
/obj/item/disk/limb/wardtakahashi,
/obj/item/disk/limb/xion,
/obj/item/disk/limb/zenghu,
)
cost = 40
containertype = /obj/structure/closet/crate/secure/gear
@@ -54,7 +54,7 @@
/datum/supply_pack/robotics/robolimbs/morpheus
name = "Morpheus robolimb blueprints"
contains = list(/obj/item/weapon/disk/limb/morpheus)
contains = list(/obj/item/disk/limb/morpheus)
cost = 20
containertype = /obj/structure/closet/crate/secure/morpheus
containername = "Robolimb blueprints (Morpheus)"
@@ -62,7 +62,7 @@
/datum/supply_pack/robotics/robolimbs/cybersolutions
name = "Cyber Solutions robolimb blueprints"
contains = list(/obj/item/weapon/disk/limb/cybersolutions)
contains = list(/obj/item/disk/limb/cybersolutions)
cost = 20
containertype = /obj/structure/closet/crate/secure/cybersolutions
containername = "Robolimb blueprints (Cyber Solutions)"
@@ -70,7 +70,7 @@
/datum/supply_pack/robotics/robolimbs/xion
name = "Xion robolimb blueprints"
contains = list(/obj/item/weapon/disk/limb/xion)
contains = list(/obj/item/disk/limb/xion)
cost = 20
containertype = /obj/structure/closet/crate/secure/xion
containername = "Robolimb blueprints (Xion)"
@@ -78,7 +78,7 @@
/datum/supply_pack/robotics/robolimbs/grayson
name = "Grayson robolimb blueprints"
contains = list(/obj/item/weapon/disk/limb/grayson)
contains = list(/obj/item/disk/limb/grayson)
cost = 30
containertype = /obj/structure/closet/crate/secure/grayson
containername = "Robolimb blueprints (Grayson)"
@@ -86,7 +86,7 @@
/datum/supply_pack/robotics/robolimbs/hephaestus
name = "Hephaestus robolimb blueprints"
contains = list(/obj/item/weapon/disk/limb/hephaestus)
contains = list(/obj/item/disk/limb/hephaestus)
cost = 35
containertype = /obj/structure/closet/crate/secure/heph
containername = "Robolimb blueprints (Hephaestus)"
@@ -94,7 +94,7 @@
/datum/supply_pack/robotics/robolimbs/wardtakahashi
name = "Ward-Takahashi robolimb blueprints"
contains = list(/obj/item/weapon/disk/limb/wardtakahashi)
contains = list(/obj/item/disk/limb/wardtakahashi)
cost = 35
containertype = /obj/structure/closet/crate/secure/ward
containername = "Robolimb blueprints (Ward-Takahashi)"
@@ -102,7 +102,7 @@
/datum/supply_pack/robotics/robolimbs/zenghu
name = "Zeng Hu robolimb blueprints"
contains = list(/obj/item/weapon/disk/limb/zenghu)
contains = list(/obj/item/disk/limb/zenghu)
cost = 35
containertype = /obj/structure/closet/crate/secure/zenghu
containername = "Robolimb blueprints (Zeng Hu)"
@@ -110,7 +110,7 @@
/datum/supply_pack/robotics/robolimbs/bishop
name = "Bishop robolimb blueprints"
contains = list(/obj/item/weapon/disk/limb/bishop)
contains = list(/obj/item/disk/limb/bishop)
cost = 70
containertype = /obj/structure/closet/crate/secure/bishop
containername = "Robolimb blueprints (Bishop)"
@@ -118,7 +118,7 @@
/datum/supply_pack/robotics/robolimbs/cenilimicybernetics
name = "Cenilimi Cybernetics robolimb blueprints"
contains = list(/obj/item/weapon/disk/limb/cenilimicybernetics)
contains = list(/obj/item/disk/limb/cenilimicybernetics)
cost = 45
containertype = /obj/structure/closet/crate/secure/science
containername = "Robolimb blueprints (Cenilimi Cybernetics)"
@@ -128,9 +128,9 @@
/datum/supply_pack/robotics/mecha_ripley
name = "Circuit Crate (\"Ripley\" APLU)"
contains = list(
/obj/item/weapon/book/manual/ripley_build_and_repair,
/obj/item/weapon/circuitboard/mecha/ripley/main,
/obj/item/weapon/circuitboard/mecha/ripley/peripherals
/obj/item/book/manual/ripley_build_and_repair,
/obj/item/circuitboard/mecha/ripley/main,
/obj/item/circuitboard/mecha/ripley/peripherals
)
cost = 25
containertype = /obj/structure/closet/crate/secure/xion
@@ -140,8 +140,8 @@
/datum/supply_pack/robotics/mecha_odysseus
name = "Circuit Crate (\"Odysseus\")"
contains = list(
/obj/item/weapon/circuitboard/mecha/odysseus/peripherals,
/obj/item/weapon/circuitboard/mecha/odysseus/main
/obj/item/circuitboard/mecha/odysseus/peripherals,
/obj/item/circuitboard/mecha/odysseus/main
)
cost = 25
containertype = /obj/structure/closet/crate/secure/veymed
@@ -151,10 +151,10 @@
/datum/supply_pack/randomised/robotics/exosuit_mod
num_contained = 1
contains = list(
/obj/item/device/kit/paint/ripley,
/obj/item/device/kit/paint/ripley/death,
/obj/item/device/kit/paint/ripley/flames_red,
/obj/item/device/kit/paint/ripley/flames_blue
/obj/item/kit/paint/ripley,
/obj/item/kit/paint/ripley/death,
/obj/item/kit/paint/ripley/flames_red,
/obj/item/kit/paint/ripley/flames_blue
)
name = "Random APLU modkit"
cost = 200
@@ -163,18 +163,18 @@
/datum/supply_pack/randomised/robotics/exosuit_mod/durand
contains = list(
/obj/item/device/kit/paint/durand,
/obj/item/device/kit/paint/durand/seraph,
/obj/item/device/kit/paint/durand/phazon
/obj/item/kit/paint/durand,
/obj/item/kit/paint/durand/seraph,
/obj/item/kit/paint/durand/phazon
)
name = "Random Durand exosuit modkit"
containertype = /obj/structure/closet/crate/heph
/datum/supply_pack/randomised/robotics/exosuit_mod/gygax
contains = list(
/obj/item/device/kit/paint/gygax,
/obj/item/device/kit/paint/gygax/darkgygax,
/obj/item/device/kit/paint/gygax/recitence
/obj/item/kit/paint/gygax,
/obj/item/kit/paint/gygax/darkgygax,
/obj/item/kit/paint/gygax/recitence
)
name = "Random Gygax exosuit modkit"
containertype = /obj/structure/closet/crate/heph
@@ -182,7 +182,7 @@
/datum/supply_pack/robotics/jumper_cables
name = "Jumper kit crate"
contains = list(
/obj/item/device/defib_kit/jumper_kit = 2
/obj/item/defib_kit/jumper_kit = 2
)
cost = 30
containertype = /obj/structure/closet/crate/secure/einstein
@@ -192,8 +192,8 @@
/datum/supply_pack/robotics/restrainingbolt
name = "Restraining bolt crate"
contains = list(
/obj/item/weapon/implanter = 1,
/obj/item/weapon/implantcase/restrainingbolt = 2
/obj/item/implanter = 1,
/obj/item/implantcase/restrainingbolt = 2
)
cost = 40
containertype = /obj/structure/closet/crate/secure/cybersolutions
@@ -224,8 +224,8 @@
/datum/supply_pack/robotics/mecha_gopher
name = "Circuit Crate (\"Gopher\" APLU)"
contains = list(
/obj/item/weapon/circuitboard/mecha/gopher/main,
/obj/item/weapon/circuitboard/mecha/gopher/peripherals
/obj/item/circuitboard/mecha/gopher/main,
/obj/item/circuitboard/mecha/gopher/peripherals
)
cost = 25
containertype = /obj/structure/closet/crate/secure/science
@@ -235,9 +235,9 @@
/datum/supply_pack/robotics/mecha_polecat
name = "Circuit Crate (\"Polecat\" APLU)"
contains = list(
/obj/item/weapon/circuitboard/mecha/polecat/main,
/obj/item/weapon/circuitboard/mecha/polecat/peripherals,
/obj/item/weapon/circuitboard/mecha/polecat/targeting
/obj/item/circuitboard/mecha/polecat/main,
/obj/item/circuitboard/mecha/polecat/peripherals,
/obj/item/circuitboard/mecha/polecat/targeting
)
cost = 25
containertype = /obj/structure/closet/crate/secure/science
@@ -247,9 +247,9 @@
/datum/supply_pack/robotics/mecha_weasel
name = "Circuit Crate (\"Weasel\" APLU)"
contains = list(
/obj/item/weapon/circuitboard/mecha/weasel/main,
/obj/item/weapon/circuitboard/mecha/weasel/peripherals,
/obj/item/weapon/circuitboard/mecha/weasel/targeting
/obj/item/circuitboard/mecha/weasel/main,
/obj/item/circuitboard/mecha/weasel/peripherals,
/obj/item/circuitboard/mecha/weasel/targeting
)
cost = 25
containertype = /obj/structure/closet/crate/secure/science
@@ -259,9 +259,9 @@
/datum/supply_pack/robotics/some_robolimbs
name = "Basic Robolimb Blueprints"
contains = list(
/obj/item/weapon/disk/limb/morpheus,
/obj/item/weapon/disk/limb/xion,
/obj/item/weapon/disk/limb/talon
/obj/item/disk/limb/morpheus,
/obj/item/disk/limb/xion,
/obj/item/disk/limb/talon
)
cost = 15
containertype = /obj/structure/closet/crate/secure
@@ -271,24 +271,24 @@
/datum/supply_pack/robotics/all_robolimbs
name = "Advanced Robolimb Blueprints"
contains = list(
/obj/item/weapon/disk/limb/bishop,
/obj/item/weapon/disk/limb/hephaestus,
/obj/item/weapon/disk/limb/morpheus,
/obj/item/weapon/disk/limb/veymed,
/obj/item/weapon/disk/limb/wardtakahashi,
/obj/item/weapon/disk/limb/xion,
/obj/item/weapon/disk/limb/zenghu,
/obj/item/weapon/disk/limb/talon,
/obj/item/weapon/disk/limb/dsi_tajaran,
/obj/item/weapon/disk/limb/dsi_lizard,
/obj/item/weapon/disk/limb/dsi_sergal,
/obj/item/weapon/disk/limb/dsi_nevrean,
/obj/item/weapon/disk/limb/dsi_vulpkanin,
/obj/item/weapon/disk/limb/dsi_akula,
/obj/item/weapon/disk/limb/dsi_spider,
/obj/item/weapon/disk/limb/dsi_teshari,
/obj/item/weapon/disk/limb/eggnerdltd,
/obj/item/weapon/disk/limb/eggnerdltdred
/obj/item/disk/limb/bishop,
/obj/item/disk/limb/hephaestus,
/obj/item/disk/limb/morpheus,
/obj/item/disk/limb/veymed,
/obj/item/disk/limb/wardtakahashi,
/obj/item/disk/limb/xion,
/obj/item/disk/limb/zenghu,
/obj/item/disk/limb/talon,
/obj/item/disk/limb/dsi_tajaran,
/obj/item/disk/limb/dsi_lizard,
/obj/item/disk/limb/dsi_sergal,
/obj/item/disk/limb/dsi_nevrean,
/obj/item/disk/limb/dsi_vulpkanin,
/obj/item/disk/limb/dsi_akula,
/obj/item/disk/limb/dsi_spider,
/obj/item/disk/limb/dsi_teshari,
/obj/item/disk/limb/eggnerdltd,
/obj/item/disk/limb/eggnerdltdred
)
cost = 40
containertype = /obj/structure/closet/crate/secure
code/datums/supplypacks/science.dm
+20 -20
View File
@@ -15,13 +15,13 @@
/datum/supply_pack/sci/phoron
name = "Phoron research crate"
contains = list(
/obj/item/weapon/tank/phoron = 3,
/obj/item/weapon/tank/oxygen = 3,
/obj/item/device/assembly/igniter = 3,
/obj/item/device/assembly/prox_sensor = 3,
/obj/item/device/assembly/timer = 3,
/obj/item/device/assembly/signaler = 3,
/obj/item/device/transfer_valve = 3
/obj/item/tank/phoron = 3,
/obj/item/tank/oxygen = 3,
/obj/item/assembly/igniter = 3,
/obj/item/assembly/prox_sensor = 3,
/obj/item/assembly/timer = 3,
/obj/item/assembly/signaler = 3,
/obj/item/transfer_valve = 3
)
cost = 10
containertype = /obj/structure/closet/crate/secure/phoron
@@ -45,14 +45,14 @@
/datum/supply_pack/sci/integrated_circuit_printer
name = "Integrated circuit printer"
contains = list(/obj/item/device/integrated_circuit_printer = 2)
contains = list(/obj/item/integrated_circuit_printer = 2)
cost = 15
containertype = /obj/structure/closet/crate/ward
containername = "Integrated circuit crate"
/datum/supply_pack/sci/integrated_circuit_printer_upgrade
name = "Integrated circuit printer upgrade - advanced designs"
contains = list(/obj/item/weapon/disk/integrated_circuit/upgrade/advanced)
contains = list(/obj/item/disk/integrated_circuit/upgrade/advanced)
cost = 30
containertype = /obj/structure/closet/crate/ward
containername = "Integrated circuit crate"
@@ -60,20 +60,20 @@
/datum/supply_pack/sci/xenoarch
name = "Xenoarchaeology Tech crate"
contains = list(
/obj/item/weapon/pickaxe/excavationdrill,
/obj/item/device/xenoarch_multi_tool,
/obj/item/pickaxe/excavationdrill,
/obj/item/xenoarch_multi_tool,
/obj/item/clothing/suit/space/anomaly,
/obj/item/clothing/head/helmet/space/anomaly,
/obj/item/weapon/storage/belt/archaeology,
/obj/item/device/flashlight/lantern,
/obj/item/device/core_sampler,
/obj/item/device/gps,
/obj/item/device/beacon_locator,
/obj/item/device/radio/beacon,
/obj/item/storage/belt/archaeology,
/obj/item/flashlight/lantern,
/obj/item/core_sampler,
/obj/item/gps,
/obj/item/beacon_locator,
/obj/item/radio/beacon,
/obj/item/clothing/glasses/meson,
/obj/item/weapon/pickaxe,
/obj/item/weapon/storage/bag/fossils,
/obj/item/weapon/hand_labeler)
/obj/item/pickaxe,
/obj/item/storage/bag/fossils,
/obj/item/hand_labeler)
cost = 100
containertype = /obj/structure/closet/crate/secure/xion
containername = "Xenoarchaeology Tech crate"
code/datums/supplypacks/security.dm
+74 -74
View File
@@ -253,12 +253,12 @@
/datum/supply_pack/security/riot_gear
name = "Gear - Riot"
contains = list(
/obj/item/weapon/melee/baton = 3,
/obj/item/weapon/shield/riot = 3,
/obj/item/weapon/handcuffs = 3,
/obj/item/weapon/storage/box/flashbangs,
/obj/item/melee/baton = 3,
/obj/item/shield/riot = 3,
/obj/item/handcuffs = 3,
/obj/item/storage/box/flashbangs,
/obj/item/ammo_magazine/ammo_box/b12g/beanbag,
/obj/item/weapon/storage/box/handcuffs
/obj/item/storage/box/handcuffs
)
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
@@ -292,7 +292,7 @@
/datum/supply_pack/security/riot_sprayer
name = "Gear - Riot sprayer"
contains = list(
/obj/item/weapon/watertank/pepperspray
/obj/item/watertank/pepperspray
)
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
@@ -373,7 +373,7 @@
/obj/item/clothing/head/helmet/tactical,
/obj/item/clothing/mask/balaclava/tactical,
/obj/item/clothing/glasses/sunglasses/sechud/tactical,
/obj/item/weapon/storage/belt/security/tactical,
/obj/item/storage/belt/security/tactical,
/obj/item/clothing/shoes/boots/jackboots,
/obj/item/clothing/gloves/black,
/obj/item/clothing/under/tactical,
@@ -381,7 +381,7 @@
/obj/item/clothing/head/helmet/tactical,
/obj/item/clothing/mask/balaclava/tactical,
/obj/item/clothing/glasses/sunglasses/sechud/tactical,
/obj/item/weapon/storage/belt/security/tactical,
/obj/item/storage/belt/security/tactical,
/obj/item/clothing/shoes/boots/jackboots,
/obj/item/clothing/gloves/black
)
@@ -400,14 +400,14 @@
/obj/item/clothing/gloves/arm_guard/flexitac,
/obj/item/clothing/mask/balaclava/tactical,
/obj/item/clothing/glasses/sunglasses/sechud/tactical,
/obj/item/weapon/storage/belt/security/tactical,
/obj/item/storage/belt/security/tactical,
/obj/item/clothing/suit/storage/vest/heavy/flexitac,
/obj/item/clothing/head/helmet/flexitac,
/obj/item/clothing/shoes/leg_guard/flexitac,
/obj/item/clothing/gloves/arm_guard/flexitac,
/obj/item/clothing/mask/balaclava/tactical,
/obj/item/clothing/glasses/sunglasses/sechud/tactical,
/obj/item/weapon/storage/belt/security/tactical
/obj/item/storage/belt/security/tactical
)
/datum/supply_pack/security/securitybarriers
@@ -442,9 +442,9 @@
/datum/supply_pack/security/extragear
name = "Gear - Security surplus equipment"
contains = list(
/obj/item/weapon/storage/belt/security = 3,
/obj/item/storage/belt/security = 3,
/obj/item/clothing/glasses/sunglasses/sechud = 3,
/obj/item/device/radio/headset/headset_sec/alt = 3,
/obj/item/radio/headset/headset_sec/alt = 3,
/obj/item/clothing/suit/storage/hooded/wintercoat/security = 3,
/obj/item/clothing/glasses/sunglasses/sechud/tactical_sec_vis = 3
)
@@ -455,25 +455,25 @@
/datum/supply_pack/security/detectivegear
name = "Forensic - Investigation equipment"
contains = list(
/obj/item/weapon/storage/box/evidence = 2,
/obj/item/storage/box/evidence = 2,
/obj/item/clothing/suit/storage/vest/detective,
/obj/item/weapon/cartridge/detective,
/obj/item/device/radio/headset/headset_sec,
/obj/item/cartridge/detective,
/obj/item/radio/headset/headset_sec,
/obj/item/taperoll/police,
/obj/item/clothing/glasses/sunglasses,
/obj/item/device/camera,
/obj/item/weapon/folder/red,
/obj/item/weapon/folder/blue,
/obj/item/weapon/storage/belt/detective,
/obj/item/camera,
/obj/item/folder/red,
/obj/item/folder/blue,
/obj/item/storage/belt/detective,
/obj/item/clothing/gloves/black,
/obj/item/device/taperecorder,
/obj/item/device/mass_spectrometer,
/obj/item/device/camera_film = 2,
/obj/item/weapon/storage/photo_album,
/obj/item/device/reagent_scanner,
/obj/item/device/flashlight/maglight,
/obj/item/weapon/storage/briefcase/crimekit,
/obj/item/weapon/storage/bag/detective
/obj/item/taperecorder,
/obj/item/mass_spectrometer,
/obj/item/camera_film = 2,
/obj/item/storage/photo_album,
/obj/item/reagent_scanner,
/obj/item/flashlight/maglight,
/obj/item/storage/briefcase/crimekit,
/obj/item/storage/bag/detective
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanotrasen
@@ -483,10 +483,10 @@
/datum/supply_pack/security/detectivescan
name = "Forensic - Scanning Equipment"
contains = list(
/obj/item/device/mass_spectrometer,
/obj/item/device/reagent_scanner,
/obj/item/weapon/storage/briefcase/crimekit,
/obj/item/device/detective_scanner
/obj/item/mass_spectrometer,
/obj/item/reagent_scanner,
/obj/item/storage/briefcase/crimekit,
/obj/item/detective_scanner
)
cost = 60
containertype = /obj/structure/closet/crate/secure/ward
@@ -520,25 +520,25 @@
contains = list(
/obj/item/clothing/suit/storage/vest/officer,
/obj/item/clothing/head/helmet,
/obj/item/weapon/cartridge/security,
/obj/item/cartridge/security,
/obj/item/clothing/accessory/badge/holo,
/obj/item/clothing/accessory/badge/holo/cord,
/obj/item/device/radio/headset/headset_sec,
/obj/item/weapon/storage/belt/security,
/obj/item/device/flash,
/obj/item/weapon/reagent_containers/spray/pepper,
/obj/item/weapon/grenade/flashbang,
/obj/item/weapon/melee/baton/loaded,
/obj/item/radio/headset/headset_sec,
/obj/item/storage/belt/security,
/obj/item/flash,
/obj/item/reagent_containers/spray/pepper,
/obj/item/grenade/flashbang,
/obj/item/melee/baton/loaded,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/clothing/gloves/black,
/obj/item/device/hailer,
/obj/item/device/flashlight/flare,
/obj/item/hailer,
/obj/item/flashlight/flare,
/obj/item/clothing/accessory/storage/black_vest,
/obj/item/clothing/head/soft/sec/corp,
/obj/item/clothing/under/rank/security/corp,
/obj/item/weapon/gun/energy/taser,
/obj/item/device/flashlight/maglight
/obj/item/gun/energy/taser,
/obj/item/flashlight/maglight
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanotrasen
@@ -555,19 +555,19 @@
/obj/item/clothing/suit/storage/vest/wardencoat/alt,
/obj/item/clothing/suit/storage/vest/wardencoat/alt2, //VOREStation Add,
/obj/item/clothing/head/helmet/warden,
/obj/item/weapon/cartridge/security,
/obj/item/device/radio/headset/headset_sec,
/obj/item/cartridge/security,
/obj/item/radio/headset/headset_sec,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/device/hailer,
/obj/item/hailer,
/obj/item/clothing/accessory/badge/holo/warden,
/obj/item/weapon/storage/box/flashbangs,
/obj/item/weapon/storage/belt/security,
/obj/item/weapon/reagent_containers/spray/pepper,
/obj/item/weapon/melee/baton/loaded,
/obj/item/weapon/storage/box/holobadge,
/obj/item/storage/box/flashbangs,
/obj/item/storage/belt/security,
/obj/item/reagent_containers/spray/pepper,
/obj/item/melee/baton/loaded,
/obj/item/storage/box/holobadge,
/obj/item/clothing/head/beret/sec/corporate/warden,
/obj/item/device/flashlight/maglight
/obj/item/flashlight/maglight
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanotrasen
@@ -583,18 +583,18 @@
/obj/item/clothing/suit/storage/vest/hoscoat,
/obj/item/clothing/suit/storage/vest/hoscoat/jensen/alt, //VOREStation Add,
/obj/item/clothing/head/helmet/dermal,
/obj/item/weapon/cartridge/hos,
/obj/item/device/radio/headset/heads/hos,
/obj/item/cartridge/hos,
/obj/item/radio/headset/heads/hos,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/weapon/storage/belt/security,
/obj/item/device/flash,
/obj/item/device/hailer,
/obj/item/storage/belt/security,
/obj/item/flash,
/obj/item/hailer,
/obj/item/clothing/accessory/badge/holo/hos,
/obj/item/clothing/accessory/holster/waist,
/obj/item/weapon/melee/telebaton,
/obj/item/weapon/shield/riot/tele,
/obj/item/melee/telebaton,
/obj/item/shield/riot/tele,
/obj/item/clothing/head/beret/sec/corporate/hos,
/obj/item/device/flashlight/maglight
/obj/item/flashlight/maglight
)
cost = 50
containertype = /obj/structure/closet/crate/secure/nanotrasen
@@ -604,8 +604,8 @@
/datum/supply_pack/security/securityclothing
name = "Misc - Security uniform red"
contains = list(
/obj/item/weapon/storage/backpack/satchel/sec = 2,
/obj/item/weapon/storage/backpack/security = 2,
/obj/item/storage/backpack/satchel/sec = 2,
/obj/item/storage/backpack/security = 2,
/obj/item/clothing/accessory/armband = 4,
/obj/item/clothing/under/rank/security = 4,
/obj/item/clothing/under/rank/security2 = 4,
@@ -613,7 +613,7 @@
/obj/item/clothing/under/rank/head_of_security,
/obj/item/clothing/head/soft/sec = 4,
/obj/item/clothing/gloves/black = 4,
/obj/item/weapon/storage/box/holobadge
/obj/item/storage/box/holobadge
)
cost = 10
containertype = /obj/structure/closet/crate/secure/nanotrasen
@@ -622,8 +622,8 @@
/datum/supply_pack/security/navybluesecurityclothing
name = "Misc - Security uniform navy blue"
contains = list(
/obj/item/weapon/storage/backpack/satchel/sec = 2,
/obj/item/weapon/storage/backpack/security = 2,
/obj/item/storage/backpack/satchel/sec = 2,
/obj/item/storage/backpack/security = 2,
/obj/item/clothing/under/rank/security/navyblue = 4,
/obj/item/clothing/suit/security/navyofficer = 4,
/obj/item/clothing/under/rank/warden/navyblue,
@@ -634,7 +634,7 @@
/obj/item/clothing/head/beret/sec/navy/warden,
/obj/item/clothing/head/beret/sec/navy/hos,
/obj/item/clothing/gloves/black = 4,
/obj/item/weapon/storage/box/holobadge
/obj/item/storage/box/holobadge
)
cost = 10
containertype = /obj/structure/closet/crate/secure/nanotrasen
@@ -643,8 +643,8 @@
/datum/supply_pack/security/corporatesecurityclothing
name = "Misc - Security uniform corporate"
contains = list(
/obj/item/weapon/storage/backpack/satchel/sec = 2,
/obj/item/weapon/storage/backpack/security = 2,
/obj/item/storage/backpack/satchel/sec = 2,
/obj/item/storage/backpack/security = 2,
/obj/item/clothing/under/rank/security/corp = 4,
/obj/item/clothing/head/soft/sec/corp = 4,
/obj/item/clothing/under/rank/warden/corp,
@@ -654,7 +654,7 @@
/obj/item/clothing/head/beret/sec/corporate/hos,
/obj/item/clothing/under/det/corporate = 2,
/obj/item/clothing/gloves/black = 4,
/obj/item/weapon/storage/box/holobadge
/obj/item/storage/box/holobadge
)
cost = 10
containertype = /obj/structure/closet/crate/secure/nanotrasen
@@ -668,9 +668,9 @@
/obj/item/clothing/suit/bio_suit/security = 3,
/obj/item/clothing/shoes/white = 3,
/obj/item/clothing/mask/gas = 3,
/obj/item/weapon/tank/oxygen = 3,
/obj/item/tank/oxygen = 3,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/weapon/storage/box/gloves
/obj/item/storage/box/gloves
)
cost = 25
containertype = /obj/structure/closet/crate/secure/nanotrasen
@@ -715,16 +715,16 @@
/obj/item/clothing/suit/bio_suit/security = 3,
/obj/item/clothing/shoes/white = 3,
/obj/item/clothing/mask/gas = 3,
/obj/item/weapon/tank/oxygen = 3,
/obj/item/tank/oxygen = 3,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/weapon/storage/box/gloves
/obj/item/storage/box/gloves
)
cost = 40
/datum/supply_pack/security/trackingimplant
name = "Implants - Tracking"
contains = list(
/obj/item/weapon/storage/box/trackimp = 1
/obj/item/storage/box/trackimp = 1
)
cost = 25
containertype = /obj/structure/closet/crate/secure
@@ -734,7 +734,7 @@
/datum/supply_pack/security/chemicalimplant
name = "Implants - Chemical"
contains = list(
/obj/item/weapon/storage/box/chemimp = 1
/obj/item/storage/box/chemimp = 1
)
cost = 25
containertype = /obj/structure/closet/crate/secure
code/datums/supplypacks/supply.dm
+77 -77
View File
@@ -9,14 +9,14 @@
/datum/supply_pack/supply/food
name = "Kitchen supply crate"
contains = list(
/obj/item/weapon/reagent_containers/food/condiment/carton/flour = 6,
/obj/item/weapon/reagent_containers/food/drinks/milk = 3,
/obj/item/weapon/reagent_containers/food/drinks/soymilk = 2,
/obj/item/weapon/storage/fancy/egg_box = 2,
/obj/item/weapon/reagent_containers/food/snacks/tofu = 4,
/obj/item/weapon/reagent_containers/food/snacks/meat = 4,
/obj/item/weapon/reagent_containers/food/condiment/yeast = 3,
/obj/item/weapon/reagent_containers/food/condiment/sprinkles = 1
/obj/item/reagent_containers/food/condiment/carton/flour = 6,
/obj/item/reagent_containers/food/drinks/milk = 3,
/obj/item/reagent_containers/food/drinks/soymilk = 2,
/obj/item/storage/fancy/egg_box = 2,
/obj/item/reagent_containers/food/snacks/tofu = 4,
/obj/item/reagent_containers/food/snacks/meat = 4,
/obj/item/reagent_containers/food/condiment/yeast = 3,
/obj/item/reagent_containers/food/condiment/sprinkles = 1
)
cost = 10
containertype = /obj/structure/closet/crate/freezer/centauri
@@ -25,8 +25,8 @@
/datum/supply_pack/supply/fancyfood
name = "Artisanal food delivery"
contains = list(
/obj/item/weapon/reagent_containers/food/condiment/carton/flour/rustic = 6,
/obj/item/weapon/reagent_containers/food/condiment/carton/sugar/rustic = 6
/obj/item/reagent_containers/food/condiment/carton/flour/rustic = 6,
/obj/item/reagent_containers/food/condiment/carton/sugar/rustic = 6
)
cost = 25
containertype = /obj/structure/closet/crate/freezer/centauri
@@ -35,7 +35,7 @@
/datum/supply_pack/supply/toner
name = "Toner cartridges"
contains = list(/obj/item/device/toner = 6)
contains = list(/obj/item/toner = 6)
cost = 10
containertype = /obj/structure/closet/crate/ummarcar
containername = "Toner cartridges"
@@ -43,20 +43,20 @@
/datum/supply_pack/supply/janitor
name = "Janitorial supplies"
contains = list(
/obj/item/weapon/reagent_containers/glass/bucket,
/obj/item/weapon/mop,
/obj/item/reagent_containers/glass/bucket,
/obj/item/mop,
/obj/item/clothing/under/rank/janitor,
/obj/item/weapon/cartridge/janitor,
/obj/item/cartridge/janitor,
/obj/item/clothing/gloves/black,
/obj/item/clothing/head/soft/purple,
/obj/item/weapon/storage/belt/janitor,
/obj/item/storage/belt/janitor,
/obj/item/clothing/shoes/galoshes,
/obj/item/clothing/suit/caution = 4,
/obj/item/weapon/storage/bag/trash,
/obj/item/device/lightreplacer,
/obj/item/weapon/reagent_containers/spray/cleaner,
/obj/item/weapon/reagent_containers/glass/rag,
/obj/item/weapon/grenade/chem_grenade/cleaner = 3,
/obj/item/storage/bag/trash,
/obj/item/lightreplacer,
/obj/item/reagent_containers/spray/cleaner,
/obj/item/reagent_containers/glass/rag,
/obj/item/grenade/chem_grenade/cleaner = 3,
/obj/item/clothing/glasses/hud/janitor,
/obj/structure/mopbucket
)
@@ -68,30 +68,30 @@
name = "Shipping supplies"
contains = list(
/obj/fiftyspawner/cardboard,
/obj/item/weapon/packageWrap = 4,
/obj/item/weapon/wrapping_paper = 2,
/obj/item/device/destTagger,
/obj/item/weapon/hand_labeler,
/obj/item/weapon/tool/wirecutters,
/obj/item/weapon/tape_roll = 2)
/obj/item/packageWrap = 4,
/obj/item/wrapping_paper = 2,
/obj/item/destTagger,
/obj/item/hand_labeler,
/obj/item/tool/wirecutters,
/obj/item/tape_roll = 2)
cost = 10
containertype = /obj/structure/closet/crate/ummarcar
containername = "Shipping supplies crate"
/datum/supply_pack/supply/bureaucracy
contains = list(
/obj/item/weapon/clipboard = 2,
/obj/item/weapon/pen/red,
/obj/item/weapon/pen/blue,
/obj/item/weapon/pen/blue,
/obj/item/device/camera_film,
/obj/item/weapon/folder/blue,
/obj/item/weapon/folder/red,
/obj/item/weapon/folder/yellow,
/obj/item/weapon/hand_labeler,
/obj/item/weapon/tape_roll,
/obj/item/clipboard = 2,
/obj/item/pen/red,
/obj/item/pen/blue,
/obj/item/pen/blue,
/obj/item/camera_film,
/obj/item/folder/blue,
/obj/item/folder/red,
/obj/item/folder/yellow,
/obj/item/hand_labeler,
/obj/item/tape_roll,
/obj/structure/filingcabinet/chestdrawer{anchored = FALSE},
/obj/item/weapon/paper_bin
/obj/item/paper_bin
)
name = "Office supplies"
cost = 15
@@ -110,24 +110,24 @@
cost = 10
containertype = /obj/structure/closet/crate/thinktronic
containername = "Spare PDA crate"
contains = list(/obj/item/device/pda = 3)
contains = list(/obj/item/pda = 3)
/datum/supply_pack/supply/minergear
name = "Shaft miner equipment"
contains = list(
/obj/item/weapon/storage/backpack/industrial,
/obj/item/weapon/storage/backpack/satchel/eng,
/obj/item/storage/backpack/industrial,
/obj/item/storage/backpack/satchel/eng,
/obj/item/clothing/suit/storage/hooded/wintercoat/miner,
/obj/item/device/radio/headset/headset_cargo,
/obj/item/radio/headset/headset_cargo,
/obj/item/clothing/under/rank/miner,
/obj/item/clothing/gloves/black,
/obj/item/clothing/shoes/black,
/obj/item/device/analyzer,
/obj/item/weapon/storage/bag/ore,
/obj/item/device/flashlight/lantern,
/obj/item/weapon/shovel,
/obj/item/weapon/pickaxe,
/obj/item/weapon/mining_scanner,
/obj/item/analyzer,
/obj/item/storage/bag/ore,
/obj/item/flashlight/lantern,
/obj/item/shovel,
/obj/item/pickaxe,
/obj/item/mining_scanner,
/obj/item/clothing/glasses/material,
/obj/item/clothing/glasses/meson
)
@@ -159,21 +159,21 @@
/datum/supply_pack/explorergear
name= JOB_EXPLORER + " gear"
contains = list (
/obj/item/device/cataloguer,
/obj/item/device/geiger,
/obj/item/cataloguer,
/obj/item/geiger,
/obj/item/clothing/suit/storage/hooded/explorer,
/obj/item/device/flashlight/glowstick,
/obj/item/device/flashlight,
/obj/item/flashlight/glowstick,
/obj/item/flashlight,
/obj/item/stack/marker_beacon/thirty,
/obj/item/weapon/storage/belt/explorer,
/obj/item/storage/belt/explorer,
/obj/item/clothing/mask/gas/explorer,
/obj/item/weapon/cartridge/explorer,
/obj/item/device/gps/explorer,
/obj/item/cartridge/explorer,
/obj/item/gps/explorer,
/obj/item/clothing/under/explorer,
/obj/item/device/radio/headset/explorer,
/obj/item/radio/headset/explorer,
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/weapon/material/knife/tacknife/survival,
/obj/item/weapon/material/knife/machete,
/obj/item/material/knife/tacknife/survival,
/obj/item/material/knife/machete,
/obj/item/clothing/accessory/holster/machete,
/obj/item/clothing/gloves/watch/survival
)
@@ -185,21 +185,21 @@
/datum/supply_pack/pilotgear
name= JOB_PILOT + " gear"
contains = list (
/obj/item/weapon/storage/backpack/parachute,
/obj/item/device/radio/headset/pilot,
/obj/item/device/radio/headset/pilot/alt,
/obj/item/storage/backpack/parachute,
/obj/item/radio/headset/pilot,
/obj/item/radio/headset/pilot/alt,
/obj/item/clothing/mask/gas/half,
/obj/item/device/flashlight/glowstick,
/obj/item/flashlight/glowstick,
/obj/item/stack/marker_beacon/thirty,
/obj/item/device/gps/explorer,
/obj/item/gps/explorer,
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/suit/storage/toggle/bomber/pilot,
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/device/flashlight,
/obj/item/weapon/material/knife/tacknife/survival,
/obj/item/flashlight,
/obj/item/material/knife/tacknife/survival,
/obj/item/clothing/head/pilot_vr,
/obj/item/clothing/under/rank/pilot1,
/obj/item/weapon/gun/energy/gun/protector/pilotgun/locked,
/obj/item/gun/energy/gun/protector/pilotgun/locked,
/obj/item/clothing/gloves/watch/survival
)
cost=20
@@ -218,24 +218,24 @@
/datum/supply_pack/pathfindergear
name= JOB_PATHFINDER + " gear"
contains = list (
/obj/item/device/cataloguer/compact/pathfinder,
/obj/item/device/geiger,
/obj/item/cataloguer/compact/pathfinder,
/obj/item/geiger,
/obj/item/clothing/suit/storage/hooded/explorer,
/obj/item/device/flashlight/glowstick,
/obj/item/device/flashlight,
/obj/item/flashlight/glowstick,
/obj/item/flashlight,
/obj/item/stack/marker_beacon/thirty,
/obj/item/weapon/storage/belt/explorer/pathfinder,
/obj/item/storage/belt/explorer/pathfinder,
/obj/item/clothing/mask/gas/explorer,
/obj/item/weapon/cartridge/explorer,
/obj/item/device/gps/explorer,
/obj/item/cartridge/explorer,
/obj/item/gps/explorer,
/obj/item/clothing/under/explorer,
/obj/item/device/radio/headset/pathfinder,
/obj/item/radio/headset/pathfinder,
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/weapon/material/knife/tacknife/survival,
/obj/item/weapon/material/knife/machete/deluxe,
/obj/item/material/knife/tacknife/survival,
/obj/item/material/knife/machete/deluxe,
/obj/item/clothing/accessory/holster/machete,
/obj/item/weapon/storage/box/explorerkeys,
/obj/item/device/mapping_unit,
/obj/item/storage/box/explorerkeys,
/obj/item/mapping_unit,
/obj/item/clothing/gloves/watch/survival
)
cost = 75
code/datums/supplypacks/vending_refills.dm
+36 -36
View File
@@ -9,122 +9,122 @@
containername = "vendor refill cartridge crate"
/datum/supply_pack/vending_refills/snack
contains = list(/obj/item/weapon/refill_cartridge/autoname/food/snack)
contains = list(/obj/item/refill_cartridge/autoname/food/snack)
name = "Getmore Chocolate Corp Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/fitness
contains = list(/obj/item/weapon/refill_cartridge/autoname/food/fitness)
contains = list(/obj/item/refill_cartridge/autoname/food/fitness)
name = "SweatMAX Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/weeb
contains = list(/obj/item/weapon/refill_cartridge/autoname/food/weeb)
contains = list(/obj/item/refill_cartridge/autoname/food/weeb)
name = "Nippon-tan Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/sol
contains = list(/obj/item/weapon/refill_cartridge/autoname/food/sol)
contains = list(/obj/item/refill_cartridge/autoname/food/sol)
name = "Sol-Snacks Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/snix
contains = list(/obj/item/weapon/refill_cartridge/autoname/food/snix)
contains = list(/obj/item/refill_cartridge/autoname/food/snix)
name = "Snix Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/snlvend
contains = list(/obj/item/weapon/refill_cartridge/autoname/food/snlvend)
contains = list(/obj/item/refill_cartridge/autoname/food/snlvend)
name = "Shop-n-Large Snacks Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/sovietvend
contains = list(/obj/item/weapon/refill_cartridge/autoname/food/sovietvend)
contains = list(/obj/item/refill_cartridge/autoname/food/sovietvend)
name = "Ration Station Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/altevian
contains = list(/obj/item/weapon/refill_cartridge/autoname/food/altevian)
contains = list(/obj/item/refill_cartridge/autoname/food/altevian)
name = "Altevian Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/coffee
contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/coffee)
contains = list(/obj/item/refill_cartridge/autoname/drink/coffee)
name = "Hot Drinks Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/cola
contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/cola)
contains = list(/obj/item/refill_cartridge/autoname/drink/cola)
name = "Robust Softdrinks Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/sovietsoda
contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/sovietsoda)
contains = list(/obj/item/refill_cartridge/autoname/drink/sovietsoda)
name = "BODA Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/bepis
contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/bepis)
contains = list(/obj/item/refill_cartridge/autoname/drink/bepis)
name = "Bepis Softdrinks Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/cigarette
contains = list(/obj/item/weapon/refill_cartridge/autoname/cigarette)
contains = list(/obj/item/refill_cartridge/autoname/cigarette)
name = "Cigarette Vendor Refill Cartridge"
cost = 15
/datum/supply_pack/vending_refills/wardrobe
contains = list(/obj/item/weapon/refill_cartridge/multitype/wardrobe)
contains = list(/obj/item/refill_cartridge/multitype/wardrobe)
name = "Wardrobe Vendor Refill Cartridge"
cost = 10
/datum/supply_pack/vending_refills/giftvendor
contains = list(/obj/item/weapon/refill_cartridge/autoname/giftvendor)
contains = list(/obj/item/refill_cartridge/autoname/giftvendor)
name = "AlliCo Baubles and Confectionaries Vendor Refill Cartridge"
cost = 20
/datum/supply_pack/vending_refills/general_food
contains = list(/obj/item/weapon/refill_cartridge/multitype/food = 5)
contains = list(/obj/item/refill_cartridge/multitype/food = 5)
name = "5-Pack Food Vendor Refill Cartridges"
cost = 75
/datum/supply_pack/vending_refills/general_drink
contains = list(/obj/item/weapon/refill_cartridge/multitype/drink = 5)
contains = list(/obj/item/refill_cartridge/multitype/drink = 5)
name = "5-Pack Drink Vendor Refill Cartridges"
cost = 75
/datum/supply_pack/vending_refills/general_clothing
contains = list(/obj/item/weapon/refill_cartridge/multitype/clothing = 5)
contains = list(/obj/item/refill_cartridge/multitype/clothing = 5)
name = "5-Pack Clothing Vendor Refill Cartridges"
cost = 75
/datum/supply_pack/vending_refills/general_technical
contains = list(/obj/item/weapon/refill_cartridge/multitype/technical = 5)
contains = list(/obj/item/refill_cartridge/multitype/technical = 5)
name = "5-Pack Technical Vendor Refill Cartridges"
cost = 75
/datum/supply_pack/vending_refills/general_specialty
contains = list(/obj/item/weapon/refill_cartridge/multitype/specialty = 5)
contains = list(/obj/item/refill_cartridge/multitype/specialty = 5)
name = "5-Pack Specialty Vendor Refill Cartridges"
cost = 150
/datum/supply_pack/randomised/vending_refills/value_pack // 5 random vendor-specific cartridges at lower average price. But why?
num_contained = 5
contains = list(/obj/item/weapon/refill_cartridge/autoname/food/snack,
/obj/item/weapon/refill_cartridge/autoname/food/fitness,
/obj/item/weapon/refill_cartridge/autoname/food/weeb,
/obj/item/weapon/refill_cartridge/autoname/food/sol,
/obj/item/weapon/refill_cartridge/autoname/food/snix,
/obj/item/weapon/refill_cartridge/autoname/food/snlvend,
/obj/item/weapon/refill_cartridge/autoname/food/sovietvend,
/obj/item/weapon/refill_cartridge/autoname/drink/coffee,
/obj/item/weapon/refill_cartridge/autoname/drink/cola,
/obj/item/weapon/refill_cartridge/autoname/drink/sovietsoda,
/obj/item/weapon/refill_cartridge/autoname/drink/bepis,
/obj/item/weapon/refill_cartridge/autoname/cigarette,
/obj/item/weapon/refill_cartridge/multitype/wardrobe,
/obj/item/weapon/refill_cartridge/autoname/technical/assist,
/obj/item/weapon/refill_cartridge/autoname/technical/tool,
/obj/item/weapon/refill_cartridge/autoname/giftvendor)
contains = list(/obj/item/refill_cartridge/autoname/food/snack,
/obj/item/refill_cartridge/autoname/food/fitness,
/obj/item/refill_cartridge/autoname/food/weeb,
/obj/item/refill_cartridge/autoname/food/sol,
/obj/item/refill_cartridge/autoname/food/snix,
/obj/item/refill_cartridge/autoname/food/snlvend,
/obj/item/refill_cartridge/autoname/food/sovietvend,
/obj/item/refill_cartridge/autoname/drink/coffee,
/obj/item/refill_cartridge/autoname/drink/cola,
/obj/item/refill_cartridge/autoname/drink/sovietsoda,
/obj/item/refill_cartridge/autoname/drink/bepis,
/obj/item/refill_cartridge/autoname/cigarette,
/obj/item/refill_cartridge/multitype/wardrobe,
/obj/item/refill_cartridge/autoname/technical/assist,
/obj/item/refill_cartridge/autoname/technical/tool,
/obj/item/refill_cartridge/autoname/giftvendor)
name = "5-pack Extra-Cheap Vendor Refill Cartridges"
cost = 35
code/datums/supplypacks/voidsuits.dm
+20 -20
View File
@@ -14,7 +14,7 @@
/obj/item/clothing/head/helmet/space/void/atmos = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2,
/obj/item/tank/oxygen = 2,
)
cost = 35
containertype = /obj/structure/closet/crate/secure/aether
@@ -28,7 +28,7 @@
/obj/item/clothing/head/helmet/space/void/atmos/alt = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2,
/obj/item/tank/oxygen = 2,
)
cost = 60
containertype = /obj/structure/closet/crate/secure/aether
@@ -42,7 +42,7 @@
/obj/item/clothing/head/helmet/space/void/engineering = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
@@ -56,7 +56,7 @@
/obj/item/clothing/head/helmet/space/void/engineering/construction = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
@@ -70,7 +70,7 @@
/obj/item/clothing/head/helmet/space/void/engineering/hazmat = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
@@ -84,7 +84,7 @@
/obj/item/clothing/head/helmet/space/void/engineering/alt = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 60
containertype = /obj/structure/closet/crate/secure/xion
@@ -98,7 +98,7 @@
/obj/item/clothing/head/helmet/space/void/medical = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 35
containertype = /obj/structure/closet/crate/secure/veymed
@@ -112,7 +112,7 @@
/obj/item/clothing/head/helmet/space/void/medical/emt = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 35
containertype = /obj/structure/closet/crate/secure/veymed
@@ -126,7 +126,7 @@
/obj/item/clothing/head/helmet/space/void/medical/bio = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 35
containertype = /obj/structure/closet/crate/secure/nanomed
@@ -140,7 +140,7 @@
/obj/item/clothing/head/helmet/space/void/medical/alt = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 60
containertype = /obj/structure/closet/crate/secure/veymed
@@ -154,7 +154,7 @@
/obj/item/clothing/head/helmet/space/void/medical/alt/tesh = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
containername = "Vey-Med Autoadaptive voidsuit (teshari) crate"
@@ -165,7 +165,7 @@
/obj/item/clothing/head/helmet/space/void/security = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 35
containertype = /obj/structure/closet/crate/secure/heph
@@ -178,7 +178,7 @@
/obj/item/clothing/head/helmet/space/void/security/riot = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 60
containertype = /obj/structure/closet/crate/secure/heph
@@ -192,7 +192,7 @@
/obj/item/clothing/head/helmet/space/void/security/alt = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 60
containertype = /obj/structure/closet/crate/secure/heph
@@ -205,7 +205,7 @@
/obj/item/clothing/suit/space/void/mining = 2,
/obj/item/clothing/head/helmet/space/void/mining = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
@@ -218,7 +218,7 @@
/obj/item/clothing/suit/space/void/mining/alt = 2,
/obj/item/clothing/head/helmet/space/void/mining/alt = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 60
containertype = /obj/structure/closet/crate/secure/grayson
@@ -243,7 +243,7 @@
/obj/item/clothing/head/helmet/space/void/exploration = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 45
containertype = /obj/structure/closet/crate/secure
@@ -257,7 +257,7 @@
/obj/item/clothing/head/helmet/space/void/exploration = 2,
/obj/item/clothing/mask/breath = 2,
/obj/item/clothing/shoes/magboots = 2,
/obj/item/weapon/tank/oxygen = 2
/obj/item/tank/oxygen = 2
)
cost = 45
containertype = /obj/structure/closet/crate/secure
@@ -271,7 +271,7 @@
/obj/item/clothing/head/helmet/space/void/pilot = 1,
/obj/item/clothing/mask/breath = 1,
/obj/item/clothing/shoes/magboots = 1,
/obj/item/weapon/tank/oxygen = 1
/obj/item/tank/oxygen = 1
)
cost = 20
containertype = /obj/structure/closet/crate/secure
@@ -383,7 +383,7 @@
contains = list(
/obj/item/clothing/suit/space/void/salvagecorp_shipbreaker,
/obj/item/clothing/head/helmet/space/void/salvagecorp_shipbreaker,
/obj/item/weapon/tank/jetpack/breaker
/obj/item/tank/jetpack/breaker
)
cost = 100
containertype = /obj/structure/closet/crate/coyote_salvage

Some files were not shown because too many files have changed in this diff Show More