Skip to content

Commit

Permalink
Fixes 3 mech oppsies (#8384)
Browse files Browse the repository at this point in the history
* p1

* p2

* sisyphus struggle

* Fixes and HUD additions

* final fixes to mech huds.

* ssa

* the pulling , the medical and the ugly framework

* fixes

* fix 2

* more code , more fuel , more modules , more stuff.

* content

* fix

* fixes for multiple bugs

* Fixes mech breathing , lts mechs be built without arms/head, Additional handlign for no head /  arms , component gibbing , mech interaction for generators./

* fixes + the beginning of the forklifts.

* forklifting championship part 1

* Sacrifices in the name of forklifting championships..

* fixes

* more mech fixes

* more fixes

* Unleahs the forklift upon this universe

* fix

* i heard you like to lift..

* more fixes + fix for throwing shit whilst inside of other stuff.

* extra mech examine data.

* more fixes.

* Add functionality for removing people from forklifts / towing hooks + more examine text fixe.s

* Fixes + FORKLIFTING CHECKS!!!!!

* last Fixes.

* More examines + a new seat on the forklift chassis.

* Flip this around so it doesnt always give energy.

* Fix UI sometimes glitching , fix door forcing being do-able with light arms and clamper arms, fixes draining fuel generators

* Update utility.dm

* Update frame.dm

* fixes for bugs.

* fix for integrations

* Add all the modules to research + give them research data and material costs.

* f

* f2

* fix + reduce  use delay on auto mender

* fix integrations

* Update mech_damage.dm

* Update utility.dm

* better balance for wheels

* update b-shield sprites + make undeploying it much faster.

* Update utility.dm

* Update shield generator sprites.

* switch around a icon_state update and shield icons.

* ii

* Update frame.dm

* Update frame.dm

* Update structures.dm

* Update code/modules/mechs/equipment/medical.dm

---------

Co-authored-by: hyperioo <64754494+hyperioo@users.noreply.github.com>
  • Loading branch information
MLGTASTICa and hyperioo authored Dec 22, 2023
1 parent 47f71b3 commit 8316e67
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion code/modules/mechs/components/frame.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
if(is_reinforced == FRAME_REINFORCED_SECURE || is_reinforced == FRAME_REINFORCED_WELDED)
usable_qualities += QUALITY_WELDING

if(is_reinforced == FRAME_REINFORCED || arms || legs || head || body)
if((is_reinforced == FRAME_REINFORCED && !istype(I,/obj/item/mech_component/manipulators)) || arms || legs || head || body)
usable_qualities += QUALITY_PRYING

if(is_wired)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mechs/equipment/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@
to_chat(user, SPAN_NOTICE("You cancel \the [src]'s mending on [target]."))
return
if(mending_target)
to_chat(user, SPAN_NOTICE("\The [src] is already mending someone,you can stop it by clicking the person again!"))
return
to_chat(user, SPAN_NOTICE("You stop \the [src] from mending [mending_target]."))
mending_target = null
if(!target.Adjacent(mech))
to_chat(user, SPAN_NOTICE("You need to be next to \the [target] to start mending them!"))
mending_target = target
Expand Down
4 changes: 4 additions & 0 deletions code/modules/multiz/structures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@
. = ..()
if(throw_through(I,user))
return
else if(istype(I, /obj/item/mech_equipment) || istype(I, /obj/item/mech_component))
var/mob/living/exosuit = I.getContainingAtom()
if(exosuit)
attack_hand(exosuit)
else
attack_hand(user)

Expand Down

0 comments on commit 8316e67

Please sign in to comment.