Skip to content

Commit

Permalink
more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Zenith00000 committed May 23, 2024
1 parent cd3ec90 commit 109676a
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 62 deletions.
6 changes: 3 additions & 3 deletions code/game/machinery/hybrsia_lights.dm
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,14 @@
if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
to_chat(user, SPAN_WARNING("You have no clue how to repair this thing."))
return FALSE
var/obj/item/tool/weldingtool/WT = O
if(WT.remove_fuel(1, user))
var/obj/item/tool/weldingtool/welder = O
if(welder.remove_fuel(1, user))

playsound(loc, 'sound/items/weldingtool_weld.ogg', 25)
user.visible_message(SPAN_NOTICE("[user] starts welding [src]'s internal damage."),
SPAN_NOTICE("You start welding [src]'s internal damage."))
if(do_after(user, 200 * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
if(buildstate != 1 || is_on || !WT.isOn())
if(buildstate != 1 || is_on || !welder.isOn())
return FALSE
playsound(loc, 'sound/items/Welder2.ogg', 25, 1)
buildstate = 2
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/hybrisa_props.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1749,7 +1749,7 @@
density = TRUE
health = 200
anchored = TRUE
layer = LATTICE_LAYER
layer = RIPPLE_LAYER

/obj/structure/prop/hybrisa/misc/buildinggreeblies/greeble1
icon_state = "buildingventbig2"
Expand Down
8 changes: 4 additions & 4 deletions code/modules/mob/living/simple_animal/friendly/rat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@
/mob/living/simple_animal/rat/MouseDrop(atom/over_object)
if(!CAN_PICKUP(usr, src))
return ..()
var/mob/living/carbon/H = over_object
if(!istype(H) || !Adjacent(H) || H != usr) return ..()
var/mob/living/carbon/human = over_object
if(!istype(human) || !Adjacent(human) || human != usr) return ..()

if(H.a_intent == INTENT_HELP)
get_scooped(H)
if(human.a_intent == INTENT_HELP)
get_scooped(human)
return
return ..()

Expand Down
Loading

0 comments on commit 109676a

Please sign in to comment.