diff --git a/GainStation13/code/modules/atmospherics/gasmixtures/reactions.dm b/GainStation13/code/modules/atmospherics/gasmixtures/reactions.dm index d758e72140..5159e08257 100644 --- a/GainStation13/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/GainStation13/code/modules/atmospherics/gasmixtures/reactions.dm @@ -28,7 +28,7 @@ var/old_heat_capacity = air.heat_capacity() - var/used_moles = min((reaction_efficiency * min(plasma_moles, tritium_moles) * 0.5), 10) + var/used_moles = min((reaction_efficiency * min(plasma_moles, tritium_moles) * 0.5), 3) var/energy_released = used_moles * FIRE_CARBON_ENERGY_RELEASED air.adjust_moles(GAS_FAT, used_moles) diff --git a/GainStation13/code/modules/power/energy_harvester.dm b/GainStation13/code/modules/power/energy_harvester.dm index 4f1ebfbafe..592f886fc6 100644 --- a/GainStation13/code/modules/power/energy_harvester.dm +++ b/GainStation13/code/modules/power/energy_harvester.dm @@ -18,6 +18,7 @@ var/credit_conversion_rate = 0.000005 var/power_available = 0 var/active = FALSE + var/waiting_for_power = 0 /obj/machinery/power/energy_harvester/Initialize(mapload) . = ..() @@ -62,6 +63,9 @@ power_available = avail() if(power_available <= 0) + if (waiting_for_power < 1) // grace period for not having power in the wire - allows for the machine to stay on without producing credits even if power is cut for a short period + waiting_for_power += 1 + return src.visible_message("[src] buzzes. Seems like there is no energy in the connected powernet.") playsound(src, 'sound/machines/buzz-two.ogg', 50) active = FALSE @@ -70,6 +74,7 @@ soundloop.stop() return + waiting_for_power = 0 var/power_drain = power_available * set_power_drain add_load(power_drain) var/credits_earned = credit_conversion_rate * power_drain diff --git a/GainStation13/icons/obj/status_display.dmi b/GainStation13/icons/obj/status_display.dmi new file mode 100644 index 0000000000..4e86f4b366 Binary files /dev/null and b/GainStation13/icons/obj/status_display.dmi differ diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index a42cc3f998..9af18726b7 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -7245,7 +7245,7 @@ "fzN" = (/obj/structure/disposalpipe/segment,/turf/open/floor/plasteel/showroomfloor,/area/security/warden) "fAL" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{req_access_txt = "13"; dir = 4},/turf/open/floor/plating,/area/maintenance/fore/secondary) "fAN" = (/obj/docking_port/stationary{dir = 8; dwidth = 2; height = 5; shuttle_id = "laborcamp_home"; name = "fore bay 1"; roundstart_template = /datum/map_template/shuttle/labour/box; width = 9},/turf/open/space/basic,/area/space) -"fBl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/washing_machine,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/crew_quarters/fitness/sauna) +"fBl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/gear_painter,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/crew_quarters/fitness/sauna) "fDC" = (/obj/machinery/light,/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/security/brig) "fEc" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/burger/cheese,/obj/item/ashtray{pixel_y = -15},/turf/open/floor/carpet,/area/cargo/miningdock) "fFW" = (/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/decal/cleanable/dirt,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel,/area/security/prison/cells) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index ad422d3161..61e50c15e8 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -53401,7 +53401,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/washing_machine, +/obj/machinery/gear_painter, /obj/machinery/airalarm{ dir = 4; pixel_x = -22 diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 22177b6883..91ae597296 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -83619,7 +83619,7 @@ /turf/open/floor/plasteel, /area/security/prison) "wyt" = ( -/obj/machinery/washing_machine, +/obj/machinery/gear_painter, /obj/effect/turf_decal/tile/blue{ dir = 4 }, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index a102a38c04..ccf9c7a43a 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -8427,7 +8427,7 @@ /turf/open/floor/plasteel/cafeteria, /area/commons/dorms) "aqU" = ( -/obj/machinery/washing_machine, +/obj/machinery/gear_painter, /obj/machinery/requests_console{ department = "Crew Quarters"; pixel_y = 30 diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index dc77cf542d..bce9e717af 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -242,7 +242,9 @@ Class Procs: continue if(isliving(AM)) var/mob/living/L = am - if(L.buckled || L.mob_size >= MOB_SIZE_LARGE) + // GS13 EDIT - stupid fucking exception to allow HUGE FUCKING BLOBS to be buckled to adipoelectric generators + if(L.buckled || (L.mob_size >= MOB_SIZE_LARGE && !istype(src, /obj/machinery/power/adipoelectric_generator))) + // GS13 END EDIT continue target = am diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index dcb9ee9eb0..a49939cb55 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -267,7 +267,9 @@ /obj/machinery/computer/security/telescreen/entertainment name = "entertainment monitor" desc = "Damn, they better have the /tg/ channel on these things." - icon = 'icons/obj/status_display.dmi' + // GS13 EDIT + icon = 'GainStation13/icons/obj/status_display.dmi' + // GS13 END EDIT icon_state = "entertainment_blank" network = list("thunder") density = FALSE diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 98fe6c63af..5a69399440 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -18,7 +18,9 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// /obj/machinery/door_timer name = "door timer" - icon = 'icons/obj/status_display.dmi' + // GS13 EDIT + icon = 'GainStation13/icons/obj/status_display.dmi' + // GS13 END EDIT icon_state = "frame" desc = "A remote control for a door." plane = ABOVE_WALL_PLANE @@ -177,7 +179,9 @@ if(maptext) maptext = "" cut_overlays() - add_overlay(mutable_appearance('icons/obj/status_display.dmi', state)) + // GS13 EDIT + add_overlay(mutable_appearance('GainStation13/icons/obj/status_display.dmi', state)) + // GS13 END EDIT //Checks to see if there's 1 line or 2, adds text-icons-numbers/letters over display diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 0ebd66f80f..9e1a6b61ec 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -18,7 +18,9 @@ /obj/machinery/status_display name = "status display" desc = null - icon = 'icons/obj/status_display.dmi' + // GS13 EDIT + icon = 'GainStation13/icons/obj/status_display.dmi' + // GS13 END EDIT icon_state = "frame" base_icon_state = "unanchoredstatusdisplay" verb_say = "beeps" @@ -249,7 +251,9 @@ * Nice overlay to make text smoothly scroll with no client updates after setup. */ /obj/effect/overlay/status_display_text - icon = 'icons/obj/status_display.dmi' + // GS13 EDIT + icon = 'GainStation13/icons/obj/status_display.dmi' + // GS13 END EDIT vis_flags = VIS_INHERIT_LAYER | VIS_INHERIT_PLANE | VIS_INHERIT_ID var/message @@ -501,7 +505,9 @@ var/list/choices = list() for(var/emotion_const in emotion_map) var/icon_state = emotion_map[emotion_const] - choices[emotion_const] = image(icon = 'icons/obj/status_display.dmi', icon_state = icon_state) + // GS13 EDIT + choices[emotion_const] = image(icon = 'GainStation13/icons/obj/status_display.dmi', icon_state = icon_state) + // GS13 END EDIT var/emotion_result = show_radial_menu(user, src, choices, tooltips = TRUE) for(var/_emote in typesof(/datum/emote/ai/emotion_display))