From 4dd9453dde307aa5085863a6a3f6f3f0f2b5ea19 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Fri, 25 Nov 2016 20:37:52 -0800 Subject: [PATCH 1/6] FUCK --- code/modules/mob/living/living.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index f190acba63d..f58e39fe51c 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -443,7 +443,7 @@ if(isopenturf(loc) && !is_flying()) var/turf/open/T = loc . += T.slowdown - if(!ignorewalk) + if(ignorewalk) . += config.run_speed else switch(m_intent) From c3ada1624df6311fb2047ff9a5df050d580d6778 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Fri, 25 Nov 2016 21:25:13 -0800 Subject: [PATCH 2/6] reconfiguration --- .../modules/clothing/spacesuits/flightsuit.dm | 4 - .../mob/living/carbon/human/human_movement.dm | 3 +- .../mob/living/carbon/human/species.dm | 78 +++++++++---------- 3 files changed, 40 insertions(+), 45 deletions(-) diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm index fc90e917c33..d99a84ceed0 100644 --- a/code/modules/clothing/spacesuits/flightsuit.dm +++ b/code/modules/clothing/spacesuits/flightsuit.dm @@ -329,10 +329,6 @@ if(!flight) suit.slowdown = slowdown_ground return - if(brake) - suit.slowdown = slowdown_brake - else if(boost) - suit.slowdown = -boost_speed else suit.slowdown = slowdown_air diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 41aacf720cc..386fd2c0021 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -1,7 +1,8 @@ /mob/living/carbon/human/movement_delay() - . += dna.species.movement_delay(src) + . = 0 . += ..() . += config.human_delay + . += dna.species.movement_delay(src) /mob/living/carbon/human/slip(s_amount, w_amount, obj/O, lube) if(isobj(shoes) && (shoes.flags&NOSLIP) && !(lube&GALOSHES_DONT_HELP)) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 16d476bc041..c181ecb123e 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -863,42 +863,44 @@ //////////////// /datum/species/proc/movement_delay(mob/living/carbon/human/H) - . = 0 - var/obj/item/device/flightpack/F = H.get_flightpack() + . = 0 //We start at 0. + var/flight = 0 //Check for flight and flying items var/flightpack = 0 + var/slowcarry = 1 + var/ignoreslow = 0 + var/obj/item/device/flightpack/F = H.get_flightpack() if(istype(F) && F.flight) flightpack = 1 - var/flight = 0 if(H.movement_type & FLYING) flight = 1 + if(H.status_flags & IGNORESLOWDOWN) + ignoreslow = 1 - if(!flightpack) + if(!flightpack) //Check for chemicals and innate speedups and slowdowns if we're moving using our body and not a flying suit if(H.status_flags & GOTTAGOFAST) . -= 1 if(H.status_flags & GOTTAGOREALLYFAST) . -= 2 + . += speedmod - if(!(H.status_flags & IGNORESLOWDOWN)) - if(!H.has_gravity()) - if((H.movement_type & FLYING) && !flightpack) //No hyperstacking angel wings! - . += speedmod - return - // If there's no gravity we have the sanic speed of jetpack. - var/obj/item/weapon/tank/jetpack/J = H.back - var/obj/item/clothing/suit/space/hardsuit/C = H.wear_suit - if(!istype(J) && istype(C)) - J = C.jetpack - - if(istype(J) && J.allow_thrust(0.01, H)) - . -= 2 - else - var/obj/item/organ/cyberimp/chest/thrusters/T = H.getorganslot("thrusters") - if(istype(T) && T.allow_thrust(0.01, H)) - . -= 2 - - else if(flightpack && F.allow_thrust(0.01, src)) //No jetpack/flightsuit hyperstacking! - . -= 1 + if(!H.has_gravity()) + var/obj/item/weapon/tank/jetpack/J = H.back + var/obj/item/clothing/suit/space/hardsuit/C = H.wear_suit + var/obj/item/organ/cyberimp/chest/thrusters/T = H.getorganslot("thrusters") + if(!istype(J) && istype(C)) + J = C.jetpack + if(istype(J) && J.allow_thrust(0.01, H)) //Prevents stacking + . -= 2 + else if(istype(T) && T.allow_thrust(0.01, H)) + . -= 2 + else if(flightpack && F.allow_thrust(0.01, src)) + . -= 1 + if(flightpack && F.boost) + . -= F.boost_speed + else if(flightpack && F.brake) + . += 2 + if(!ignoreslow && !flightpack) if(H.wear_suit) . += H.wear_suit.slowdown if(H.shoes) @@ -908,24 +910,20 @@ for(var/obj/item/I in H.held_items) if(I.flags & HANDSLOW) . += I.slowdown - if(!(flightpack)) - var/health_deficiency = (100 - H.health + H.staminaloss) - if(health_deficiency >= 40) - if(flight) - . += (health_deficiency / 75) - else - . += (health_deficiency / 25) - + var/health_deficiency = (100 - H.health + H.staminaloss) + if(health_deficiency >= 40) + if(flight) + . += (health_deficiency / 75) + else + . += (health_deficiency / 25) var/hungry = (500 - H.nutrition) / 5 // So overeat would be 100 and default level would be 80 - if((hungry >= 70) && !flight) //Being hungry won't stop you from using flightpack controls/flapping your wings although it probably will in the wing case but who cares. - . += hungry / 50 - + if((hungry >= 70) && !flight) //Being hungry won't stop you from using flightpack controls/flapping your wings although it probably will in the wing case but who cares. + . += hungry / 50 if((H.disabilities & FAT)) - . += (1.5 - flight) - if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT) - . += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR - - . += speedmod + . += (1.5 - flight) + if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT) + . += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR + return . ////////////////// // ATTACK PROCS // From ad208997003fdb34dbc20de4cecf87d1580bab6c Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Fri, 25 Nov 2016 21:51:53 -0800 Subject: [PATCH 3/6] dixed --- code/modules/clothing/spacesuits/flightsuit.dm | 2 +- code/modules/mob/living/carbon/human/species.dm | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm index d99a84ceed0..90fe48420ab 100644 --- a/code/modules/clothing/spacesuits/flightsuit.dm +++ b/code/modules/clothing/spacesuits/flightsuit.dm @@ -425,7 +425,7 @@ wearer.adjustBruteLoss(userdamage) usermessage("WARNING: Stabilizers taking damage!", 2) wearer.visible_message(crashmessagesrc) - crash_damage = Clamp(crash_damage + 3, 0, crash_disable_threshold*1.5) + crash_damage = Clamp(crash_damage + crash_damage_high, 0, crash_disable_threshold*1.5) /obj/item/device/flightpack/proc/userknockback(density, anchored, speed, dir) var/angle = dir2angle(dir) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index c181ecb123e..e786ba1579f 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -866,15 +866,11 @@ . = 0 //We start at 0. var/flight = 0 //Check for flight and flying items var/flightpack = 0 - var/slowcarry = 1 - var/ignoreslow = 0 var/obj/item/device/flightpack/F = H.get_flightpack() if(istype(F) && F.flight) flightpack = 1 if(H.movement_type & FLYING) flight = 1 - if(H.status_flags & IGNORESLOWDOWN) - ignoreslow = 1 if(!flightpack) //Check for chemicals and innate speedups and slowdowns if we're moving using our body and not a flying suit if(H.status_flags & GOTTAGOFAST) @@ -900,7 +896,7 @@ else if(flightpack && F.brake) . += 2 - if(!ignoreslow && !flightpack) + if(!(H.status_flags & IGNORESLOWDOWN) && !flightpack) if(H.wear_suit) . += H.wear_suit.slowdown if(H.shoes) @@ -911,12 +907,12 @@ if(I.flags & HANDSLOW) . += I.slowdown var/health_deficiency = (100 - H.health + H.staminaloss) + var/hungry = (500 - H.nutrition) / 5 // So overeat would be 100 and default level would be 80 if(health_deficiency >= 40) if(flight) . += (health_deficiency / 75) else . += (health_deficiency / 25) - var/hungry = (500 - H.nutrition) / 5 // So overeat would be 100 and default level would be 80 if((hungry >= 70) && !flight) //Being hungry won't stop you from using flightpack controls/flapping your wings although it probably will in the wing case but who cares. . += hungry / 50 if((H.disabilities & FAT)) From 2e86115c1fe912efccd39c5f211a7c3e4cd7d135 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Fri, 25 Nov 2016 23:17:41 -0800 Subject: [PATCH 4/6] Update species.dm --- code/modules/mob/living/carbon/human/species.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index e786ba1579f..77763e8d89b 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -915,7 +915,7 @@ . += (health_deficiency / 25) if((hungry >= 70) && !flight) //Being hungry won't stop you from using flightpack controls/flapping your wings although it probably will in the wing case but who cares. . += hungry / 50 - if((H.disabilities & FAT)) + if(H.disabilities & FAT) . += (1.5 - flight) if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT) . += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR @@ -1356,4 +1356,4 @@ #undef COLD_DAMAGE_LEVEL_1 #undef COLD_DAMAGE_LEVEL_2 -#undef COLD_DAMAGE_LEVEL_3 \ No newline at end of file +#undef COLD_DAMAGE_LEVEL_3 From 4c1986adef795ca24cc36ab3d9fb65ebab7cca2b Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Fri, 25 Nov 2016 23:32:28 -0800 Subject: [PATCH 5/6] Update species.dm --- code/modules/mob/living/carbon/human/species.dm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 77763e8d89b..2c797d8befc 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -866,6 +866,8 @@ . = 0 //We start at 0. var/flight = 0 //Check for flight and flying items var/flightpack = 0 + var/ignoreslow = 0 + var/gravity = 0 var/obj/item/device/flightpack/F = H.get_flightpack() if(istype(F) && F.flight) flightpack = 1 @@ -878,8 +880,14 @@ if(H.status_flags & GOTTAGOREALLYFAST) . -= 2 . += speedmod + + if(H.status_flags & IGNORESLOWDOWN) + ignoreslow = 1 + + if(H.has_gravity() + gravity = 1 - if(!H.has_gravity()) + if(!gravity) var/obj/item/weapon/tank/jetpack/J = H.back var/obj/item/clothing/suit/space/hardsuit/C = H.wear_suit var/obj/item/organ/cyberimp/chest/thrusters/T = H.getorganslot("thrusters") @@ -891,12 +899,13 @@ . -= 2 else if(flightpack && F.allow_thrust(0.01, src)) . -= 1 + if(flightpack && F.boost) . -= F.boost_speed else if(flightpack && F.brake) . += 2 - if(!(H.status_flags & IGNORESLOWDOWN) && !flightpack) + if(!ignoreslow && !flightpack && gravity) if(H.wear_suit) . += H.wear_suit.slowdown if(H.shoes) From 9e8d1189418b84bdefc834a3a6a6e38daf29d28a Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Fri, 25 Nov 2016 23:33:52 -0800 Subject: [PATCH 6/6] Update species.dm --- code/modules/mob/living/carbon/human/species.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 2c797d8befc..f5a08851ccb 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -884,7 +884,7 @@ if(H.status_flags & IGNORESLOWDOWN) ignoreslow = 1 - if(H.has_gravity() + if(H.has_gravity()) gravity = 1 if(!gravity)