diff --git a/code/__defines/color.dm b/code/__defines/color.dm index 36745128134..ecf01528aac 100644 --- a/code/__defines/color.dm +++ b/code/__defines/color.dm @@ -91,6 +91,7 @@ #define COLOR_DARK_TEAL "#2db5b5" #define COLOR_LIGHT_VIOLET "#e7bfff" #define COLOR_SAN_MARINO_BLUE "#4b75ab" +#define COLOR_OLIVE "#52613b" //VOREStation Addition #define PIPE_COLOR_GREY "#808080" #define PIPE_COLOR_RED "#ff0000" diff --git a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm index 599fd9d5222..2bdd52bfa92 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm @@ -145,7 +145,7 @@ initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-red") /obj/item/weapon/card/id/civilian/pilot - initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-darkgreen") + initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-olive") /obj/item/weapon/card/id/civilian/entertainer initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-brown") @@ -179,13 +179,13 @@ //Exploration /obj/item/weapon/card/id/exploration - initial_sprite_stack = list("base-stamp", "top-darkgreen", "stamp-n") + initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n") /obj/item/weapon/card/id/exploration/fm - initial_sprite_stack = list("base-stamp", "top-darkgreen", "stamp-n", "stripe-medblu") + initial_sprite_stack = list("base-stamp", "top-olive", "stamp-n", "stripe-medblu") /obj/item/weapon/card/id/exploration/head - initial_sprite_stack = list("base-stamp-silver", "top-darkgreen", "stamp-n", "pips-white") + initial_sprite_stack = list("base-stamp-silver", "top-olive", "stamp-n", "pips-white") //Talon diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm index c0c3d104adb..1099a92c80b 100644 --- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm +++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm @@ -98,4 +98,6 @@ /decl/closet_appearance/crate/fennec base_icon = 'icons/obj/closets/bases/fencrate_vr.dmi' decal_icon = 'icons/obj/closets/decals/crate.dmi' - color = "#ffffff" \ No newline at end of file + color = "#ffffff" + ) + diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 7e21dd3ef8c..b006fc7a0d6 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -50,7 +50,7 @@ /datum/gear/accessory/holster display_name = "holster selection (Security, SM, HoP, Exploration)" - allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder","Talon Guard") + allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Field Medic","Explorer","Pathfinder","Talon Captain","Talon Guard") /datum/gear/accessory/brown_vest display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm index 3d1b9254544..9504678e06b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -2,7 +2,7 @@ allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") /datum/gear/eyes/meson - display_name = "Optical Meson Scanners (Engineering, Science)" + display_name = "Optical Meson Scanners (Eng, Sci, Explo)" allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder") /datum/gear/eyes/arglasses @@ -55,7 +55,7 @@ path = /obj/item/clothing/glasses/fluff/science_proper /datum/gear/eyes/meson/retinal - display_name = "retinal projector, meson (Eng, Sci, Mining)" + display_name = "retinal projector, meson (Eng, Sci, Explo)" path = /obj/item/clothing/glasses/omnihud/eng/meson /datum/gear/eyes/security/secpatch diff --git a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm index 2aebfd668f4..d7add786c52 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm @@ -1,3 +1,8 @@ +/datum/gear/head/cap/med + display_name = "cap, medical (Medical)" + path = /obj/item/clothing/head/soft/med + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Field Medic") + /*/datum/gear/head/cap/sol display_name = "cap, sol" path = /obj/item/clothing/head/soft/sol*/ diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm index 554300d379a..66e93fbbf62 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm @@ -1,6 +1,3 @@ -/datum/gear/shoes/boots/winter/science - allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Explorer", "Pathfinder") - /datum/gear/shoes/boots/winter/medical allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index a61b2f7e0a6..88d4b439e74 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -1,15 +1,9 @@ /datum/gear/suit/wintercoat/medical allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") -/datum/gear/suit/wintercoat/science - allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Explorer", "Pathfinder") - /datum/gear/suit/snowsuit/medical allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") -/datum/gear/suit/snowsuit/science - allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Explorer", "Pathfinder") - /datum/gear/suit/labcoat_colorable display_name = "labcoat, colorable" path = /obj/item/clothing/suit/storage/toggle/labcoat @@ -55,7 +49,7 @@ /datum/gear/suit/roles/medical/ems_jacket display_name = "first responder jacket" path = /obj/item/clothing/suit/storage/toggle/fr_jacket - allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor") + allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor","Field Medic") //imo-superior 'martian' style jacket with the star-of-life design /datum/gear/suit/roles/medical/ems_jacket/alt @@ -66,7 +60,7 @@ /datum/gear/suit/roles/medical/paramedic_vest display_name = "paramedic vest" path = /obj/item/clothing/suit/storage/toggle/paramedic - allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor") + allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor","Field Medic") //greek thing /datum/gear/suit/chiton diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 6c8fc917641..1f169dbc70c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -13,6 +13,10 @@ /datum/gear/uniform/job_turtle/science allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") +/datum/gear/uniform/job_turtle/medical + display_name = "turtleneck, medical" + path = /obj/item/clothing/under/rank/medical/turtleneck + allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychiatrist", "Field Medic", "Chemist") //KHI Uniforms /datum/gear/uniform/job_khi/cmd @@ -38,7 +42,7 @@ /datum/gear/uniform/job_khi/sci display_name = "khi uniform, sci" path = /obj/item/clothing/under/rank/khi/sci - allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer") + allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") /datum/gear/uniform/job_khi/crg display_name = "khi uniform, cargo" @@ -58,7 +62,7 @@ /datum/gear/suit/job_fed/medsci display_name = "fed uniform, med/sci" path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedblue - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist","Xenobotanist","Pathfinder","Explorer","Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist","Xenobotanist","Field Medic") /datum/gear/suit/job_fed/eng display_name = "fed uniform, eng" @@ -75,7 +79,7 @@ /datum/gear/uniform/job_trek/medsci/tos display_name = "TOS uniform, med/sci" path = /obj/item/clothing/under/rank/trek/medsci - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") /datum/gear/uniform/job_trek/eng/tos display_name = "TOS uniform, eng/sec" @@ -91,7 +95,7 @@ /datum/gear/uniform/job_trek/medsci/tng display_name = "TNG uniform, med/sci" path = /obj/item/clothing/under/rank/trek/medsci/next - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") /datum/gear/uniform/job_trek/eng/tng display_name = "TNG uniform, eng/sec" @@ -107,7 +111,7 @@ /datum/gear/uniform/job_trek/medsci/voy display_name = "VOY uniform, med/sci" path = /obj/item/clothing/under/rank/trek/medsci/voy - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") /datum/gear/uniform/job_trek/eng/voy display_name = "VOY uniform, eng/sec" @@ -133,7 +137,7 @@ /datum/gear/uniform/job_trek/medsci/ds9 display_name = "DS9 uniform, med/sci" path = /obj/item/clothing/under/rank/trek/medsci/ds9 - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") /datum/gear/uniform/job_trek/eng/ds9 display_name = "DS9 uniform, eng/sec" @@ -150,7 +154,7 @@ /datum/gear/uniform/job_trek/medsci/ent display_name = "ENT uniform, med/sci" path = /obj/item/clothing/under/rank/trek/medsci/ent - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") /datum/gear/uniform/job_trek/eng/ent display_name = "ENT uniform, eng/sec" diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm index 36b3ead7a66..56218337e60 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -54,7 +54,7 @@ /datum/gear/utility/dufflebag/sci display_name = "science dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/sci - allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Xenobotanist","Explorer","Pathfinder") + allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Xenobotanist") /datum/gear/utility/ID display_name = "contractor identification card" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm index 45ce8eb9ad5..a84177f29c1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm @@ -47,9 +47,10 @@ attack_armor_pen = 25 pixel_x = -16 - pixel_y = -16 + pixel_y = 0 + default_pixel_x = -16 old_x = -16 - old_y = -16 + old_y = 0 /mob/living/simple_mob/animal/giant_spider/nurse/eggless/lay_eggs(turf/T) return FALSE diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm index bbca4eef0d6..cba6ebb6c58 100644 --- a/code/modules/multiz/movement_vr.dm +++ b/code/modules/multiz/movement_vr.dm @@ -1,6 +1,6 @@ /mob/living/handle_fall(var/turf/landing) - var/mob/drop_mob = locate(/mob, landing) + var/mob/drop_mob = locate(/mob/living, landing) if(locate(/obj/structure/stairs) in landing) for(var/atom/A in landing) @@ -17,7 +17,7 @@ if(!O.CanFallThru(src, landing)) return 1 - if(drop_mob && !(drop_mob == src) && ismob(drop_mob) && isliving(drop_mob)) //Shitload of checks. This is because the game finds various ways to screw me over. + if(drop_mob && !(drop_mob == src)) //Shitload of checks. This is because the game finds various ways to screw me over. var/mob/living/drop_living = drop_mob if(drop_living.dropped_onto(src)) return @@ -105,4 +105,4 @@ if(direction == UP) //on a turf below, trying to enter return 0 if(direction == DOWN) //on a turf above, trying to enter - return 1 \ No newline at end of file + return 1 diff --git a/icons/obj/card_new_vr.dmi b/icons/obj/card_new_vr.dmi index 20e3c855832..496b1fda27a 100644 Binary files a/icons/obj/card_new_vr.dmi and b/icons/obj/card_new_vr.dmi differ