diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_yw.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_yw.dm index 76f9aa9285..e69de29bb2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_yw.dm @@ -1,11 +0,0 @@ -/datum/gear/uniform/suit/expeditionsuit - display_name = "Expeditionary jumpsuit Selection" - path = /obj/item/clothing/under/utility/expeditionary/ - -/datum/gear/uniform/suit/expeditionsuit/New() - ..() - var/list/expsuits = list() - for(var/expsuit in typesof(/obj/item/clothing/under/utility/expeditionary/)) - var/obj/item/clothing/suit/expsuit_type = expsuit - expsuits[initial(expsuit_type.name)] = expsuit_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(expsuits)) \ No newline at end of file diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index 722223424b..e9568f55a9 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -100,11 +100,11 @@ ..() //cargo trains are open topped, so there is a chance the projectile will hit the mob ridding the train instead -/obj/vehicle/train/security/bullet_act(var/obj/item/projectile/Proj) - if(buckled_mob && prob(70)) - buckled_mob.bullet_act(Proj) - return - ..() +///obj/vehicle/train/security/bullet_act(var/obj/item/projectile/Proj) +// if(buckled_mob && prob(70)) +// buckled_mob.bullet_act(Proj) +// return +// ..() /obj/vehicle/train/security/update_icon() if(open) diff --git a/icons/mob/human_face_or_vr.dmi b/icons/mob/human_face_or_vr.dmi index fda6c68b48..6fc28cae62 100644 Binary files a/icons/mob/human_face_or_vr.dmi and b/icons/mob/human_face_or_vr.dmi differ diff --git a/icons/mob/vore/taurs_vr.dmi b/icons/mob/vore/taurs_vr.dmi index cfc01a6962..ad3220740f 100644 Binary files a/icons/mob/vore/taurs_vr.dmi and b/icons/mob/vore/taurs_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index aaecb22145..ad8d2ac914 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1809,7 +1809,6 @@ #include "code\modules\mining\money_bag.dm" #include "code\modules\mining\ore.dm" #include "code\modules\mining\ore_datum.dm" -#include "code\modules\mining\reward_yw.dm" #include "code\modules\mining\satchel_ore_boxdm.dm" #include "code\modules\mining\drilling\drill.dm" #include "code\modules\mining\drilling\scanner.dm"