Merge pull request #590 from ArchieBeepBoop/radiationfixes

Radiation runtime fix, collector balance tweak, Machinery Alt Click, jukeboxes finally work, turrets no longer target megafauna, etc
This commit is contained in:
QuoteFox
2020-10-16 12:32:49 +01:00
committed by GitHub
22 changed files with 189 additions and 119 deletions
+1 -1
View File
@@ -456,7 +456,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
if(!SSmapping.station_room_templates[t])
log_world("Station room spawner placed at ([T.x], [T.y], [T.z]) has invalid ruin name of \"[t]\" in its list")
templates -= t
template_name = pickweight(templates)
template_name = pickweightAllowZero(templates) // did you know: pickweightAllowZero is the one that DISALLOWS zero? fun fact.
if(!template_name)
GLOB.stationroom_landmarks -= src
qdel(src)
@@ -15,6 +15,10 @@
/obj/item/stock_parts/manipulator = 1,
/obj/item/stock_parts/capacitor = 1)
/obj/item/circuitboard/machine/sleeper/syndie
name = "Syndicate Sleeper (Machine Board)"
build_path = /obj/machinery/sleeper/syndie
/obj/item/circuitboard/machine/vr_sleeper
name = "VR Sleeper (Machine Board)"
build_path = /obj/machinery/vr_sleeper