shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2

Browse Source
This commit is contained in:
DeltaFire
2020-10-11 15:39:41 +02:00
parent c412358d4e 8f8742a445
commit a5fce4b6ed
187 changed files with 2386 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/rtg.dm
+27
View File
@@ -53,6 +53,33 @@
power_gen = 1250 // 2500 on T1, 10000 on T4.
circuit = /obj/item/circuitboard/machine/rtg/advanced
/obj/machinery/power/rtg/advanced/fullupgrade //fully ugpraded stock parts
desc = "An advanced RTG capable of moderating isotope decay, increasing power output but reducing lifetime. It uses plasma-fueled radiation collectors to increase output even further. This model is fully upgraded with the latest tech available in this quadrant."
/obj/machinery/power/rtg/advanced/fullupgrade/Initialize()
. = ..()
//This looks terrifying. And apparently instancing vars and modifying the amount variable causes runtime errors. Guess we're sticking to copy pasta, thanks, byond.
component_parts = list()
component_parts += new /obj/item/circuitboard/machine/rtg/advanced(null)
component_parts += new /obj/item/stack/sheet/mineral/uranium(null)
component_parts += new /obj/item/stack/sheet/mineral/uranium(null)
component_parts += new /obj/item/stack/sheet/mineral/uranium(null)
component_parts += new /obj/item/stack/sheet/mineral/uranium(null)
component_parts += new /obj/item/stack/sheet/mineral/uranium(null)
component_parts += new /obj/item/stack/sheet/mineral/uranium(null)
component_parts += new /obj/item/stack/sheet/mineral/uranium(null)
component_parts += new /obj/item/stack/sheet/mineral/uranium(null)
component_parts += new /obj/item/stack/sheet/mineral/uranium(null)
component_parts += new /obj/item/stack/sheet/mineral/uranium(null)
component_parts += new /obj/item/stack/sheet/mineral/plasma(null)
component_parts += new /obj/item/stack/sheet/mineral/plasma(null)
component_parts += new /obj/item/stack/sheet/mineral/plasma(null)
component_parts += new /obj/item/stack/sheet/mineral/plasma(null)
component_parts += new /obj/item/stack/sheet/mineral/plasma(null)
component_parts += new /obj/item/stock_parts/capacitor/quadratic(null)
component_parts += new /obj/item/stock_parts/micro_laser/quadultra(null)
RefreshParts()
// Void Core, power source for Abductor ships and bases.
// Provides a lot of power, but tends to explode when mistreated.
code/modules/power/supermatter/supermatter.dm
+9 -2
View File
@@ -928,8 +928,15 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
var/mob/living/user = AM
if(user.status_flags & GODMODE)
return
message_admins("[src] has consumed [key_name_admin(user)] [ADMIN_JMP(src)].")
investigate_log("has consumed [key_name(user)].", INVESTIGATE_SUPERMATTER)
var/add
if(user.mind?.assigned_role == "Clown")
var/denergy = rand(-1000, 1000)
var/ddamage = rand(-150, clamp(150, 0, (explosion_point - damage) + 150))
power += denergy
damage += ddamage
add = ", adding [denergy] energy and [ddamage] damage to the crystal"
message_admins("[src] has consumed [key_name_admin(user)] [ADMIN_JMP(src)][add].")
investigate_log("has consumed [key_name(user)][add].", INVESTIGATE_SUPERMATTER)
user.dust(force = TRUE)
if(power_changes)
matter_power += 200