diff --git a/code/__DEFINES/~skyrat_defines/combat.dm b/code/__DEFINES/~skyrat_defines/combat.dm index cc0089dec52..ba26996625c 100644 --- a/code/__DEFINES/~skyrat_defines/combat.dm +++ b/code/__DEFINES/~skyrat_defines/combat.dm @@ -17,7 +17,7 @@ #define CLICK_CD_RANGE_TIRED 5 //#define CLICK_CD_RANGE 4, so 25% slower //Grab breakout odds -#define OVERSIZED_GRAB_RESIST_BONUS 10 /// For those with the oversized trait, they get this. +#define OVERSIZED_GRAB_RESIST_BONUS 0 // BUBBER EDIT- With this oversized are just as good at grabs as anyone else. // Damage modifiers #define OVERSIZED_HARM_DAMAGE_BONUS 5 /// Those with the oversized trait do 5 more damage. diff --git a/code/modules/vehicles/sealed.dm b/code/modules/vehicles/sealed.dm index fc54e194efa..207fbc7262b 100644 --- a/code/modules/vehicles/sealed.dm +++ b/code/modules/vehicles/sealed.dm @@ -50,9 +50,9 @@ if(!istype(M)) return FALSE //SKYRAT EDIT ADDITION - if(HAS_TRAIT(M, TRAIT_OVERSIZED)) + /*if(HAS_TRAIT(M, TRAIT_OVERSIZED)) to_chat(M, span_warning("You are far too big for this!")) - return FALSE + return FALSE*/ //BUBBER EDIT: commented out this Skyrat change. //SKYRAT EDIT END if(do_after(M, get_enter_delay(M), src, timed_action_flags = IGNORE_HELD_ITEM, extra_checks = CALLBACK(src, PROC_REF(enter_checks), M))) mob_enter(M) diff --git a/modular_skyrat/modules/oversized/code/door.dm b/modular_skyrat/modules/oversized/code/door.dm index 7d21ae306d0..b595e596f2a 100644 --- a/modular_skyrat/modules/oversized/code/door.dm +++ b/modular_skyrat/modules/oversized/code/door.dm @@ -1,3 +1,5 @@ +//BUBBER EDIT: Commenting out this whole file, we don't want this. +/* /obj/machinery/door/airlock/Initialize(mapload) . = ..() var/static/list/loc_connections = list( @@ -18,4 +20,4 @@ crossing_human.visible_message(span_warning("[crossing_human] slams their head into the frame of [src] with a sickening thud!"), \ span_userdanger("You slam your head against [src]!") ) - playsound(crossed_atom, 'sound/effects/bang.ogg', 50, TRUE) + playsound(crossed_atom, 'sound/effects/bang.ogg', 50, TRUE)*/