Merge pull request #8848 from Cyantime/spaceweirdness

Remove gravity from debris field and rogue mining zones
This commit is contained in:
Novacat
2020-11-14 01:48:41 -05:00
committed by Chompstation Bot
parent 2fda5bc91f
commit 49ef2d2ee9
54 changed files with 28947 additions and 23555 deletions
+12
View File
@@ -1,3 +1,15 @@
/obj/machinery/power/smes/batteryrack/mapped
var/cell_type = /obj/item/weapon/cell/apc
var/cell_number = 3
/obj/machinery/power/smes/batteryrack/mapped/Initialize()
. = ..()
for(var/i = 1 to cell_number)
if(i > max_cells)
break
var/obj/item/weapon/cell/newcell = new cell_type(src.loc)
insert_cell(newcell)
/obj/item/weapon/module/power_control/attackby(var/obj/item/I, var/mob/user)
if(I.is_multitool())
to_chat(user, SPAN_NOTICE("You begin tweaking the power control circuits to support a power cell rack."))
+5 -1
View File
@@ -127,6 +127,8 @@
rm_controller.dbg("ZM(pa): The asteroid has [A.map.len] X-lists.")
var/list/changedturfs = list()
for(var/Ix=1, Ix <= A.map.len, Ix++)
var/list/curr_x = A.map[Ix]
rm_controller.dbg("ZM(pa): Now doing X:[Ix] which has [curr_x.len] Y-lists.")
@@ -153,15 +155,17 @@
rm_controller.dbg("ZM(pa): Replacing [P.type] with [T].")
var/turf/newturf = P.ChangeTurf(T)
changedturfs += newturf
switch(newturf.type)
if(/turf/simulated/mineral/vacuum)
place_resources(newturf)
newturf.update_icon(1)
else //Anything not a turf
rm_controller.dbg("ZM(pa): Creating [T].")
new T(spot)
for(var/turf/T in changedturfs)
T.update_icon(1)
/datum/rogue/zonemaster/proc/place_resources(var/turf/simulated/mineral/M)
#define XENOARCH_SPAWN_CHANCE 0.3