From c508d25d599ef99b90ee0d14a026b94ab9b8cb56 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sun, 16 May 2021 15:25:34 +0300 Subject: [PATCH 1/7] Fixes ghosts breaking dropnoms yeah --- code/modules/multiz/movement_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm index bbca4eef0d6..7c60a4b7aba 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) @@ -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 From b5222d656b8cfb70e93d8720894950fb956c2c05 Mon Sep 17 00:00:00 2001 From: Verkister Date: Sun, 16 May 2021 19:14:12 +0300 Subject: [PATCH 2/7] Update movement_vr.dm --- code/modules/multiz/movement_vr.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm index 7c60a4b7aba..cc9e28b2b9d 100644 --- a/code/modules/multiz/movement_vr.dm +++ b/code/modules/multiz/movement_vr.dm @@ -7,10 +7,8 @@ if(!A.CanPass(src, src.loc, 1, 0)) return FALSE Move(landing) - if(isliving(src)) - var/mob/living/L = src - if(L.pulling) - L.pulling.forceMove(landing) + if(pulling) + pulling.forceMove(landing) return 1 for(var/obj/O in loc) From f4e98e84d32145e2b4f5f925cbf8aa8a12dec53e Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sun, 16 May 2021 14:11:34 -0400 Subject: [PATCH 3/7] Update movement_vr.dm --- code/modules/multiz/movement_vr.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm index cc9e28b2b9d..cba6ebb6c58 100644 --- a/code/modules/multiz/movement_vr.dm +++ b/code/modules/multiz/movement_vr.dm @@ -7,15 +7,17 @@ if(!A.CanPass(src, src.loc, 1, 0)) return FALSE Move(landing) - if(pulling) - pulling.forceMove(landing) + if(isliving(src)) + var/mob/living/L = src + if(L.pulling) + L.pulling.forceMove(landing) return 1 for(var/obj/O in loc) 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 From 74612eaedd4dccbc51dcec710548904f9315511b Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Mon, 17 May 2021 00:24:34 +0100 Subject: [PATCH 4/7] loadout tweaks --- .../loadout/loadout_accessories_vr.dm | 2 +- .../loadout/loadout_eyes_vr.dm | 4 ++-- .../loadout/loadout_head_vr.dm | 5 +++++ .../loadout/loadout_shoes_vr.dm | 3 --- .../loadout/loadout_suit_vr.dm | 10 ++-------- .../loadout/loadout_uniform_vr.dm | 18 +++++++++++------- .../loadout/loadout_utility_vr.dm | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) 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" From 48fb3c6f8177fe32914555abe4d63661bc2a1f6d Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Mon, 17 May 2021 08:37:28 +0100 Subject: [PATCH 5/7] explorer ID addons --- .../items/weapons/id cards/id_stacks_vr.dm | 6 +++--- icons/obj/card_new_vr.dmi | Bin 8934 -> 8938 bytes 2 files changed, 3 insertions(+), 3 deletions(-) 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..a578f50d5e4 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 @@ -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/icons/obj/card_new_vr.dmi b/icons/obj/card_new_vr.dmi index 20e3c85583261d2da28b854afdb0f4c491c81694..496b1fda27a338b60e0fd27058cb963ea049af4f 100644 GIT binary patch literal 8938 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

VU<%sCcslRiPzC!?W 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 E7Yp+k00000 From 02fb5b27e15bfef10d200dabef862d7d36729cc8 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Mon, 17 May 2021 13:47:25 +0100 Subject: [PATCH 6/7] Pilot ID & Lockers --- code/__defines/color.dm | 1 + .../objects/items/weapons/id cards/id_stacks_vr.dm | 2 +- .../_closets_appearance_definitions_vr.dm | 14 ++++++-------- 3 files changed, 8 insertions(+), 9 deletions(-) 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 a578f50d5e4..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") 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 419b28e9c1a..46760952427 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 @@ -65,7 +65,7 @@ ) /decl/closet_appearance/secure_closet/expedition - color = COLOR_BRASS + color = COLOR_OLIVE decals = list( "lower_side_vent" ) @@ -84,15 +84,13 @@ /decl/closet_appearance/secure_closet/expedition/explorer extra_decals = list( - "stripe_vertical_left_full" = COLOR_PURPLE, - "stripe_vertical_right_full" = COLOR_PURPLE, - "exped" = COLOR_PURPLE + "stripe_vertical_mid_full" = COLOR_GRAY40, + "exped" = COLOR_GRAY40 ) /decl/closet_appearance/secure_closet/expedition/pathfinder extra_decals = list( - "stripe_vertical_left_full" = COLOR_PURPLE, - "stripe_vertical_mid_full" = COLOR_GRAY40, - "stripe_vertical_right_full" = COLOR_PURPLE, - "exped" = COLOR_GRAY40 + "stripe_vertical_left_full" = COLOR_GRAY20, + "stripe_vertical_right_full" = COLOR_GRAY20, + "exped" = COLOR_GRAY20 ) \ No newline at end of file From f3209959cc8382c19901d01165396755658393ff Mon Sep 17 00:00:00 2001 From: Heroman Date: Tue, 18 May 2021 05:28:31 +1000 Subject: [PATCH 7/7] Fixes pixel offsets resetting on Giant Spider Queen --- .../subtypes/animal/giant_spider/giant_spider_vr.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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