diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index 169425353e..28733a6b6c 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -16,7 +16,6 @@ . += "Alt-click to eject the limb." /obj/machinery/aug_manipulator/Initialize() - . = ..() initial_icon_state = initial(icon_state) return ..() diff --git a/sandcode/code/datums/mood_events/generic_negative_events.dm b/sandcode/code/datums/mood_events/generic_negative_events.dm new file mode 100644 index 0000000000..4946df33a1 --- /dev/null +++ b/sandcode/code/datums/mood_events/generic_negative_events.dm @@ -0,0 +1,4 @@ +/datum/mood_event/failed_easy + description = "I failed such an easy equation\n" + mood_change = -1 + timeout = 2 MINUTES diff --git a/sandcode/code/game/machinery/PDApainter.dm b/sandcode/code/game/machinery/PDApainter.dm index 56543c7d92..4ddf6f0937 100644 --- a/sandcode/code/game/machinery/PDApainter.dm +++ b/sandcode/code/game/machinery/PDApainter.dm @@ -1,18 +1,9 @@ /obj/machinery/pdapainter circuit = /obj/item/circuitboard/machine/pdapainter -/obj/machinery/pdapainter/New() //aug_manipulator code is so stupid that i sincerely can't make out why it doesn't just work normally - . = ..() //in any case if you figure out how to make it just work normally, have a go at it. - if(!component_parts) - circuit = null - circuit = new /obj/item/circuitboard/machine/pdapainter - component_parts = list() - component_parts += circuit - /obj/machinery/pdapainter/examine(mob/user) . += ..() - if(panel_open) - . += "Its maintenance panel is currently open." + . += "Its maintenance panel is currently [panel_open ? "open" : "closed"]." /obj/machinery/pdapainter/screwdriver_act(mob/living/user, obj/item/W) . = TRUE diff --git a/sandcode/code/game/machinery/aug_manipulator.dm b/sandcode/code/game/machinery/aug_manipulator.dm index 4cee6ec93d..898fcc3a4d 100644 --- a/sandcode/code/game/machinery/aug_manipulator.dm +++ b/sandcode/code/game/machinery/aug_manipulator.dm @@ -1,18 +1,9 @@ /obj/machinery/aug_manipulator circuit = /obj/item/circuitboard/machine/aug_manipulator -/obj/machinery/aug_manipulator/New() //aug_manipulator code is so stupid that i sincerely can't make out why it doesn't just work normally - . = ..() //in any case if you figure out how to make it just work normally, have a go at it. - if(!component_parts) - circuit = null - circuit = new /obj/item/circuitboard/machine/aug_manipulator - component_parts = list() - component_parts += circuit - /obj/machinery/aug_manipulator/examine(mob/user) . += ..() - if(panel_open) - . += "Its maintenance panel is currently open." + . += "Its maintenance panel is currently [panel_open ? "open" : "closed"]." /obj/machinery/aug_manipulator/screwdriver_act(mob/living/user, obj/item/W) . = TRUE diff --git a/sandcode/code/game/objects/items/computermath.dm b/sandcode/code/game/objects/items/computermath.dm index abca4e7877..7f608ba6d3 100644 --- a/sandcode/code/game/objects/items/computermath.dm +++ b/sandcode/code/game/objects/items/computermath.dm @@ -239,9 +239,9 @@ D.adjust_money(-points_lost) // me fail arithmetic, me brian hurt playsound(src, 'sound/machines/buzz-sigh.ogg', 30, 1) - if(difficulty == "Easy") // me fail arithmetic, me brian hurt - to_chat(user,"You feel lightheaded after failing such an easy question...") - LM.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10) + if(difficulty == "Easy") // me fail arithmetic, me brian hurt //nice one, brain damage for it, very cool. + to_chat(user,"You feel sad after failing such an easy question...") + SEND_SIGNAL(LM, COMSIG_ADD_MOOD_EVENT, "failed_easy", /datum/mood_event/failed_easy) return // Award points for a correct answer. diff --git a/tgstation.dme b/tgstation.dme index 28ed13cf6f..f2793bdf23 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3629,6 +3629,7 @@ #include "sandcode\code\datums\interactions\lewd\lewd_interactions.dm" #include "sandcode\code\datums\interactions\lewd\lewd_species.dm" #include "sandcode\code\datums\interactions\lewd\objects.dm" +#include "sandcode\code\datums\mood_events\generic_negative_events.dm" #include "sandcode\code\datums\mutations\combined.dm" #include "sandcode\code\datums\ruins\lavaland.dm" #include "sandcode\code\datums\status_effects\buffs.dm"