Skip to content

Commit

Permalink
blah
Browse files Browse the repository at this point in the history
  • Loading branch information
Pockets-byte committed Jun 6, 2024
1 parent eb5e1c5 commit 0f84efc
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 30 deletions.
26 changes: 9 additions & 17 deletions _maps/map_files/Aetherwhisp/Aetherwhisp2.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nsv13.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3805,7 +3805,6 @@
#include "nsv13\code\game\machinery\organgrower.dm"
#include "nsv13\code\game\machinery\plasma_loader.dm"
#include "nsv13\code\game\machinery\refillable_chem_dispenser.dm"
#include "nsv13\code\game\machinery\thermalregulator.dm"
#include "nsv13\code\game\machinery\computer\_ship.dm"
#include "nsv13\code\game\machinery\computer\atmos_control.dm"
#include "nsv13\code\game\machinery\computer\boarding_pin.dm"
Expand Down Expand Up @@ -3994,6 +3993,7 @@
#include "nsv13\code\modules\munitions\ship_weapons\energy_weapons\laser_ams.dm"
#include "nsv13\code\modules\munitions\ship_weapons\energy_weapons\laser_pd.dm"
#include "nsv13\code\modules\munitions\ship_weapons\energy_weapons\phaser.dm"
#include "nsv13\code\modules\munitions\ship_weapons\energy_weapons\subspacecooling.dm"
#include "nsv13\code\modules\munitions\ship_weapons\hybrid_weapons\hybrid_railgun.dm"
#include "nsv13\code\modules\overmap\ai-skynet.dm"
#include "nsv13\code\modules\overmap\ai_interiors.dm"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
if(M.stat != DEAD && M.get_eye_protection() < 2) //checks for eye protec
M.flash_act(10)
to_chat(M, "<span class='warning'>You have a second to watch the casing of the gun glow a dull red before it erupts in a blinding flash as it self-destructs</span>") // stealing this from the plasmagun as well
explosion(detonation_turf, 0, 1, 3, 5, flame_range = 4)
explosion(get_turf(src), 0, 1, 3, 5, flame_range = 4)
heat += max_heat
else
return TRUE
Expand Down Expand Up @@ -285,11 +285,13 @@
..()

/obj/machinery/ship_weapon/energy/multitool_act(mob/living/user, obj/item/I)
/*
if(maint_state == MSTATE_CLOSED)
if (istype(I))
to_chat(user, "<span class='notice'>You log [src] in the multitool's buffer.</span>")
I.buffer = src
return TRUE
*/
if(maint_state == MSTATE_UNSCREWED)
to_chat(user, "<span class='notice'>You must unbolt the protective casing before aligning the lenses!</span>")
if(maint_state == MSTATE_UNBOLTED)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,45 @@
/obj/machinery/cooling
name = "subspace cooling unit"
desc = "A cooling unit that dumps the massive amounts of heat energy weapons generate into subspace."
icon ='nsv13/icons/obj/energy_weapons.dmi'
icon_state = "phase_cannon"
icon = 'icons/obj/power.dmi'
icon_state = "smes"
circuit = /obj/item/circuitboard/machine/cooling
bound_width = 32
pixel_x = -32
pixel_y = -32
idle_power_usage = 2000
var/obj/ship_weapons/energy/parent
var/function = heat
var/obj/machinery/ship_weapon/energy/parent
var/function = "heat"
var/on = FALSE

/obj/item/circuitboard/machine/cooling
name = "subspace cooling unit circuit board"
icon = 'icons/obj/module.dmi'
icon_state = "command"
materials = list(/datum/material/glass=1000)
w_class = WEIGHT_CLASS_SMALL

/obj/item/circuitboard/machine/cooling/storage
name = "subspace heatsink unit circuit board"
icon = 'icons/obj/module.dmi'
icon_state = "command"
materials = list(/datum/material/glass=1000)
w_class = WEIGHT_CLASS_SMALL

/obj/machinery/cooling/Initialize(mapload)
= ..()
parent = locate(/obj/ship_weapons/energy) in orange(1, src)
.= ..()
parent = locate(/obj/machinery/ship_weapon/energy) in orange(1, src)

/obj/machinery/cooling/process(delta_time)
= ..()
if(!on)
.= ..()
if(!on)
return
if(!parent)
return
if(parent.[function] > 0)
parent.[function] = max(parent.[function]-50, 0)
update_icon()


/obj/machinery/cooling/attack_hand(mob/user)
. = ..()
Expand All @@ -34,12 +50,37 @@
on = !on
update_icon()

/*/obj/machinery/cooling/update_icon()
cut_overlays()
if(panel_open)
icon_state = "plasma_condenser_screw"
else if(on)
icon_state = "plasma_condenser_active"
else
icon_state = "plasma_condenser"
/obj/machinery/cooling/multitool_act(mob/living/user, obj/item/I)
if(!multitool_check_buffer(user, I))
return
var/obj/item/multitool/P = I
if(istype(P.buffer, /obj/machinery/ship_weapon/energy))
if(get_area(P.buffer) != get_area(src))
to_chat(user, "<font color = #666633>-% Cannot link machines across power zones. %-</font color>")
return
to_chat(user, "<font color = #666633>-% Successfully linked [P.buffer] with [src] %-</font color>")
parent = P.buffer
parent.console = src
return
*/

/obj/machinery/cooling/storage
name = "subspace heatsink unit"
desc = "A cooling unit that stores the massive amounts of heat energy weapons generate in subspace."
icon ='nsv13/icons/obj/energy_weapons.dmi'
icon_state = "phase_cannon"
icon_state = "smes"
circuit = /obj/item/circuitboard/machine/cooling/storage
function = max_heat
function = "max_heat"


0 comments on commit 0f84efc

Please sign in to comment.