1)
+ gridLines.Cut(1, leadingBlanks) // Remove all leading blank lines.
- //fill the current square using the model map
- xcrd=0
+ if(!gridLines.len) // Skip it if only blank lines exist.
+ continue
- for(var/mpos in 1 to x_depth step key_len)
- xcrd++
- var/model_key = copytext(grid_line,mpos,mpos+key_len)
- parse_grid(grid_models[model_key], xcrd + x_offset, ycrd + y_offset, zcrd + z_offset, do_sleep)
+ if(gridLines.len && gridLines[gridLines.len] == "")
+ gridLines.Cut(gridLines.len) // Remove only one blank line at the end.
- //reached end of current map
- if(gpos+x_depth+1>z_depth)
- break
+ bounds[MAP_MINY] = min(bounds[MAP_MINY], ycrd)
+ ycrd += gridLines.len - 1 // Start at the top and work down
- ycrd--
- if(do_sleep)
- sleep(-1)
+ if(!cropMap && ycrd > world.maxy)
+ if(!measureOnly)
+ world.maxy = ycrd // Expand Y here. X is expanded in the loop below
+ bounds[MAP_MAXY] = max(bounds[MAP_MAXY], ycrd)
+ else
+ bounds[MAP_MAXY] = max(bounds[MAP_MAXY], min(ycrd, world.maxy))
- //reached End Of File
- if(findtext(tfile,quote+"}",zpos,0)+2==tfile_len)
- break
- if(do_sleep)
- sleep(-1)
+ var/maxx = xcrdStart
+ if(measureOnly)
+ for(var/line in gridLines)
+ maxx = max(maxx, xcrdStart + length(line) / key_len - 1)
+ else
+ for(var/line in gridLines)
+ if(ycrd <= world.maxy && ycrd >= 1)
+ xcrd = xcrdStart
+ for(var/tpos = 1 to length(line) - key_len + 1 step key_len)
+ if(xcrd > world.maxx)
+ if(cropMap)
+ break
+ else
+ world.maxx = xcrd
+
+ if(xcrd >= 1)
+ var/model_key = copytext(line, tpos, tpos + key_len)
+ if(!grid_models[model_key])
+ throw EXCEPTION("Undefined model key in DMM: [model_key]. Map file: [fname].")
+ parse_grid(grid_models[model_key], xcrd, ycrd, zcrd, LM)
+ // After this call, it is NOT safe to reference `dmmRegex` without another call to
+ // "Find" - we might've hit a map loader here and changed its state
+ CHECK_TICK
+
+ maxx = max(maxx, xcrd)
+ ++xcrd
+ --ycrd
+
+ bounds[MAP_MAXX] = max(bounds[MAP_MAXX], cropMap ? min(maxx, world.maxx) : maxx)
+
+ CHECK_TICK
+ catch(var/exception/e)
+ _preloader.reset()
+ throw e
+
+ _preloader.reset()
+ log_debug("Loaded map in [stop_watch(watch)]s.")
+ qdel(LM)
+ if(bounds[MAP_MINX] == 1.#INF) // Shouldn't need to check every item
+ log_debug("Min x: bounds[MAP_MINX]")
+ log_debug("Min y: bounds[MAP_MINY]")
+ log_debug("Min z: bounds[MAP_MINZ]")
+ log_debug("Max x: bounds[MAP_MAXX]")
+ log_debug("Max y: bounds[MAP_MAXY]")
+ log_debug("Max z: bounds[MAP_MAXZ]")
+ return null
+ else
+ if(!measureOnly)
+ for(var/t in block(locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]), locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ])))
+ var/turf/T = t
+ //we do this after we load everything in. if we don't; we'll have weird atmos bugs regarding atmos adjacent turfs
+ T.AfterChange(1,keep_cabling = TRUE)
+ return bounds
/**
* Fill a given tile with its area/turf/objects/mobs
@@ -115,48 +196,60 @@ var/global/dmm_suite/preloader/_preloader = new
* 4) Instanciates the atom with its variables
*
*/
-/dmm_suite/proc/parse_grid(model as text, xcrd as num, ycrd as num, zcrd as num, do_sleep = 1)
+/dmm_suite/proc/parse_grid(model as text,xcrd as num,ycrd as num,zcrd as num, dmm_suite/loaded_map/LM)
/*Method parse_grid()
- Accepts a text string containing a comma separated list of type paths of the
same construction as those contained in a .dmm file, and instantiates them.
*/
- var/list/members = list()//will contain all members (paths) in model (in our example : /turf/unsimulated/wall and /area/mine/explored)
- var/list/members_attributes = list()//will contain lists filled with corresponding variables, if any (in our example : list(icon_state = "rock") and list())
+ var/list/members //will contain all members (paths) in model (in our example : /turf/unsimulated/wall and /area/mine/explored)
+ var/list/members_attributes //will contain lists filled with corresponding variables, if any (in our example : list(icon_state = "rock") and list())
+ var/list/cached = modelCache[model]
+ var/index
+ if(cached)
+ members = cached[1]
+ members_attributes = cached[2]
+ else
+ /////////////////////////////////////////////////////////
+ //Constructing members and corresponding variables lists
+ ////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////
- //Constructing members and corresponding variables lists
- ////////////////////////////////////////////////////////
+ members = list()
+ members_attributes = list()
+ index = 1
- var/index=1
- var/old_position = 1
- var/dpos
+ var/old_position = 1
+ var/dpos
- do
- //finding next member (e.g /turf/unsimulated/wall{icon_state = "rock"} or /area/mine/explored)
- dpos= find_next_delimiter_position(model,old_position,",","{","}")//find next delimiter (comma here) that's not within {...}
+ do
+ //finding next member (e.g /turf/unsimulated/wall{icon_state = "rock"} or /area/mine/explored)
+ dpos = find_next_delimiter_position(model, old_position, ",", "{", "}") //find next delimiter (comma here) that's not within {...}
- var/full_def = copytext(model,old_position,dpos)//full definition, e.g : /obj/foo/bar{variables=derp}
- var/atom_def = text2path(copytext(full_def,1,findtext(full_def,"{")))//path definition, e.g /obj/foo/bar
- members.Add(atom_def)
- old_position = dpos + 1
+ var/full_def = trim_text(copytext(model, old_position, dpos)) //full definition, e.g : /obj/foo/bar{variables=derp}
+ var/variables_start = findtext(full_def, "{")
+ var/atom_def = text2path(trim_text(copytext(full_def, 1, variables_start))) //path definition, e.g /obj/foo/bar
+ old_position = dpos + 1
- //transform the variables in text format into a list (e.g {var1="derp"; var2; var3=7} => list(var1="derp", var2, var3=7))
- var/list/fields = list()
+ if(!atom_def) // Skip the item if the path does not exist. Fix your crap, mappers!
+ continue
+ members.Add(atom_def)
- var/variables_start = findtext(full_def,"{")
- if(variables_start)//if there's any variable
- full_def = copytext(full_def,variables_start+1,length(full_def))//removing the last '}'
- fields = readlist(full_def, ";")
+ //transform the variables in text format into a list (e.g {var1="derp"; var2; var3=7} => list(var1="derp", var2, var3=7))
+ var/list/fields = list()
- //then fill the members_attributes list with the corresponding variables
- members_attributes.len++
- members_attributes[index++] = fields
+ if(variables_start)//if there's any variable
+ full_def = copytext(full_def,variables_start+1,length(full_def))//removing the last '}'
+ fields = readlist(full_def, ";")
- if(do_sleep)
- sleep(-1)
- while(dpos != 0)
+ //then fill the members_attributes list with the corresponding variables
+ members_attributes.len++
+ members_attributes[index++] = fields
+
+ CHECK_TICK
+ while(dpos != 0)
+
+ modelCache[model] = list(members, members_attributes)
////////////////
@@ -165,24 +258,25 @@ var/global/dmm_suite/preloader/_preloader = new
//The next part of the code assumes there's ALWAYS an /area AND a /turf on a given tile
- //in case of multiples turfs on one tile,
- //will contains the images of all underlying turfs, to simulate the DMM multiple tiles piling
- var/list/turfs_underlays = list()
-
//first instance the /area and remove it from the members list
index = members.len
+
+ var/turf/crds = locate(xcrd,ycrd,zcrd)
if(members[index] != /area/template_noop)
+ // We assume `members[index]` is an area path, as above, yes? I will operate
+ // on that assumption.
+ if(!ispath(members[index], /area))
+ throw EXCEPTION("Oh no, I thought this was an area!")
+
var/atom/instance
_preloader.setup(members_attributes[index])//preloader for assigning set variables on atom creation
+ instance = LM.area_path_to_real_area(members[index])
- instance = locate(members[index])
- var/turf/crds = locate(xcrd,ycrd,zcrd)
if(crds)
instance.contents.Add(crds)
if(use_preloader && instance)
_preloader.load(instance)
- members.Remove(members[index])
//then instance the /turf and, if multiple tiles are presents, simulates the DMM underlays piling effect
@@ -198,18 +292,20 @@ var/global/dmm_suite/preloader/_preloader = new
if(T)
//if others /turf are presents, simulates the underlays piling effect
index = first_turf_index + 1
- while(index <= members.len)
- turfs_underlays.Insert(1,image(T.icon,null,T.icon_state,T.layer,T.dir))//add the current turf image to the underlays list
- var/turf/UT = instance_atom(members[index],members_attributes[index],xcrd,ycrd,zcrd)//instance new turf
- add_underlying_turf(UT,T,turfs_underlays)//simulates the DMM piling effect
- T = UT
+ while(index <= members.len - 1) // Last item is an /area
+ var/underlay
+ if(istype(T, /turf)) // I blame this on the stupid clown who coded the BYOND map editor
+ underlay = T.appearance
+ T = instance_atom(members[index],members_attributes[index],xcrd,ycrd,zcrd)//instance new turf
+ if(ispath(members[index],/turf))
+ T.underlays += underlay
+
index++
//finally instance all remainings objects/mobs
- for(index in 1 to first_turf_index - 1)
+ for(index in 1 to first_turf_index-1)
instance_atom(members[index],members_attributes[index],xcrd,ycrd,zcrd)
- if(do_sleep)
- sleep(-1)
+ CHECK_TICK
////////////////
//Helpers procs
@@ -222,7 +318,13 @@ var/global/dmm_suite/preloader/_preloader = new
var/turf/T = locate(x,y,z)
if(T)
- instance = new path (T)//first preloader pass
+ if(ispath(path, /turf))
+ T.ChangeTurf(path, 1, 0)
+ instance = T
+ else if(ispath(path, /area))
+
+ else
+ instance = new path (T)//first preloader pass
if(use_preloader && instance)//second preloader pass, for those atoms that don't ..() in New()
_preloader.load(instance)
@@ -232,16 +334,11 @@ var/global/dmm_suite/preloader/_preloader = new
//text trimming (both directions) helper proc
//optionally removes quotes before and after the text (for variable name)
/dmm_suite/proc/trim_text(what as text,trim_quotes=0)
- while(length(what) && (findtext(what," ",1,2)))
- what=copytext(what,2,0)
- while(length(what) && (findtext(what," ",length(what),0)))
- what=copytext(what,1,length(what))
if(trim_quotes)
- while(length(what) && (findtext(what,quote,1,2)))
- what=copytext(what,2,0)
- while(length(what) && (findtext(what,quote,length(what),0)))
- what=copytext(what,1,length(what))
- return what
+ return trimQuotesRegex.Replace(what, "")
+ else
+ return trimRegex.Replace(what, "")
+
//find the position of the next delimiter,skipping whatever is comprised between opening_escape and closing_escape
//returns 0 if reached the last delimiter
@@ -313,14 +410,6 @@ var/global/dmm_suite/preloader/_preloader = new
return to_return
-//simulates the DM multiple turfs on one tile underlaying
-/dmm_suite/proc/add_underlying_turf(turf/placed,turf/underturf, list/turfs_underlays)
- if(underturf.density)
- placed.density = 1
- if(underturf.opacity)
- placed.opacity = 1
- placed.underlays += turfs_underlays
-
//atom creation method that preloads variables at creation
/atom/New()
if(use_preloader && (src.type == _preloader.target_path))//in case the instanciated atom is creating other atoms in New()
@@ -336,6 +425,7 @@ var/global/dmm_suite/preloader/_preloader = new
//Preloader datum
//////////////////
+// This ain't re-entrant, but we had this before the maploader update
/dmm_suite/preloader
parent_type = /datum
var/list/attributes
@@ -349,11 +439,41 @@ var/global/dmm_suite/preloader/_preloader = new
/dmm_suite/preloader/proc/load(atom/what)
for(var/attribute in attributes)
- what.vars[attribute] = attributes[attribute]
+ var/value = attributes[attribute]
+ if(islist(value))
+ value = deepCopyList(value)
+ what.vars[attribute] = value
use_preloader = FALSE
+// If the map loader fails, make this safe
+/dmm_suite/preloader/proc/reset()
+ use_preloader = FALSE
+ attributes = list()
+ target_path = null
+
+// A datum for use within the context of loading a single map,
+// so that one can have separate "unpowered" areas for ruins or whatever,
+// yet have a single area type for use of mapping, instead of creating
+// a new area type for each new ruin
+/dmm_suite/loaded_map
+ parent_type = /datum
+ var/list/area_list = list()
+ var/index = 1 // To store the state of the regex
+
+/dmm_suite/loaded_map/proc/area_path_to_real_area(area/A)
+ if(!ispath(A, /area))
+ throw EXCEPTION("Wrong argument to `area_path_to_real_area`")
+
+ if(!(A in area_list))
+ if(initial(A.there_can_be_many))
+ area_list[A] = new A
+ else
+ area_list[A] = locate(A)
+
+ return area_list[A]
+
/area/template_noop
name = "Area Passthrough"
/turf/template_noop
- name = "Turf Passthrough"
\ No newline at end of file
+ name = "Turf Passthrough"
diff --git a/code/modules/awaymissions/maploader/swapmaps.dm b/code/modules/awaymissions/maploader/swapmaps.dm
index 8dc9f9f6c99..7115cfcbf13 100644
--- a/code/modules/awaymissions/maploader/swapmaps.dm
+++ b/code/modules/awaymissions/maploader/swapmaps.dm
@@ -326,7 +326,7 @@ swapmap
x2+=x1-1
y2+=y1-1
z2+=z1-1
- world.maxz=max(z2,world.maxz) // stretch z if necessary
+ zlevels.increase_max_zlevel_to(z2) // stretch z if necessary
if(!ischunk)
swapmaps_loaded[src]=null
swapmaps_byname[id]=src
@@ -373,7 +373,7 @@ swapmap
mz=max(mz,M.z2)
world.maxx=mx
world.maxy=my
- world.maxz=mz
+ zlevels.cut_levels_downto(mz)
// save and delete
proc/Unload()
diff --git a/code/modules/awaymissions/mission_code/spacehotel.dm b/code/modules/awaymissions/mission_code/spacehotel.dm
index c4820db97ec..b7670737193 100644
--- a/code/modules/awaymissions/mission_code/spacehotel.dm
+++ b/code/modules/awaymissions/mission_code/spacehotel.dm
@@ -54,9 +54,8 @@
name = "space hotel pamphlet"
info = "Welcome to Deep Space Hotel 419!
Thank you for choosing our hotel. Simply hand your credit or debit card to the concierge and get your room key! To check out, hand your credit card back.Conditions:
- The hotel is not responsible for any losses due to time or space anomalies.
- The hotel is not responsible for events that occur outside of the hotel station, including, but not limited to, events that occur inside of dimensional pockets.
- The hotel is not responsible for overcharging your account.
- The hotel is not responsible for missing persons.
- The hotel is not responsible for mind-altering effects due to drugs, magic, demons, or space worms.
"
-/obj/effect/landmark/map_loader/hotel_room/New()
+/obj/effect/landmark/map_loader/hotel_room/initialize()
..()
-
// load and randomly assign rooms
var/global/list/south_room_templates = list()
var/global/list/north_room_templates = list()
@@ -65,26 +64,27 @@
if(!loaded)
loaded = 1
for(var/map in flist(path))
- var/datum/map_template/T = new(path = "[path][map]", rename = "[map]")
- if(copytext(map, 1, 3) == "n_")
- north_room_templates += T
- else if(copytext(map, 1, 3) == "s_")
- south_room_templates += T
- else
- // omnidirectional rooms are randomly assigned
- if(prob(50))
+ if(cmptext(copytext(map, length(map) - 3), ".dmm"))
+ var/datum/map_template/T = new(path = "[path][map]", rename = "[map]")
+ if(copytext(map, 1, 3) == "n_")
north_room_templates += T
- else
+ else if(copytext(map, 1, 3) == "s_")
south_room_templates += T
+ else
+ // omnidirectional rooms are randomly assigned
+ if(prob(50))
+ north_room_templates += T
+ else
+ south_room_templates += T
var/datum/map_template/M = safepick(dir == NORTH ? north_room_templates : south_room_templates)
if(M)
template = M
- load(M)
if(dir == NORTH)
north_room_templates -= M
else
south_room_templates -= M
+ load(M)
// The door to a hotel room, but also metadata for the room itself
/obj/machinery/door/unpowered/hotel_door
@@ -305,4 +305,4 @@
S.retal_target = target
S.retal = 1
-#undef CHECKOUT_TIME
\ No newline at end of file
+#undef CHECKOUT_TIME
diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm
index 33c42950345..7fff68cf031 100644
--- a/code/modules/awaymissions/zlevel.dm
+++ b/code/modules/awaymissions/zlevel.dm
@@ -1,14 +1,27 @@
+var/global/list/potentialRandomZlevels = generateMapList(filename = "config/away_mission_config.txt")
+
+// Call this before you remove the last dirt on a z level - that way, all objects
+// will have proper atmos and other important enviro things
/proc/late_setup_level(turfs, smoothTurfs)
+ var/total_timer = start_watch()
+ var/subtimer = start_watch()
if(!smoothTurfs)
smoothTurfs = turfs
+ log_debug("Setting up atmos")
if(air_master)
air_master.setup_allturfs(turfs)
+ log_debug("\tTook [stop_watch(subtimer)]s")
+
+ subtimer = start_watch()
+ log_debug("Initializing lighting")
for(var/turf/T in turfs)
if(T.dynamic_lighting)
T.lighting_build_overlays()
- for(var/obj/structure/cable/PC in T)
- makepowernet_for(PC)
+ log_debug("\tTook [stop_watch(subtimer)]s")
+
+ subtimer = start_watch()
+ log_debug("Smoothing tiles")
for(var/turf/T in smoothTurfs)
if(T.smooth)
smooth_icon(T)
@@ -16,20 +29,95 @@
var/atom/A = R
if(A.smooth)
smooth_icon(A)
+ if(istype(T, /turf/simulated/mineral)) // For the listening post, among other maps
+ var/turf/simulated/mineral/MT = T
+ MT.add_edges()
+ log_debug("\tTook [stop_watch(subtimer)]s")
+ log_debug("Late setup finished - took [stop_watch(total_timer)]s")
+
+/proc/empty_rect(low_x,low_y, hi_x,hi_y, z)
+ var/timer = start_watch()
+ log_debug("Emptying region: ([low_x], [low_y]) to ([hi_x], [hi_y]) on z '[z]'")
+ empty_region(block(locate(low_x, low_y, z), locate(hi_x, hi_y, z)))
+ log_debug("Took [stop_watch(timer)]s")
+
+/proc/empty_region(list/turfs)
+ for(var/thing in turfs)
+ var/turf/T = thing
+ for(var/otherthing in T)
+ qdel(otherthing)
+ T.ChangeTurf(/turf/space)
/proc/createRandomZlevel()
if(awaydestinations.len) //crude, but it saves another var!
return
- var/list/potentialRandomZlevels = list()
- log_startup_progress("Searching for away missions...")
- var/list/Lines
- if(fexists("config/away_mission_config.txt"))
- Lines = file2list("config/away_mission_config.txt")
- else
- Lines = file2list("config/example/away_mission_config.txt")
+ if(potentialRandomZlevels && potentialRandomZlevels.len)
+ var/watch = start_watch()
+ log_startup_progress("Loading away mission...")
- if(!Lines.len) return
+ var/map = pick(potentialRandomZlevels)
+ var/file = file(map)
+ if(isfile(file))
+ var/zlev = zlevels.add_new_zlevel()
+ zlevels.add_dirt(zlev)
+ maploader.load_map(file, z_offset = zlev)
+ late_setup_level(block(locate(1, 1, zlev), locate(world.maxx, world.maxy, zlev)))
+ zlevels.remove_dirt(zlev)
+ log_to_dd(" Away mission loaded: [map]")
+
+ //map_transition_config.Add(AWAY_MISSION_LIST)
+
+ for(var/obj/effect/landmark/L in landmarks_list)
+ if(L.name != "awaystart")
+ continue
+ awaydestinations.Add(L)
+
+ log_startup_progress(" Away mission loaded in [stop_watch(watch)]s.")
+
+ else
+ log_startup_progress(" No away missions found.")
+ return
+
+/proc/createALLZlevels()
+ if(awaydestinations.len) //crude, but it saves another var!
+ return
+
+ if(potentialRandomZlevels && potentialRandomZlevels.len)
+ var/watch = start_watch()
+ log_startup_progress("Loading away missions...")
+
+ for(var/map in potentialRandomZlevels)
+ var/file = file(map)
+ if(isfile(file))
+ log_startup_progress("Loading away mission: [map]")
+ var/zlev = zlevels.add_new_zlevel()
+ zlevels.add_dirt(zlev)
+ maploader.load_map(file, z_offset = zlev)
+ late_setup_level(block(locate(1, 1, zlev), locate(world.maxx, world.maxy, zlev)))
+ zlevels.remove_dirt(zlev)
+ log_to_dd(" Away mission loaded: [map]")
+
+ //map_transition_config.Add(AWAY_MISSION_LIST)
+
+ for(var/obj/effect/landmark/L in landmarks_list)
+ if(L.name != "awaystart")
+ continue
+ awaydestinations.Add(L)
+
+ log_startup_progress(" Away mission loaded in [stop_watch(watch)]s.")
+ watch = start_watch()
+
+ else
+ log_startup_progress(" No away missions found.")
+ return
+
+/proc/generateMapList(filename)
+ var/list/potentialMaps = list()
+ var/list/Lines = file2list(filename)
+
+ if(!Lines.len)
+ return
for(var/t in Lines)
if(!t)
continue
@@ -42,38 +130,87 @@
var/pos = findtext(t, " ")
var/name = null
- // var/value = null
if(pos)
name = lowertext(copytext(t, 1, pos))
- // value = copytext(t, pos + 1)
+
else
name = lowertext(t)
if(!name)
continue
- potentialRandomZlevels.Add(t)
+ potentialMaps.Add(t)
+
+ return potentialMaps
- if(potentialRandomZlevels.len)
- var/watch = start_watch()
- log_startup_progress("Loading away mission...")
+/proc/seedRuins(z_level = 1, budget = 0, whitelist = /area/space, list/potentialRuins = space_ruins_templates)
+ var/overall_sanity = 100
+ var/ruins = potentialRuins.Copy()
+ var/initialbudget = budget
+ var/watch = start_watch()
- var/map = pick(potentialRandomZlevels)
- var/file = file(map)
- if(isfile(file))
- maploader.load_map(file, do_sleep = 0)
- late_setup_level(block(locate(1, 1, world.maxz), locate(world.maxx, world.maxy, world.maxz)))
- log_to_dd(" Away mission loaded: [map]")
+ log_startup_progress("Loading ruins...")
- for(var/obj/effect/landmark/L in landmarks_list)
- if(L.name != "awaystart")
+ while(budget > 0 && overall_sanity > 0)
+ // Pick a ruin
+ var/datum/map_template/ruin/ruin = ruins[pick(ruins)]
+ // Can we afford it
+ if(ruin.cost > budget)
+ overall_sanity--
+ continue
+ // If so, try to place it
+ var/sanity = 100
+ // And if we can't fit it anywhere, give up, try again
+
+ while(sanity > 0)
+ sanity--
+ var/turf/T = locate(rand(25, world.maxx - 25), rand(25, world.maxy - 25), z_level)
+ var/valid = 1
+
+ for(var/turf/check in ruin.get_affected_turfs(T,1))
+ var/area/new_area = get_area(check)
+ if(!(istype(new_area, whitelist)))
+ valid = 0
+ break
+
+ if(!valid)
continue
- awaydestinations.Add(L)
- log_startup_progress(" Away mission loaded in [stop_watch(watch)]s.")
+ log_to_dd(" Ruin \"[ruin.name]\" loaded in [stop_watch(watch)]s at ([T.x], [T.y], [T.z]).")
- else
- log_startup_progress(" No away missions found.")
- return
\ No newline at end of file
+ var/obj/effect/ruin_loader/R = new /obj/effect/ruin_loader(T)
+ R.Load(ruins,ruin)
+ budget -= ruin.cost
+ if(!ruin.allow_duplicates)
+ ruins -= ruin.name
+ break
+
+ to_chat(world, " Loaded ruins. Or not.") //So the players don't know if we loaded ruins, but we do have a message
+
+ if(initialbudget == budget) //Kill me
+ log_to_dd(" No ruins loaded.")
+
+
+/obj/effect/ruin_loader
+ name = "random ruin"
+ desc = "If you got lucky enough to see this..."
+ icon = 'icons/obj/weapons.dmi'
+ icon_state = "syndballoon"
+ invisibility = 0
+
+/obj/effect/ruin_loader/proc/Load(list/potentialRuins = space_ruins_templates, datum/map_template/template = null)
+ var/list/possible_ruins = list()
+ for(var/A in potentialRuins)
+ var/datum/map_template/T = potentialRuins[A]
+ if(!T.loaded)
+ possible_ruins += T
+ if(!template && possible_ruins.len)
+ template = safepick(possible_ruins)
+ if(!template)
+ return 0
+ template.load(get_turf(src),centered = 1)
+ template.loaded++
+ qdel(src)
+ return 1
diff --git a/code/modules/awaymissions/zvis.dm b/code/modules/awaymissions/zvis.dm
index 069d733c7e4..06d60f3389f 100644
--- a/code/modules/awaymissions/zvis.dm
+++ b/code/modules/awaymissions/zvis.dm
@@ -21,6 +21,9 @@
/obj/effect/levelref/New()
..()
levels += src
+
+/obj/effect/levelref/initialize()
+ ..()
for(var/obj/effect/levelref/O in levels)
if(id == O.id && O != src)
other = O
@@ -104,7 +107,7 @@
/turf/unsimulated/floor/upperlevel/New()
..()
var/obj/effect/levelref/R = locate() in get_area(src)
- if(R)
+ if(R && R.other)
init(R)
/turf/unsimulated/floor/upperlevel/Destroy()
@@ -159,6 +162,8 @@
..()
portals += src
+/obj/effect/view_portal/initialize()
+ ..()
if(id)
for(var/obj/effect/view_portal/O in portals)
if(id == O.id && O != src && can_link(O))
@@ -361,4 +366,4 @@
screen_loc = "CENTER[ox >= 0 ? "+" : ""][ox],CENTER[oy >= 0 ? "+" : ""][oy]"
/obj/effect/view_portal_dummy/attack_ghost(mob/user)
- owner.attack_ghost(user)
\ No newline at end of file
+ owner.attack_ghost(user)
diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm
index 9948bbcc557..f51f83cafb2 100644
--- a/code/modules/client/asset_cache.dm
+++ b/code/modules/client/asset_cache.dm
@@ -260,3 +260,18 @@ proc/getFilesSlow(var/client/client, var/list/files, var/register_asset = TRUE)
send_asset_list(client, uncommon)
send_asset_list(client, common)
+
+/datum/asset/chem_master
+ var/assets = list()
+ var/verify = FALSE
+
+/datum/asset/chem_master/register()
+ for(var/i = 1 to 20)
+ assets["pill[i].png"] = icon('icons/obj/chemical.dmi', "pill[i]")
+ for(var/i = 1 to 20)
+ assets["bottle[i].png"] = icon('icons/obj/chemical.dmi', "bottle[i]")
+ for(var/asset_name in assets)
+ register_asset(asset_name, assets[asset_name])
+
+/datum/asset/chem_master/send(client)
+ send_asset_list(client,assets,verify)
\ No newline at end of file
diff --git a/code/modules/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm
index e392f8a4087..b86d5c44ed1 100644
--- a/code/modules/client/preference/loadout/loadout_accessories.dm
+++ b/code/modules/client/preference/loadout/loadout_accessories.dm
@@ -61,4 +61,35 @@
/datum/gear/accessory/scarf/stripedblue
display_name = "scarf, striped blue"
- path = /obj/item/clothing/accessory/stripedbluescarf
\ No newline at end of file
+ path = /obj/item/clothing/accessory/stripedbluescarf
+
+/datum/gear/accessory/holobadge
+ display_name = "holobadge, pin"
+ path = /obj/item/clothing/accessory/holobadge
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/accessory/holobadge_n
+ display_name = "holobadge, cord"
+ path = /obj/item/clothing/accessory/holobadge/cord
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/accessory/tieblue
+ display_name = "tie, blue"
+ path = /obj/item/clothing/accessory/blue
+
+/datum/gear/accessory/tiered
+ display_name = "tie, red"
+ path = /obj/item/clothing/accessory/red
+
+/datum/gear/accessory/tieblack
+ display_name = "tie, black"
+ path = /obj/item/clothing/accessory/black
+
+/datum/gear/accessory/tiehorrible
+ display_name = "tie, vomit green"
+ path = /obj/item/clothing/accessory/horrible
+
+/datum/gear/accessory/stethoscope
+ display_name = "stethoscope"
+ path = /obj/item/clothing/accessory/stethoscope
+ allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Brig Physician")
diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm
index 9266dc6ebf0..40d581d030e 100644
--- a/code/modules/client/preference/loadout/loadout_general.dm
+++ b/code/modules/client/preference/loadout/loadout_general.dm
@@ -1,3 +1,40 @@
/datum/gear/dice
- display_name = "d20"
- path = /obj/item/weapon/dice/d20
\ No newline at end of file
+ display_name = "a d20"
+ path = /obj/item/weapon/dice/d20
+
+/datum/gear/uplift
+ display_name = "a pack of Uplifts"
+ path = /obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift
+
+/datum/gear/robust
+ display_name = "a pack of Robusts"
+ path = /obj/item/weapon/storage/fancy/cigarettes/cigpack_robust
+
+/datum/gear/carp
+ display_name = "a pack of Carps"
+ path = /obj/item/weapon/storage/fancy/cigarettes/cigpack_carp
+
+/datum/gear/midori
+ display_name = "a pack of Midoris"
+ path = /obj/item/weapon/storage/fancy/cigarettes/cigpack_midori
+
+/datum/gear/lighter
+ display_name = "a cheap lighter"
+ path = /obj/item/weapon/lighter
+
+/datum/gear/rock
+ display_name = "a pet rock"
+ path = /obj/item/toy/pet_rock
+
+/datum/gear/sechud
+ display_name = "a classic security HUD"
+ path = /obj/item/clothing/glasses/hud/security
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/matches
+ display_name = "a box of matches"
+ path = /obj/item/weapon/storage/box/matches
+
+/datum/gear/cards
+ display_name = "a deck of cards"
+ path = /obj/item/toy/cards/deck
diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm
new file mode 100644
index 00000000000..241ebd1fdf6
--- /dev/null
+++ b/code/modules/client/preference/loadout/loadout_hat.dm
@@ -0,0 +1,114 @@
+/datum/gear/hat
+ subtype_path = /datum/gear/hat
+ slot = slot_head
+ sort_category = "Headwear"
+
+/datum/gear/hat/hhat_yellow
+ display_name = "hardhat, yellow"
+ path = /obj/item/clothing/head/hardhat
+ allowed_roles = list("Chief Engineer", "Engineer", "Mechanic", "Life Support Specialist")
+
+/datum/gear/hat/hhat_orange
+ display_name = "hardhat, orange"
+ path = /obj/item/clothing/head/hardhat/orange
+ allowed_roles = list("Chief Engineer", "Engineer", "Mechanic", "Life Support Specialist")
+
+/datum/gear/hat/hhat_blue
+ display_name = "hardhat, blue"
+ path = /obj/item/clothing/head/hardhat/dblue
+ allowed_roles = list("Chief Engineer", "Engineer", "Mechanic", "Life Support Specialist")
+
+/datum/gear/hat/that
+ display_name = "top hat"
+ path = /obj/item/clothing/head/that
+
+/datum/gear/hat/flatcap
+ display_name = "flat cap"
+ path = /obj/item/clothing/head/flatcap
+
+/datum/gear/hat/fez
+ display_name = "fez"
+ path = /obj/item/clothing/head/fez
+
+/datum/gear/hat/bfedora
+ display_name = "fedora, black"
+ path = /obj/item/clothing/head/fedora
+
+/datum/gear/hat/wfedora
+ display_name = "fedora, white"
+ path = /obj/item/clothing/head/fedora/whitefedora
+
+/datum/gear/hat/brfedora
+ display_name = "fedora, brown"
+ path = /obj/item/clothing/head/fedora/brownfedora
+
+/datum/gear/hat/beretsec
+ display_name = "security beret"
+ path = /obj/item/clothing/head/beret/sec
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/hat/capcsec
+ display_name = "security corporate cap"
+ path = /obj/item/clothing/head/soft/sec/corp
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/hat/capsec
+ display_name = "security cap"
+ path = /obj/item/clothing/head/soft/sec
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/hat/capred
+ display_name = "cap, red"
+ path = /obj/item/clothing/head/soft/red
+
+/datum/gear/hat/capblue
+ display_name = "cap, blue"
+ path = /obj/item/clothing/head/soft/blue
+
+/datum/gear/hat/capgreen
+ display_name = "cap, green"
+ path = /obj/item/clothing/head/soft/green
+
+/datum/gear/hat/capblack
+ display_name = "cap, black"
+ path = /obj/item/clothing/head/soft/black
+
+/datum/gear/hat/cappurple
+ display_name = "cap, purple"
+ path = /obj/item/clothing/head/soft/purple
+
+/datum/gear/hat/capwhite
+ display_name = "cap, white"
+ path = /obj/item/clothing/head/soft/mime
+
+/datum/gear/hat/caporange
+ display_name = "cap, orange"
+ path = /obj/item/clothing/head/soft/orange
+
+/datum/gear/hat/capgrey
+ display_name = "cap, grey"
+ path = /obj/item/clothing/head/soft/grey
+
+/datum/gear/hat/capyellow
+ display_name = "cap, yellow"
+ path = /obj/item/clothing/head/soft/yellow
+
+/datum/gear/hat/cowboyhat
+ display_name = "cowboy hat"
+ path = /obj/item/clothing/head/cowboyhat
+
+/datum/gear/hat/beret/purple
+ display_name = "beret, purple"
+ path = /obj/item/clothing/head/beret/purple_normal
+
+/datum/gear/hat/beret/black
+ display_name = "beret, black"
+ path = /obj/item/clothing/head/beret/black
+
+/datum/gear/hat/beret/blue
+ display_name = "beret, blue"
+ path = /obj/item/clothing/head/beret/blue
+
+/datum/gear/hat/beret/red
+ display_name = "beret, red"
+ path = /obj/item/clothing/head/beret
diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm
new file mode 100644
index 00000000000..2da1fddec94
--- /dev/null
+++ b/code/modules/client/preference/loadout/loadout_suit.dm
@@ -0,0 +1,146 @@
+/datum/gear/suit
+ subtype_path = /datum/gear/suit
+ slot = slot_wear_suit
+ sort_category = "External Wear"
+
+//WINTER COATS
+/datum/gear/suit/coat
+ subtype_path = /datum/gear/suit/coat
+ cost = 2
+
+/datum/gear/suit/coat/grey
+ display_name = "winter coat"
+ path = /obj/item/clothing/suit/hooded/wintercoat
+
+/datum/gear/suit/coat/job
+ subtype_path = /datum/gear/suit/coat
+ subtype_cost_overlap = FALSE
+
+/datum/gear/suit/coat/job/sec
+ display_name = "winter coat, security"
+ path = /obj/item/clothing/suit/hooded/wintercoat/security
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/suit/coat/job/captain
+ display_name = "winter coat, captain"
+ path = /obj/item/clothing/suit/hooded/wintercoat/captain
+ allowed_roles = list("Captain")
+
+/datum/gear/suit/coat/job/med
+ display_name = "winter coat, medical"
+ path = /obj/item/clothing/suit/hooded/wintercoat/medical
+ allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Brig Physician")
+
+/datum/gear/suit/coat/job/sci
+ display_name = "winter coat, science"
+ path = /obj/item/clothing/suit/hooded/wintercoat/science
+ allowed_roles = list("Scientist", "Research Director")
+
+/datum/gear/suit/coat/job/engi
+ display_name = "winter coat, engineering"
+ path = /obj/item/clothing/suit/hooded/wintercoat/engineering
+ allowed_roles = list("Chief Engineer", "Engineer", "Mechanic")
+
+/datum/gear/suit/coat/job/atmos
+ display_name = "winter coat, atmospherics"
+ path = /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos
+ allowed_roles = list("Chief Engineer", "Life Support Specialist")
+
+/datum/gear/suit/coat/job/hydro
+ display_name = "winter coat, hydroponics"
+ path = /obj/item/clothing/suit/hooded/wintercoat/hydro
+ allowed_roles = list("Botanist")
+
+/datum/gear/suit/coat/job/cargo
+ display_name = "winter coat, cargo"
+ path = /obj/item/clothing/suit/hooded/wintercoat/cargo
+ allowed_roles = list("Quartermaster", "Cargo Technician")
+
+/datum/gear/suit/coat/job/miner
+ display_name = "winter coat, miner"
+ path = /obj/item/clothing/suit/hooded/wintercoat/miner
+ allowed_roles = list("Miner")
+
+//LABCOATS
+/datum/gear/suit/labcoat_emt
+ display_name = "labcoat, paramedic"
+ path = /obj/item/clothing/suit/storage/labcoat/emt
+ allowed_roles = list("Chief Medical Officer", "Paramedic")
+
+//JACKETS
+/datum/gear/suit/leather_jacket
+ display_name = "leather jacket"
+ path = /obj/item/clothing/suit/jacket/leather
+
+/datum/gear/suit/br_tcoat
+ display_name = "trenchcoat, brown"
+ path = /obj/item/clothing/suit/browntrenchcoat
+
+/datum/gear/suit/bl_tcoat
+ display_name = "trenchcoat, black"
+ path = /obj/item/clothing/suit/blacktrenchcoat
+
+/datum/gear/suit/bomber_jacket
+ display_name = "bomber jacket"
+ path = /obj/item/clothing/suit/jacket
+
+/datum/gear/suit/ol_miljacket
+ display_name = "military jacket, olive"
+ path = /obj/item/clothing/suit/jacket/miljacket
+
+/datum/gear/suit/nv_miljacket
+ display_name = "military jacket, navy"
+ path = /obj/item/clothing/suit/jacket/miljacket/navy
+
+/datum/gear/suit/ds_miljacket
+ display_name = "military jacket, desert"
+ path = /obj/item/clothing/suit/jacket/miljacket/desert
+
+/datum/gear/suit/wh_miljacket
+ display_name = "military jacket, white"
+ path = /obj/item/clothing/suit/jacket/miljacket/white
+
+/datum/gear/suit/secjacket
+ display_name = "security jacket"
+ path = /obj/item/clothing/suit/armor/secjacket
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/suit/poncho
+ display_name = "poncho, classic"
+ path = /obj/item/clothing/suit/poncho
+
+/datum/gear/suit/grponcho
+ display_name = "poncho, green"
+ path = /obj/item/clothing/suit/poncho/green
+
+/datum/gear/suit/rdponcho
+ display_name = "poncho, red"
+ path = /obj/item/clothing/suit/poncho/red
+
+/datum/gear/suit/tphoodie
+ display_name = "hoodie, Tharsis Polytech"
+ path = /obj/item/clothing/suit/hooded/hoodie/tp
+
+/datum/gear/suit/nthoodie
+ display_name = "hoodie, Nanotrasen"
+ path = /obj/item/clothing/suit/hooded/hoodie/nt
+
+/datum/gear/suit/lamhoodie
+ display_name = "hoodie, Lunar Academy of Medicine"
+ path = /obj/item/clothing/suit/hooded/hoodie/lam
+
+/datum/gear/suit/cuthoodie
+ display_name = "hoodie, Canaan University of Technology"
+ path = /obj/item/clothing/suit/hooded/hoodie/cut
+
+/datum/gear/suit/mithoodie
+ display_name = "hoodie, Martian Institute of Technology"
+ path = /obj/item/clothing/suit/hooded/hoodie/mit
+
+/datum/gear/suit/bluehoodie
+ display_name = "hoodie, blue"
+ path = /obj/item/clothing/suit/hooded/hoodie/blue
+
+/datum/gear/suit/blackhoodie
+ display_name = "hoodie, black"
+ path = /obj/item/clothing/suit/hooded/hoodie
diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm
index 826cc7d5838..02cc369fe63 100644
--- a/code/modules/client/preference/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference/loadout/loadout_uniform.dm
@@ -24,7 +24,7 @@
path = /obj/item/clothing/under/blackskirt
/datum/gear/uniform/skirt/job
- cost = 3
+ cost = 2
subtype_path = /datum/gear/uniform/skirt/job
subtype_cost_overlap = FALSE
@@ -96,4 +96,96 @@
/datum/gear/uniform/skirt/job/head_of_security
display_name = "skirt, hos"
path = /obj/item/clothing/under/rank/head_of_security/skirt
- allowed_roles = list("Head of Security")
\ No newline at end of file
+ allowed_roles = list("Head of Security")
+
+/datum/gear/uniform/sec
+ subtype_path = /datum/gear/uniform/sec
+ cost = 2
+
+/datum/gear/uniform/sec/formal
+ display_name = "security uniform, formal"
+ path = /obj/item/clothing/under/rank/security/formal
+ allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")
+
+datum/gear/uniform/secorporate
+ display_name = "security uniform, corporate "
+ path = /obj/item/clothing/under/rank/security/corp
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/uniform/sec/dispatch
+ display_name = "security uniform, dispatch"
+ path = /obj/item/clothing/under/rank/dispatch
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
+
+/datum/gear/uniform/sec/casual
+ display_name = "security uniform, casual"
+ path = /obj/item/clothing/under/rank/security2
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Detective", "Security Pod Pilot")
+
+/datum/gear/uniform/shorts/red
+ display_name = "shorts, red"
+ path = /obj/item/clothing/under/shorts/red
+
+/datum/gear/uniform/shorts/green
+ display_name = "shorts, green"
+ path = /obj/item/clothing/under/shorts/green
+
+/datum/gear/uniform/shorts/blue
+ display_name = "shorts, blue"
+ path = /obj/item/clothing/under/shorts/blue
+
+/datum/gear/uniform/shorts/black
+ display_name = "shorts, black"
+ path = /obj/item/clothing/under/shorts/black
+
+/datum/gear/uniform/shorts/grey
+ display_name = "shorts, grey"
+ path = /obj/item/clothing/under/shorts/grey
+
+/datum/gear/uniform/pants/jeans
+ display_name = "jeans, classic"
+ path = /obj/item/clothing/under/pants/classicjeans
+
+/datum/gear/uniform/pants/mjeans
+ display_name = "jeans, mustang"
+ path = /obj/item/clothing/under/pants/mustangjeans
+
+/datum/gear/uniform/pants/bljeans
+ display_name = "jeans, black"
+ path = /obj/item/clothing/under/pants/blackjeans
+
+/datum/gear/uniform/pants/yfjeans
+ display_name = "jeans, Young Folks"
+ path = /obj/item/clothing/under/pants/youngfolksjeans
+
+/datum/gear/uniform/pants/whitepants
+ display_name = "pants, white"
+ path = /obj/item/clothing/under/pants/white
+
+/datum/gear/uniform/pants/redpants
+ display_name = "pants, red"
+ path = /obj/item/clothing/under/pants/red
+
+/datum/gear/uniform/pants/blackpants
+ display_name = "pants, black"
+ path = /obj/item/clothing/under/pants/black
+
+/datum/gear/uniform/pants/tanpants
+ display_name = "pants, tan"
+ path = /obj/item/clothing/under/pants/tan
+
+/datum/gear/uniform/pants/bluepants
+ display_name = "pants, blue"
+ path = /obj/item/clothing/under/pants/blue
+
+/datum/gear/uniform/pants/trackpants
+ display_name = "trackpants"
+ path = /obj/item/clothing/under/pants/track
+
+/datum/gear/uniform/pants/khakipants
+ display_name = "pants, khaki"
+ path = /obj/item/clothing/under/pants/khaki
+
+/datum/gear/uniform/pants/caopants
+ display_name = "pants, camo"
+ path = /obj/item/clothing/under/pants/camo
diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index ee63e2e3243..e375b09b329 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -1844,10 +1844,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
character.name = character.real_name
character.flavor_text = flavor_text
- if(character.ckey && !jobban_isbanned(character, "Records"))
- character.med_record = med_record
- character.sec_record = sec_record
- character.gen_record = gen_record
+ character.med_record = med_record
+ character.sec_record = sec_record
+ character.gen_record = gen_record
character.change_gender(gender)
character.age = age
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 4c6fed0eec4..25a0833c304 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -114,4 +114,19 @@
prescription_upgradable = 1
/obj/item/clothing/glasses/hud/security/sunglasses/prescription
- prescription = 1
\ No newline at end of file
+ prescription = 1
+
+/obj/item/clothing/glasses/hud/hydroponic
+ name = "Hydroponic HUD"
+ desc = "A heads-up display capable of analyzing the health and status of plants growing in hydro trays and soil."
+ icon_state = "hydroponichud"
+ HUDType = DATA_HUD_HYDROPONIC
+
+/obj/item/clothing/glasses/hud/hydroponic/night
+ name = "Night Vision Hydroponic HUD"
+ desc = "A hydroponic HUD fitted with a light amplifier."
+ icon_state = "hydroponichudnight"
+ item_state = "glasses"
+ darkness_view = 8
+ see_darkness = 0
+ prescription_upgradable = 0
\ No newline at end of file
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 9492b7839ac..7100d459a51 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -116,6 +116,11 @@
desc = "A beret for those who have shown immaculate proficienty in piping. Or plumbing."
icon_state = "beret_atmospherics"
+/obj/item/clothing/head/beret/ce
+ name = "chief engineer beret"
+ desc = "A white beret with the engineering insignia emblazoned on it. Its owner knows what they're doing. Probably."
+ icon_state = "beret_ce"
+
//Medical
/obj/item/clothing/head/surgery
name = "surgical cap"
@@ -137,4 +142,4 @@
/obj/item/clothing/head/surgery/black
desc = "A cap coroners wear during autopsies. Keeps their hair from falling into the cadavers. It is as dark than the coroner's humor."
- icon_state = "surgcap_black"
\ No newline at end of file
+ icon_state = "surgcap_black"
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index dda3f5f902c..6d300c724bd 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -25,6 +25,15 @@
icon_state = "pwig"
item_state = "pwig"
+/obj/item/clothing/head/beret/blue
+ icon_state = "beret_blue"
+
+/obj/item/clothing/head/beret/black
+ icon_state = "beret_black"
+
+/obj/item/clothing/head/beret/purple_normal
+ icon_state = "beret_purple_normal"
+
/obj/item/clothing/head/that
name = "top-hat"
desc = "It's an amish looking hat."
@@ -161,6 +170,12 @@
item_state = "boater_hat"
desc = "Goes well with celery."
+/obj/item/clothing/head/cowboyhat
+ name = "cowboy hat"
+ icon_state = "cowboyhat"
+ item_state = "fedora"
+ desc = "There's a new sheriff in town. Pass the whiskey."
+
/obj/item/clothing/head/fedora
name = "\improper fedora"
icon_state = "fedora"
@@ -363,4 +378,4 @@
name = "bloated human head"
desc = "A horribly bloated and mismatched human head."
icon_state = "lingspacehelmet"
- item_state = "lingspacehelmet"
\ No newline at end of file
+ item_state = "lingspacehelmet"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 3715a134e16..e2b8e01fd54 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -1,4 +1,3 @@
-
/obj/item/clothing/suit/armor
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/device/flashlight/seclite,/obj/item/weapon/melee/classic_baton/telescopic,/obj/item/weapon/kitchen/knife/combat)
body_parts_covered = UPPER_TORSO|LOWER_TORSO
@@ -91,6 +90,20 @@
species_fit = null
sprite_sheets = null
+/obj/item/clothing/suit/armor/secjacket
+ name = "security jacket"
+ desc = "A sturdy black jacket with reinforced fabric. Bears insignia of NT corporate security."
+ icon_state = "secjacket_open"
+ item_state = "hos"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ armor = list(melee = 15, bullet = 10, laser = 15, energy = 5, bomb = 15, bio = 0, rad = 0)
+ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
+ heat_protection = UPPER_TORSO|LOWER_TORSO|ARMS
+ ignore_suitadjust = 0
+ suit_adjusted = 1
+ action_button_name = "Open/Close Jacket"
+ adjust_flavour = "unzip"
+
/obj/item/clothing/suit/armor/hos
name = "armored coat"
desc = "A trench coat enhanced with a special alloy for some protection and style."
diff --git a/code/modules/clothing/suits/hood.dm b/code/modules/clothing/suits/hood.dm
new file mode 100644
index 00000000000..e6d6c91508f
--- /dev/null
+++ b/code/modules/clothing/suits/hood.dm
@@ -0,0 +1,68 @@
+//Hoods for winter coats and chaplain hoodie etc
+
+/obj/item/clothing/suit/hooded
+ action_button_name = "Adjust hood"
+ var/obj/item/clothing/head/hood
+ var/hoodtype = /obj/item/clothing/head/winterhood //so the chaplain hoodie or other hoodies can override this
+
+/obj/item/clothing/suit/hooded/New()
+ MakeHood()
+ verbs -= /obj/item/clothing/suit/verb/openjacket //you can't unbutton those, deal with it
+ ..()
+
+/obj/item/clothing/suit/hooded/Destroy()
+ qdel(hood)
+ return ..()
+
+/obj/item/clothing/suit/hooded/proc/MakeHood()
+ if(!hood)
+ var/obj/item/clothing/head/W = new hoodtype(src)
+ hood = W
+
+/obj/item/clothing/suit/hooded/ui_action_click()
+ ToggleHood()
+
+/obj/item/clothing/suit/hooded/equipped(mob/user, slot)
+ if(slot != slot_wear_suit)
+ RemoveHood()
+ ..()
+
+/obj/item/clothing/suit/hooded/proc/RemoveHood()
+ icon_state = "[initial(icon_state)]"
+ suit_adjusted = 0
+ if(ishuman(hood.loc))
+ var/mob/living/carbon/H = hood.loc
+ H.unEquip(hood, 1)
+ H.update_inv_wear_suit()
+ hood.loc = src
+
+/obj/item/clothing/suit/hooded/dropped()
+ ..()
+ RemoveHood()
+
+/obj/item/clothing/suit/hooded/verb/Hooderize(var/mob/user)
+ set name = "Adjust the hood"
+ set category = "Object"
+ set src in usr
+ if(!isliving(usr))
+ return
+ if(usr.stat)
+ return
+ ToggleHood()
+
+/obj/item/clothing/suit/hooded/proc/ToggleHood()
+ if(!suit_adjusted)
+ if(ishuman(loc))
+ var/mob/living/carbon/human/H = loc
+ if(H.wear_suit != src)
+ to_chat(H,"You must be wearing [src] to put up the hood!")
+ return
+ if(H.head)
+ to_chat(H,"You're already wearing something on your head!")
+ return
+ else if(H.equip_to_slot_if_possible(hood,slot_head,0,0,1))
+ suit_adjusted = 1
+ icon_state = "[initial(icon_state)]_hood"
+ H.update_inv_wear_suit()
+ else
+ RemoveHood()
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 1288d02cbf4..b94be6647bb 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -73,12 +73,13 @@
)
//Chaplain
-/obj/item/clothing/suit/chaplain_hoodie
+/obj/item/clothing/suit/hooded/chaplain_hoodie
name = "chaplain hoodie"
desc = "This suit says to you 'hush'!"
icon_state = "chaplain_hoodie"
item_state = "chaplain_hoodie"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+ hoodtype = /obj/item/clothing/head/chaplain_hood
allowed = list(/obj/item/weapon/storage/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/emergency_oxygen)
species_fit = list("Vox")
sprite_sheets = list(
@@ -86,13 +87,14 @@
)
//Chaplain
-/obj/item/clothing/suit/nun
+/obj/item/clothing/suit/hooded/nun
name = "nun robe"
desc = "Maximum piety in this star system."
icon_state = "nun"
item_state = "nun"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDESHOES|HIDEJUMPSUIT
+ hoodtype = /obj/item/clothing/head/nun_hood
allowed = list(/obj/item/weapon/storage/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/emergency_oxygen)
species_fit = list("Vox")
sprite_sheets = list(
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 6926105541d..71bdd524b8f 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -56,3 +56,9 @@
desc = "A suit that protects against minor chemical spills. Has a black stripe on the shoulder."
icon_state = "labcoat_mort_open"
item_state = "labcoat_mort_open"
+
+/obj/item/clothing/suit/storage/labcoat/emt
+ name = "EMT labcoat"
+ desc = "A comfortable suit for paramedics. Has dark colours."
+ icon_state = "labcoat_emt_open"
+ item_state = "labcoat_emt_open"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index badf323d804..ee7be2644e9 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -2,6 +2,7 @@
* Contains:
* Lasertag
* Costume
+ * Winter Coats
* Misc
*/
@@ -282,11 +283,194 @@
item_state = "lingspacesuit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+/*
+ * Winter Coats
+ */
+
+/obj/item/clothing/suit/hooded/wintercoat
+ name = "winter coat"
+ desc = "A heavy jacket made from 'synthetic' animal furs."
+ icon_state = "wintercoat"
+ item_state = "labcoat"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+ allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/toy, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/lighter)
+ species_fit = list("Vox")
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/suit.dmi'
+ )
+
+/obj/item/clothing/head/winterhood
+ name = "winter hood"
+ desc = "A hood attached to a heavy winter jacket."
+ icon_state = "winterhood"
+ body_parts_covered = HEAD
+ cold_protection = HEAD
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ flags = NODROP|BLOCKHAIR
+ flags_inv = HIDEEARS
+ species_fit = list("Vox")
+ sprite_sheets = list("Vox" = 'icons/mob/species/vox/head.dmi')
+
+/obj/item/clothing/suit/hooded/wintercoat/captain
+ name = "captain's winter coat"
+ icon_state = "wintercoat_captain"
+ armor = list(melee = 25, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0)
+ allowed = list(/obj/item/weapon/gun/energy, /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/gun/projectile, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/restraints/handcuffs, /obj/item/device/flashlight/seclite, /obj/item/weapon/melee/classic_baton/telescopic)
+ hoodtype = /obj/item/clothing/head/winterhood/captain
+
+/obj/item/clothing/head/winterhood/captain
+ icon_state = "winterhood_captain"
+
+/obj/item/clothing/suit/hooded/wintercoat/security
+ name = "security winter coat"
+ icon_state = "wintercoat_sec"
+ armor = list(melee = 15, bullet = 10, laser = 20, energy = 5, bomb = 15, bio = 0, rad = 0) //worse stats than normal armor, but this one protects arms and makes space hurt less, CHOICES!
+ allowed = list(/obj/item/weapon/gun/energy, /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/restraints/handcuffs, /obj/item/device/flashlight/seclite, /obj/item/weapon/melee/classic_baton/telescopic)
+ hoodtype = /obj/item/clothing/head/winterhood/security
+
+/obj/item/clothing/head/winterhood/security
+ icon_state = "winterhood_sec"
+
+/obj/item/clothing/suit/hooded/wintercoat/medical
+ name = "medical winter coat"
+ icon_state = "wintercoat_med"
+ allowed = list(/obj/item/device/analyzer, /obj/item/weapon/dnainjector, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/hypospray, /obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/storage/pill_bottle, /obj/item/weapon/paper, /obj/item/weapon/melee/classic_baton/telescopic)
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 50, rad = 0)
+ hoodtype = /obj/item/clothing/head/winterhood/medical
+
+/obj/item/clothing/head/winterhood/medical
+ icon_state = "winterhood_med"
+
+/obj/item/clothing/suit/hooded/wintercoat/science
+ name = "science winter coat"
+ icon_state = "wintercoat_sci"
+ allowed = list(/obj/item/device/analyzer, /obj/item/stack/medical, /obj/item/weapon/dnainjector, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/hypospray, /obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/storage/pill_bottle, /obj/item/weapon/paper, /obj/item/weapon/melee/classic_baton/telescopic)
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
+ hoodtype = /obj/item/clothing/head/winterhood/science
+
+/obj/item/clothing/head/winterhood/science
+ icon_state = "winterhood_sci"
+
+/obj/item/clothing/suit/hooded/wintercoat/engineering
+ name = "engineering winter coat"
+ icon_state = "wintercoat_engi"
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20)
+ allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/device/t_scanner, /obj/item/weapon/rcd)
+ hoodtype = /obj/item/clothing/head/winterhood/engineering
+
+/obj/item/clothing/head/winterhood/engineering
+ icon_state = "winterhood_engi"
+
+/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos
+ name = "atmospherics winter coat"
+ icon_state = "wintercoat_atmos"
+ hoodtype = /obj/item/clothing/head/winterhood/engineering/atmos
+
+/obj/item/clothing/head/winterhood/engineering/atmos
+ icon_state = "winterhood_atmos"
+
+/obj/item/clothing/suit/hooded/wintercoat/hydro
+ name = "hydroponics winter coat"
+ icon_state = "wintercoat_hydro"
+ allowed = list(/obj/item/weapon/reagent_containers/spray, /obj/item/device/analyzer/plant_analyzer, /obj/item/seeds, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/hatchet, /obj/item/weapon/storage/bag/plants)
+ hoodtype = /obj/item/clothing/head/winterhood/hydro
+
+/obj/item/clothing/head/winterhood/hydro
+ icon_state = "winterhood_hydro"
+
+/obj/item/clothing/suit/hooded/wintercoat/cargo
+ name = "cargo winter coat"
+ icon_state = "wintercoat_cargo"
+ hoodtype = /obj/item/clothing/head/winterhood/cargo
+
+/obj/item/clothing/head/winterhood/cargo
+ icon_state = "winterhood_cargo"
+
+/obj/item/clothing/suit/hooded/wintercoat/miner
+ name = "mining winter coat"
+ icon_state = "wintercoat_miner"
+ allowed = list(/obj/item/weapon/pickaxe, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/toy, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/lighter)
+ armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+ hoodtype = /obj/item/clothing/head/winterhood/miner
+
+/obj/item/clothing/head/winterhood/miner
+ icon_state = "winterhood_miner"
+
/*
* Misc
*/
+//hoodies
+/obj/item/clothing/suit/hooded/hoodie
+ name = "hoodie"
+ desc = "It's a hoodie. It has a hood. Most hoodies do."
+ icon_state = "black_hoodie"
+ item_state = "labcoat"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ hoodtype = /obj/item/clothing/head/hood
+ species_fit = list("Vox")
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/suit.dmi'
+ )
+
+/obj/item/clothing/head/hood
+ name = "hood"
+ desc = "A hood attached to a hoodie."
+ icon_state = "blackhood"
+ body_parts_covered = HEAD
+ cold_protection = HEAD
+ flags = NODROP|BLOCKHAIR
+ flags_inv = HIDEEARS
+ species_fit = list("Vox")
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/head.dmi'
+ )
+
+/obj/item/clothing/head/hood/blue
+ icon_state = "bluehood"
+
+/obj/item/clothing/head/hood/white
+ icon_state = "whitehood"
+
+/obj/item/clothing/suit/hooded/hoodie/blue
+ name = "blue hoodie"
+ icon_state = "blue_hoodie"
+ hoodtype = /obj/item/clothing/head/hood/blue
+
+/obj/item/clothing/suit/hooded/hoodie/mit
+ name = "Martian Institute of Technology hoodie"
+ desc = "A hoodie proudly worn by students and graduates alike, has the letters 'MIT' on the back."
+ icon_state = "mit_hoodie"
+ hoodtype = /obj/item/clothing/head/hood
+
+/obj/item/clothing/suit/hooded/hoodie/cut
+ name = "Canaan University of Technology hoodie"
+ desc = "A bright hoodie with the Canaan University of Technology logo on the front."
+ icon_state = "cut_hoodie"
+ hoodtype = /obj/item/clothing/head/hood/white
+
+/obj/item/clothing/suit/hooded/hoodie/lam
+ name = "Lunar Academy of Medicine hoodie"
+ desc = "A bright hoodie with the Lunar Academy of Medicine logo on the back."
+ icon_state = "lam_hoodie"
+ hoodtype = /obj/item/clothing/head/hood/white
+
+/obj/item/clothing/suit/hooded/hoodie/nt
+ name = "Nanotrasen hoodie"
+ desc = "A blue hoodie with the Nanotrasen logo on the back."
+ icon_state = "nt_hoodie"
+ hoodtype = /obj/item/clothing/head/hood/blue
+
+/obj/item/clothing/suit/hooded/hoodie/tp
+ name = "Tharsis Polytech hoodie"
+ desc = "A dark hoodie with the Tharsis Polytech logo on the back."
+ icon_state = "tp_hoodie"
+ hoodtype = /obj/item/clothing/head/hood
+
/obj/item/clothing/suit/straight_jacket
name = "straight jacket"
desc = "A suit that completely restrains the wearer."
@@ -307,6 +491,8 @@
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
+
+
//pyjamas
//originally intended to be pinstripes >.>
@@ -364,6 +550,34 @@
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
+//trackjackets
+
+/obj/item/clothing/suit/tracksuit
+ name = "black tracksuit"
+ desc = "Lightweight and stylish. What else could a man ask of his tracksuit?"
+ icon_state = "trackjacket_open"
+ item_state = "bltrenchcoat"
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ ignore_suitadjust = 0
+ suit_adjusted = 1
+ action_button_name = "Open/Close Jacket"
+ adjust_flavour = "unzip"
+ species_fit = list("Vox")
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/suit.dmi'
+ )
+
+/obj/item/clothing/suit/tracksuit/green
+ name = "green tracksuit"
+ icon_state = "trackjacketgreen_open"
+
+/obj/item/clothing/suit/tracksuit/red
+ name = "red tracksuit"
+ icon_state = "trackjacketred_open"
+
+/obj/item/clothing/suit/tracksuit/white
+ name = "white tracksuit"
+ icon_state = "trackjacketwhite_open"
//actual suits
diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm
index cf74d17de05..8f5a540f3c3 100644
--- a/code/modules/clothing/under/chameleon.dm
+++ b/code/modules/clothing/under/chameleon.dm
@@ -39,11 +39,13 @@
desc = "Groovy!"
icon_state = "psyche"
item_color = "psyche"
+ usr.update_inv_w_uniform()
spawn(200)
- name = "Black Jumpsuit"
- icon_state = "bl_suit"
- item_color = "black"
- desc = null
+ name = initial(name)
+ icon_state = initial(icon_state)
+ item_color = initial(item_color)
+ desc = initial(desc)
+ usr.update_inv_w_uniform()
..()
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 33db62e4f41..9877872df73 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -178,7 +178,8 @@
desc = "A blue comb, it looks like it was made to groom a Tajaran's fur."
icon = 'icons/obj/custom_items.dmi'
icon_state = "wingler_comb"
- attack_verb = "combed"
+ attack_verb = list("combed")
+ hitsound = 'sound/weapons/tap.ogg'
force = 0
throwforce = 0
w_class = 2
diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm
index 1ab10bc8e4f..430ac0fccb1 100644
--- a/code/modules/error_handler/error_handler.dm
+++ b/code/modules/error_handler/error_handler.dm
@@ -102,3 +102,17 @@ var/total_runtimes_skipped = 0
error_cache.logError(e, desclines, e_src = e_src)
#endif
+
+/proc/log_runtime(exception/e, datum/e_src, extra_info)
+ if(!istype(e))
+ world.Error(e, e_src)
+ return
+
+ if(extra_info)
+ // Adding extra info adds two newlines, because parsing runtimes is funky
+ if(islist(extra_info))
+ e.desc = " [jointext(extra_info, "\n ")]\n\n" + e.desc
+ else
+ e.desc = " [extra_info]\n\n" + e.desc
+
+ world.Error(e, e_src)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 42eda2be496..81038eaf463 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -516,7 +516,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
/obj/item/clothing/mask/gas/voice, /obj/item/clothing/glasses/thermal,\
/obj/item/device/chameleon, /obj/item/weapon/card/emag,\
/obj/item/weapon/storage/toolbox/syndicate, /obj/item/weapon/aiModule,\
- /obj/item/device/radio/headset/syndicate, /obj/item/weapon/c4,\
+ /obj/item/device/radio/headset/syndicate, /obj/item/weapon/grenade/plastic/c4,\
/obj/item/device/powersink, /obj/item/weapon/storage/box/syndie_kit,\
/obj/item/toy/syndicateballoon, /obj/item/weapon/gun/energy/laser/captain,\
/obj/item/weapon/hand_tele, /obj/item/weapon/rcd, /obj/item/weapon/tank/jetpack,\
diff --git a/code/modules/food/beverages/bottler.dm b/code/modules/food/beverages/bottler.dm
new file mode 100644
index 00000000000..7e764595fd5
--- /dev/null
+++ b/code/modules/food/beverages/bottler.dm
@@ -0,0 +1,414 @@
+
+//adjust these to change the maximum capacity of the bottler for each container type
+#define MAX_GLASS 10
+#define MAX_PLAST 20
+#define MAX_METAL 25
+
+//adjust these to change the number of containers the bottler will make per sheet
+#define RATIO_GLASS 1
+#define RATIO_PLAST 2
+#define RATIO_METAL 5
+
+/obj/machinery/bottler
+ name = "bottler unit"
+ desc = "A machine that combines ingredients and bottles the resulting beverages."
+ icon = 'icons/obj/kitchen.dmi'
+ icon_state = "bottler_off"
+ density = 1
+ anchored = 1
+ var/list/slots[3]
+ var/list/datum/bottler_recipe/available_recipes
+ var/list/acceptable_items
+ var/list/containers = list("glass bottle" = 10, "plastic bottle" = 20, "metal can" = 25)
+ var/bottling = 0
+
+/obj/machinery/bottler/New()
+ if(!available_recipes)
+ available_recipes = list()
+ acceptable_items = list()
+ //These are going to be acceptable even if they aren't in a recipe
+ acceptable_items |= /obj/item/weapon/reagent_containers/food/snacks
+ acceptable_items |= /obj/item/weapon/reagent_containers/food/drinks/cans
+ //the rest is based on what is used in recipes so we don't have people destroying the nuke disc
+ for(var/type in subtypesof(/datum/bottler_recipe))
+ var/datum/bottler_recipe/recipe = new type
+ if(recipe.result) // Ignore recipe subtypes that lack a result
+ available_recipes += recipe
+ for(var/i = 1, i <= recipe.ingredients.len, i++)
+ acceptable_items |= recipe.ingredients[i]
+ else
+ qdel(recipe)
+
+/obj/machinery/bottler/attackby(obj/item/O, mob/user, params)
+ if(iswrench(O)) //This being before the canUnequip check allows borgs to (un)wrench bottlers in case they need move them to fix stuff
+ playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
+ if(anchored)
+ anchored = 0
+ to_chat(user, "[src] can now be moved.")
+ else
+ anchored = 1
+ to_chat(user, "[src] is now secured.")
+ return 1
+ if(!user.canUnEquip(O, 0))
+ to_chat(user, "[O] is stuck to your hand, you can't seem to put it down!")
+ return 0
+ if(is_type_in_list(O,acceptable_items))
+ if(istype(O, /obj/item/weapon/reagent_containers/food/snacks))
+ var/obj/item/weapon/reagent_containers/food/snacks/S = O
+ user.unEquip(S)
+ if(S.reagents && !S.reagents.total_volume) //This prevents us from using empty foods, should one occur due to some sort of error
+ to_chat(user, "[S] is gone, oh no!")
+ qdel(S) //Delete the food object because it is useless even as food due to the lack of reagents
+ else
+ insert_item(S, user)
+ return 1
+ else if(istype(O, /obj/item/weapon/reagent_containers/food/drinks/cans))
+ var/obj/item/weapon/reagent_containers/food/drinks/cans/C = O
+ if(C.reagents)
+ if(C.canopened && C.reagents.total_volume) //This prevents us from using opened cans that still have something in them
+ to_chat(user, "Only unopened cans and bottles can be processed to ensure product integrity.")
+ return 0
+ user.unEquip(C)
+ if(!C.reagents.total_volume) //Empty cans get recycled, even if they have somehow remained unopened due to some sort of error
+ recycle_container(C)
+ else //Full cans that are unopened get inserted for processing as ingredients
+ insert_item(C, user)
+ return 1
+ else
+ user.unEquip(O)
+ insert_item(O, user)
+ return 1
+ else if(istype(O, /obj/item/trash/can)) //Crushed cans (and bottles) are returnable still
+ var/obj/item/trash/can/C = O
+ user.unEquip(C)
+ recycle_container(C)
+ return 1
+ else if(istype(O, /obj/item/stack/sheet)) //Sheets of materials can replenish the machine's supply of drink containers (when people inevitably don't return them)
+ var/obj/item/stack/sheet/S = O
+ user.unEquip(S)
+ process_sheets(S)
+ return 1
+ else //If it doesn't qualify in the above checks, we don't want it. Inform the person so they (ideally) stop trying to put the nuke disc in.
+ to_chat(user, "You aren't sure this is able to be processed by the machine.")
+ return 0
+ //..()
+
+/obj/machinery/bottler/proc/insert_item(obj/item/O, mob/user)
+ if(!O || !user)
+ return
+ if(slots[1] && slots[2] && slots[3])
+ to_chat(user, "[src] is full, please remove or process the contents first.")
+ return
+ var/slot_inserted = 0
+ for(var/i = 1, i <= slots.len, i++)
+ if(!slots[i])
+ slots[i] = O
+ slot_inserted = i
+ break
+ if(!slot_inserted)
+ to_chat(user, "Something went wrong and the machine spits out [O].")
+ O.forceMove(loc)
+ else
+ to_chat(user, "You load [O] into the [slot_inserted]\th ingredient tray.")
+ O.forceMove(src)
+ updateUsrDialog()
+
+/obj/machinery/bottler/proc/eject_items(var/slot)
+ var/obj/item/O = null
+ if(!slot)
+ for(var/i = 1, i <= slots.len, i++)
+ if(slots[i])
+ O = slots[i]
+ O.forceMove(loc)
+ slots[i] = null
+ visible_message("[src] beeps as it ejects the contents of all the ingredient trays.")
+ else
+ if(slots[slot]) //ensures the tray actually has something to eject so we don't runtime on trying to reference null
+ O = slots[slot]
+ O.forceMove(loc)
+ slots[slot] = null
+ visible_message("[src] beeps as it ejects [O.name] from the [slot]\th ingredient tray.")
+ updateUsrDialog()
+
+/obj/machinery/bottler/proc/recycle_container(obj/item/O)
+ if(!O)
+ return
+ var/con_type
+ var/max_define
+ if(istype(O, /obj/item/trash/can))
+ var/obj/item/trash/can/C = O
+ if(C.is_glass)
+ con_type = "glass bottle"
+ max_define = MAX_GLASS
+ else if(C.is_plastic)
+ con_type = "plastic bottle"
+ max_define = MAX_PLAST
+ else
+ con_type = "metal can"
+ max_define = MAX_METAL
+ else if(istype(O, /obj/item/weapon/reagent_containers/food/drinks/cans))
+ var/obj/item/weapon/reagent_containers/food/drinks/cans/C = O
+ if(C.is_glass)
+ con_type = "glass bottle"
+ max_define = MAX_GLASS
+ else if(C.is_plastic)
+ con_type = "plastic bottle"
+ max_define = MAX_PLAST
+ else
+ con_type = "metal can"
+ max_define = MAX_METAL
+ if(con_type)
+ if(containers[con_type] < max_define)
+ containers[con_type]++
+ visible_message("[src] whirs briefly as it prepares the container for reuse.")
+ qdel(O)
+ updateUsrDialog()
+ else
+ visible_message("[src] cannot store any more cans at this time. Please fill some before recycling more.")
+ O.forceMove(loc)
+
+/obj/machinery/bottler/proc/process_sheets(obj/item/stack/sheet/S)
+ if(!S)
+ return
+ S.forceMove(loc)
+ var/con_type
+ var/max_define
+ var/mat_ratio
+ //Glass sheets for glass bottles (1 bottle per sheet)
+ if(istype(S, /obj/item/stack/sheet/glass))
+ con_type = "glass bottle"
+ max_define = MAX_GLASS
+ mat_ratio = RATIO_GLASS
+ else if(istype(S, /obj/item/stack/sheet/mineral/plastic))
+ con_type = "plastic bottle"
+ max_define = MAX_PLAST
+ mat_ratio = RATIO_PLAST
+ else if(istype(S, /obj/item/stack/sheet/metal))
+ con_type = "metal can"
+ max_define = MAX_METAL
+ mat_ratio = RATIO_METAL
+ else
+ visible_message("[src] rejects the unusable materials.")
+ return
+ var/missing
+ var/sheets_needed
+ var/sheets_to_use
+ if(con_type)
+ missing = max_define - containers[con_type]
+ sheets_needed = round(missing / mat_ratio, 1)
+ if(missing % mat_ratio)
+ sheets_needed += 1
+ sheets_to_use = min(sheets_needed, S.amount)
+ if(missing)
+ visible_message("[src] shudders as it converts [sheets_to_use] [S.singular_name]\s into new [con_type]s.")
+ containers[con_type] += sheets_to_use * mat_ratio
+ containers[con_type] = min(containers[con_type], max_define)
+ S.use(sheets_to_use)
+ else
+ visible_message("[src] rejects the [S] because it already is fully stocked with [con_type]s.")
+
+/obj/machinery/bottler/proc/select_recipe()
+ for(var/datum/bottler_recipe/recipe in available_recipes)
+ var/number_matches = 0
+ for(var/i = 1, i <= slots.len, i++)
+ var/obj/item/O = slots[i]
+ if(istype(O, recipe.ingredients[i]))
+ if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown))
+ var/obj/item/weapon/reagent_containers/food/snacks/grown/G = O
+ if(G.seed && G.seed.kitchen_tag == recipe.tags[i])
+ number_matches++
+ else
+ number_matches++
+ if(number_matches == 3)
+ return recipe
+ return null
+
+/obj/machinery/bottler/proc/dispense_empty_container(container)
+ var/con_type
+ var/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/drink_container
+ switch(container)
+ if(1) //glass bottle
+ con_type = "glass bottle"
+ drink_container = /obj/item/weapon/reagent_containers/food/drinks/cans/bottler/glass_bottle
+ if(2) //plastic bottle
+ con_type = "plastic bottle"
+ drink_container = /obj/item/weapon/reagent_containers/food/drinks/cans/bottler/plastic_bottle
+ if(3) //metal can
+ con_type = "metal can"
+ drink_container = /obj/item/weapon/reagent_containers/food/drinks/cans/bottler/metal_can
+ if(containers[con_type])
+ //empties aren't sealed, so let's open it quietly
+ drink_container = new drink_container()
+ drink_container.canopened = 1
+ drink_container.flags |= OPENCONTAINER
+ drink_container.forceMove(loc)
+ containers[con_type]--
+
+/obj/machinery/bottler/proc/process_ingredients(container)
+ //stop if we have ZERO ingredients (what would you process?)
+ if(!slots[1] && !slots[2] && !slots[3])
+ visible_message("There are no ingredients to process! Please insert some first.")
+ return
+ //prep a container
+ var/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/drink_container
+ var/con_type
+ switch(container)
+ if(1) //glass bottle
+ con_type = "glass bottle"
+ drink_container = /obj/item/weapon/reagent_containers/food/drinks/cans/bottler/glass_bottle
+ if(2) //plastic bottle
+ con_type = "plastic bottle"
+ drink_container = /obj/item/weapon/reagent_containers/food/drinks/cans/bottler/plastic_bottle
+ if(3) //metal can
+ con_type = "metal can"
+ drink_container = /obj/item/weapon/reagent_containers/food/drinks/cans/bottler/metal_can
+
+ if(!con_type)
+ visible_message("Error 404: Drink Container Not Found.")
+ return
+ if(!containers[con_type])
+ visible_message("Error 503: Out of [con_type]s.")
+ return
+ else
+ drink_container = new drink_container()
+ containers[con_type]--
+ //select and process a recipe based on inserted ingredients
+ visible_message("[src] hums as it processes the ingredients...")
+ bottling = 1
+ var/datum/bottler_recipe/recipe_to_use = select_recipe()
+ if(!recipe_to_use)
+ //bad recipe, ruins the drink
+ var/contents = pick("thick goop", "pungent sludge", "unspeakable slurry", "gross-looking concoction", "eldritch abomination of liquids")
+ visible_message("The [con_type] fills with \an [contents]...")
+ drink_container.reagents.add_reagent(pick("????", "toxic_slurry", "meatslurry", "glowing_slury", "fishwater"), pick(30, 50))
+ drink_container.name = "Liquid Mistakes"
+ drink_container.desc = "WARNING: CONTENTS MAY BE AWFUL, DRINK AT OWN RISK."
+ else
+ //good recipe, make it
+ visible_message("The [con_type] fills with a delicious-looking beverage!")
+ drink_container.reagents.add_reagent(recipe_to_use.result, 50)
+ drink_container.name = "[recipe_to_use.name]"
+ drink_container.desc = "[recipe_to_use.description]"
+ flick("bottler_on", src)
+ spawn(45)
+ for(var/i = 1, i <= slots.len, i++)
+ qdel(slots[i])
+ slots[i] = null
+ bottling = 0
+ drink_container.forceMove(loc)
+ updateUsrDialog()
+
+/obj/machinery/bottler/attack_ai(mob/user)
+ attack_hand(user)
+
+/obj/machinery/bottler/attack_ghost(mob/user)
+ attack_hand(user)
+
+/obj/machinery/bottler/attack_hand(mob/user)
+ if(stat & BROKEN)
+ return
+ interact(user)
+
+/obj/machinery/bottler/interact(mob/user)
+ user.set_machine(src)
+ //html ahoy
+ var/dat = ""
+ if(bottling)
+ dat = "Bottling in process, please wait...
"
+ else
+ dat += ""
+ dat += ""
+ dat += "| Containers: | "
+ dat += "
"
+ dat += ""
+ dat += "| Glass Bottles: [containers["glass bottle"]] | "
+ dat += "Plastic Bottles: [containers["plastic bottle"]] | "
+ dat += "Metal Cans: [containers["metal can"]] | "
+ dat += "
"
+ dat += ""
+ if(containers["glass bottle"])
+ dat += "| Dispense | "
+ else
+ dat += "Out of stock | "
+ if(containers["plastic bottle"])
+ dat += "Dispense | "
+ else
+ dat += "Out of stock | "
+ if(containers["metal can"])
+ dat += "Dispense | "
+ else
+ dat += "Out of stock | "
+ dat += "
"
+ dat += "
"
+ dat += "
"
+ dat += ""
+ dat += ""
+ dat += "| Ingredient Tray Contents: | "
+ dat += "
"
+
+ dat += ""
+ for(var/i = 1, i <= slots.len, i++)
+ var/obj/O = slots[i]
+ if(O)
+ dat += "[bicon(O)]
[O.name] | "
+ else
+ dat += "Tray Empty | "
+
+ if(slots[1] && slots[2] && slots[3])
+ dat += "Process Ingredients | "
+ else
+ dat += "Insufficient Ingredients | "
+ dat += "
"
+
+ dat += ""
+ for(var/i = 1, i <= slots.len, i++)
+ if(slots[i])
+ dat += "| Eject | "
+ else
+ dat += "N/A | "
+ dat += "Eject All | "
+ dat += "
"
+ dat += "
"
+ dat += "
"
+ dat += "Insert three ingredients and press process to create a beverage. You will be able to select a container for the beverage before processing begins.
"
+ dat += "Inserting empty bottles and cans, as well as sheets of glass, plastic, or metal will restock the appropriate container supply.
"
+ var/datum/browser/popup = new(user, "bottler", "Bottler Menu", 575, 400)
+ popup.set_content(dat)
+ popup.open()
+
+/obj/machinery/bottler/Topic(href, href_list)
+ if(..())
+ return 1
+ if(bottling)
+ return
+
+ add_fingerprint(usr)
+ usr.set_machine(src)
+
+ if(href_list["process"])
+ var/list/choices = list("Glass Bottle" = 1, "Plastic Bottle" = 2, "Metal Can" = 3)
+ var/selection = input("Select a container for your beverage.", "Container") as null|anything in choices
+ if(!selection)
+ return
+ else
+ selection = choices[selection]
+ process_ingredients(selection)
+
+ if(href_list["eject"])
+ var/slot = text2num(href_list["eject"])
+ eject_items(slot)
+
+ if(href_list["dispense"])
+ var/container = text2num(href_list["dispense"])
+ dispense_empty_container(container)
+
+ updateUsrDialog()
+ return
+
+/obj/machinery/bottler/update_icon()
+ if(stat & BROKEN)
+ icon_state = "bottler_broken"
+ else if(bottling)
+ icon_state = "bottler_on"
+ else
+ icon_state = "bottler_off"
\ No newline at end of file
diff --git a/code/modules/food/beverages/bottler_recipes.dm b/code/modules/food/beverages/bottler_recipes.dm
new file mode 100644
index 00000000000..be7504afade
--- /dev/null
+++ b/code/modules/food/beverages/bottler_recipes.dm
@@ -0,0 +1,86 @@
+
+/datum/bottler_recipe
+ var/name = ""
+ var/description = ""
+ var/list/ingredients[3]
+ var/list/tags[3]
+ var/datum/reagent/result = null
+
+
+/* Example of how a bottler_recipe should look:
+/datum/bottler_recipe/example
+ name = "Example"
+ description = "This is an example."
+ ingredients = list(thing_1, thing_2, thing_3)
+ tags = list(null, "tag_2", null)
+ result = "water"
+
+The ingredients list must have 3 non-null entries.
+The tags list must have 3 entries, using null where a tag is unused.
+Failing to ensure both lists have EXACTLY 3 entries (unless the system is updated in the future to use a different number) will result in runtimes.
+There is no excuse to do this wrong now that there is an example for you. --FalseIncarnate
+*/
+
+
+/datum/bottler_recipe/Paradise_Punch
+ name = "Paradise Punch"
+ description = "Tastes just how you'd think Paradise would if you could bottle it."
+ ingredients = list(/obj/item/weapon/reagent_containers/food/snacks/grown,
+ /obj/item/weapon/reagent_containers/food/snacks/grown,
+ /obj/item/weapon/reagent_containers/food/snacks/grown)
+ tags = list("grapes", "banana", "cherries")
+ result = "paradise_punch"
+
+/datum/bottler_recipe/Applepocalypse
+ name = "Apple-pocalypse"
+ description = "If doomsday came in fruit form, it'd probably be apples."
+ ingredients = list(/obj/item/weapon/reagent_containers/food/snacks/grown,
+ /obj/item/weapon/reagent_containers/food/snacks/grown,
+ /obj/item/weapon/reagent_containers/food/snacks/grown)
+ tags = list("apple", "apple", "apple")
+ result = "apple-pocalypse"
+
+/datum/bottler_recipe/Berry_Banned
+ name = "Berry Banned"
+ description = "Reason for ban: Excessive Flavor."
+ ingredients = list(/obj/item/weapon/reagent_containers/food/snacks/grown,
+ /obj/item/weapon/reagent_containers/food/snacks/grown,
+ /obj/item/weapon/reagent_containers/food/snacks/grown)
+ tags = list("berries", "berries", "berries")
+ result = "berry_banned"
+
+/datum/bottler_recipe/Berry_Banned2
+ name = "Berry Banned"
+ description = "Reason for ban: Excessive Flavor."
+ ingredients = list(/obj/item/weapon/reagent_containers/food/snacks/grown,
+ /obj/item/weapon/reagent_containers/food/snacks/grown,
+ /obj/item/weapon/reagent_containers/food/snacks/grown)
+ tags = list("poisonberries", "poisonberries", "poisonberries")
+ result = "berry_banned2"
+
+/datum/bottler_recipe/Blackeye_Brew
+ name = "Blackeye Brew"
+ description = "Creamy, smooth flavor, just like the bald heads of the masses. Supposedly aged for 30 years."
+ ingredients = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola,
+ /obj/item/weapon/reagent_containers/food/snacks/grown,
+ /obj/item/weapon/reagent_containers/food/snacks/icecream)
+ tags = list(null, "sugarcane", null)
+ result = "blackeye_brew"
+
+/datum/bottler_recipe/Grape_Granade
+ name = "Grape Granade"
+ description = "Exploding with grape flavor and a favorite among ERT members system-wide."
+ ingredients = list(/obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice,
+ /obj/item/weapon/reagent_containers/food/snacks/grown,
+ /obj/item/device/flash)
+ tags = list(null, "grapes", null)
+ result = "grape_granade"
+
+/datum/bottler_recipe/Meteor_Malt
+ name = "Meteor Malt"
+ description = "Soft drinks have been detected on collision course with your tastebuds."
+ ingredients = list(/obj/item/weapon/ore,
+ /obj/item/weapon/reagent_containers/food/snacks/grown,
+ /obj/item/weapon/ore)
+ tags = list(null, "wheat", null)
+ result = "meteor_malt"
diff --git a/code/modules/garbage_collection/garbage_collector.dm b/code/modules/garbage_collection/garbage_collector.dm
index 844b7f2dd38..95535376f85 100644
--- a/code/modules/garbage_collection/garbage_collector.dm
+++ b/code/modules/garbage_collection/garbage_collector.dm
@@ -109,7 +109,7 @@ var/global/datum/controller/process/garbage_collector/garbageCollector
hint = D.Destroy()
catch(var/exception/e)
if(istype(e))
- gcwarning("qdel() caught runtime destroying [D.type]: [e] in [e.file], line [e.line]")
+ log_runtime(e, D, "Caught by qdel() destroying [D.type]")
else
gcwarning("qdel() caught runtime destroying [D.type]: [e]")
// Destroy runtimed? Panic! Hard delete!
@@ -169,7 +169,7 @@ var/global/datum/controller/process/garbage_collector/garbageCollector
Destroy()
catch(var/exception/e)
if(istype(e))
- gcwarning("Del() caught runtime destroying [type]: [e] in [e.file], line [e.line]")
+ log_runtime(e, src, "Caught by Del() destroying [type]")
else
gcwarning("Del() caught runtime destroying [type]: [e]")
if(del_profiling)
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 553251a2ee8..817f002f014 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -251,4 +251,4 @@
if(!user.put_in_active_hand(QB))
QB.forceMove(get_turf(src))
visible_message("[user] removes the queen from the apiary.")
- queen_bee = null
+ queen_bee = null
\ No newline at end of file
diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm
index a028fa66727..7d646b23cc3 100644
--- a/code/modules/hydroponics/seed_datums.dm
+++ b/code/modules/hydroponics/seed_datums.dm
@@ -825,6 +825,7 @@
display_name = "grapevines"
mutants = list("greengrapes")
chems = list("plantmatter" = list(1,10), "sugar" = list(1,5))
+ kitchen_tag = "grapes"
preset_icon = "grapes"
/datum/seed/grapes/New()
@@ -1089,6 +1090,7 @@
seed_name = "sugarcane"
display_name = "sugarcanes"
chems = list("sugar" = list(4,5))
+ kitchen_tag = "sugarcane"
preset_icon = "sugarcane"
/datum/seed/sugarcane/New()
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index b45fd4070fe..e9c63ed8794 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -7,6 +7,8 @@
flags = OPENCONTAINER
volume = 100
+ hud_possible = list (PLANT_NUTRIENT_HUD, PLANT_WATER_HUD, PLANT_STATUS_HUD, PLANT_HEALTH_HUD, PLANT_TOXIN_HUD, PLANT_PEST_HUD, PLANT_WEED_HUD)
+
var/mechanical = 1 // Set to 0 to stop it from drawing the alert lights.
var/base_name = "tray"
@@ -73,10 +75,12 @@
if(weedlevel > 0)
nymph.reagents.add_reagent("nutriment", weedlevel)
weedlevel = 0
+ plant_hud_set_weed()
nymph.visible_message("[nymph] begins rooting through [src], ripping out weeds and eating them noisily.","You begin rooting through [src], ripping out weeds and eating them noisily.")
else if(nymph.nutrition > 100 && nutrilevel < 10)
nymph.nutrition -= ((10-nutrilevel)*5)
nutrilevel = 10
+ plant_hud_set_nutrient()
nymph.visible_message("[nymph] secretes a trickle of green liquid, refilling [src].","You secrete a trickle of green liquid, refilling [src].")
else
nymph.visible_message("[nymph] rolls around in [src] for a bit.","You roll around in [src] for a bit.")
@@ -85,6 +89,17 @@
/obj/machinery/portable_atmospherics/hydroponics/New()
..()
+ var/datum/atom_hud/data/hydroponic/hydro_hud = huds[DATA_HUD_HYDROPONIC]
+ prepare_huds()
+ hydro_hud.add_to_hud(src)
+ plant_hud_set_nutrient()
+ plant_hud_set_water()
+ plant_hud_set_status()
+ plant_hud_set_health()
+ plant_hud_set_toxin()
+ plant_hud_set_pest()
+ plant_hud_set_weed()
+
component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/hydroponics(null)
component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
@@ -101,6 +116,7 @@
if(closed_system)
flags &= ~OPENCONTAINER
+
/obj/machinery/portable_atmospherics/hydroponics/upgraded/New()
..()
component_parts = list()
@@ -118,6 +134,8 @@
maxnutri = tmp_capacity * 5 // Up to 30
//waterlevel = maxwater
//nutrilevel = 3
+ plant_hud_set_nutrient()
+ plant_hud_set_water()
/obj/machinery/portable_atmospherics/hydroponics/bullet_act(var/obj/item/projectile/Proj)
@@ -150,12 +168,18 @@
die()
check_level_sanity()
update_icon()
+ plant_hud_set_status()
+ plant_hud_set_health()
/obj/machinery/portable_atmospherics/hydroponics/proc/die()
dead = 1
harvest = 0
weedlevel += 1 * HYDRO_SPEED_MULTIPLIER
pestlevel = 0
+ plant_hud_set_status()
+ plant_hud_set_health()
+ plant_hud_set_weed()
+ plant_hud_set_pest()
//Harvests the product of a plant.
/obj/machinery/portable_atmospherics/hydroponics/proc/harvest(var/mob/user)
@@ -233,6 +257,9 @@
pestlevel = 0
sampled = 0
update_icon()
+ plant_hud_set_weed()
+ plant_hud_set_status()
+ plant_hud_set_health()
visible_message("[src] has been overtaken by [seed.display_name].")
return
@@ -391,6 +418,14 @@
toxins = max(0,min(toxins,10))
yield_mod = min(100, yield_mod)
+ plant_hud_set_nutrient()
+ plant_hud_set_water()
+ plant_hud_set_status()
+ plant_hud_set_health()
+ plant_hud_set_toxin()
+ plant_hud_set_pest()
+ plant_hud_set_weed()
+
/obj/machinery/portable_atmospherics/hydroponics/proc/mutate_species()
var/previous_plant = seed.display_name
@@ -409,6 +444,9 @@
harvest = 0
weedlevel = 0
+ plant_hud_set_health()
+ plant_hud_set_weed()
+
update_icon()
visible_message("\red The \blue [previous_plant] \red has suddenly mutated into \blue [seed.display_name]!")
@@ -585,6 +623,7 @@
user.visible_message("[user] starts uprooting the weeds.", "You remove the weeds from the [src].")
weedlevel = 0
update_icon()
+ plant_hud_set_weed()
else
to_chat(user, "This plot is completely devoid of weeds. It doesn't need uprooting.")
diff --git a/code/modules/hydroponics/trays/tray_process.dm b/code/modules/hydroponics/trays/tray_process.dm
index d272e49f0c8..03568731dc5 100644
--- a/code/modules/hydroponics/trays/tray_process.dm
+++ b/code/modules/hydroponics/trays/tray_process.dm
@@ -21,6 +21,7 @@
// Bonus chance if the tray is unoccupied.
if(waterlevel > 10 && nutrilevel > 2 && prob(isnull(seed) ? 6 : 3))
weedlevel += 1 * HYDRO_SPEED_MULTIPLIER
+ plant_hud_set_weed()
// There's a chance for a weed explosion to happen if the weeds take over.
// Plants that are themselves weeds (weed_tolerance > 10) are unaffected.
@@ -48,8 +49,10 @@
// Maintain tray nutrient and water levels.
if(seed.get_trait(TRAIT_NUTRIENT_CONSUMPTION) > 0 && nutrilevel > 0 && prob(25))
nutrilevel -= max(0,seed.get_trait(TRAIT_NUTRIENT_CONSUMPTION) * HYDRO_SPEED_MULTIPLIER)
+ plant_hud_set_nutrient()
if(seed.get_trait(TRAIT_WATER_CONSUMPTION) > 0 && waterlevel > 0 && prob(25))
waterlevel -= max(0,seed.get_trait(TRAIT_WATER_CONSUMPTION) * HYDRO_SPEED_MULTIPLIER)
+ plant_hud_set_water()
// Make sure the plant is not starving or thirsty. Adequate
// water and nutrients will cause a plant to become healthier.
@@ -91,6 +94,7 @@
if(toxins > seed.get_trait(TRAIT_TOXINS_TOLERANCE))
health -= toxin_uptake
toxins -= toxin_uptake
+ plant_hud_set_toxin()
// Check for pests and weeds.
// Some carnivorous plants happily eat pests.
@@ -100,6 +104,7 @@
pestlevel -= HYDRO_SPEED_MULTIPLIER
else if(pestlevel >= seed.get_trait(TRAIT_PEST_TOLERANCE))
health -= HYDRO_SPEED_MULTIPLIER
+ plant_hud_set_pest()
// Some plants thrive and live off of weeds.
if(weedlevel > 0)
@@ -108,6 +113,7 @@
weedlevel -= HYDRO_SPEED_MULTIPLIER
else if(weedlevel >= seed.get_trait(TRAIT_WEED_TOLERANCE))
health -= HYDRO_SPEED_MULTIPLIER
+ plant_hud_set_weed()
// Handle life and death.
// If the plant gets too old, begin killing it each cycle
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 2f0acea4433..4d58fee8e11 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -26,6 +26,7 @@
/obj/item/weapon/storage/bible)
/obj/structure/bookcase/initialize()
+ ..()
for(var/obj/item/I in loc)
if(is_type_in_list(I, valid_types))
I.forceMove(src)
diff --git a/code/modules/lighting/lighting_overlay.dm b/code/modules/lighting/lighting_overlay.dm
index f2dede3b8ba..525de63a0af 100644
--- a/code/modules/lighting/lighting_overlay.dm
+++ b/code/modules/lighting/lighting_overlay.dm
@@ -9,6 +9,7 @@
invisibility = INVISIBILITY_LIGHTING
color = "#000000"
icon_state = "light1"
+ auto_init = 0 // doesn't need special init
var/lum_r
var/lum_g
@@ -104,4 +105,4 @@
if(istype(T))
T.lighting_overlay = null
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/modules/media/broadcast/receivers/radio.dm b/code/modules/media/broadcast/receivers/radio.dm
index 7b9c4ad7b15..a0d94dcbf31 100644
--- a/code/modules/media/broadcast/receivers/radio.dm
+++ b/code/modules/media/broadcast/receivers/radio.dm
@@ -8,6 +8,7 @@
var/on=0
/obj/machinery/media/receiver/boombox/initialize()
+ ..()
if(on)
update_on()
update_icon()
@@ -80,4 +81,4 @@
if(on)
icon_state="wallradio-p"
else
- icon_state="wallradio"
\ No newline at end of file
+ icon_state="wallradio"
diff --git a/code/modules/media/broadcast/transmitters/broadcast.dm b/code/modules/media/broadcast/transmitters/broadcast.dm
index d8607851752..898771b496d 100644
--- a/code/modules/media/broadcast/transmitters/broadcast.dm
+++ b/code/modules/media/broadcast/transmitters/broadcast.dm
@@ -19,6 +19,7 @@
var/const/MAX_TEMP=70 // Celsius
/obj/machinery/media/transmitter/broadcast/initialize()
+ ..()
testing("[type]/initialize() called!")
if(autolink && autolink.len)
for(var/obj/machinery/media/source in orange(20, src))
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 431e6ea028b..f82975572a2 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -249,4 +249,50 @@
if(colorindex >= 6)
colorindex = 0
icon_state = "mobcap[colorindex]"
- update_icon()
\ No newline at end of file
+ update_icon()
+
+//Fans
+/obj/structure/fans
+ icon = 'icons/obj/lavaland/survival_pod.dmi'
+ icon_state = "fans"
+ name = "environmental regulation system"
+ desc = "A large machine releasing a constant gust of air."
+ anchored = 1
+ density = 1
+ var/arbitraryatmosblockingvar = 1
+ var/buildstacktype = /obj/item/stack/sheet/metal
+ var/buildstackamount = 5
+
+/obj/structure/fans/proc/deconstruct()
+ if(buildstacktype)
+ new buildstacktype(loc, buildstackamount)
+ qdel(src)
+
+/obj/structure/fans/attackby(obj/item/weapon/W, mob/user, params)
+ if(istype(W, /obj/item/weapon/wrench))
+ playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user.visible_message("[user] disassembles the fan.", \
+ "You start to disassemble the fan...", "You hear clanking and banging noises.")
+ if(do_after(user, 20, target = src))
+ deconstruct()
+ return ..()
+
+/obj/structure/fans/tiny
+ name = "tiny fan"
+ desc = "A tiny fan, releasing a thin gust of air."
+ layer = TURF_LAYER+0.1
+ density = 0
+ icon_state = "fan_tiny"
+ buildstackamount = 2
+
+/obj/structure/fans/New(loc)
+ ..()
+ air_update_turf(1)
+
+/obj/structure/fans/Destroy()
+ arbitraryatmosblockingvar = 0
+ air_update_turf(1)
+ return ..()
+
+/obj/structure/fans/CanAtmosPass(turf/T)
+ return !arbitraryatmosblockingvar
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/interactive/functions.dm b/code/modules/mob/living/carbon/human/interactive/functions.dm
index e3fe0e7ad3b..199530c4805 100644
--- a/code/modules/mob/living/carbon/human/interactive/functions.dm
+++ b/code/modules/mob/living/carbon/human/interactive/functions.dm
@@ -648,7 +648,7 @@
newSnack.name = "Synthetic [newSnack.name]"
custom_emote(2, "[pick("gibbers","drools","slobbers","claps wildly","spits")] as they vomit [newSnack] from their mouth!")
catch(var/exception/e)
- log_to_dd("Cooking error: [e] in [e.file]:[e.line]")
+ log_runtime(e, src, "Caught in SNPC cooking module")
doing &= ~SNPC_SPECIAL
// END COOKING MODULE
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index a9ff3a2c025..50270ed3f78 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -1269,13 +1269,17 @@ var/global/list/damage_icon_parts = list()
if(wear_suit)
if(wear_suit.icon_override)
var/icon_path = "[wear_suit.icon_override]"
- icon_path = "[copytext(icon_path, 1, findtext(icon_path, "/suit.dmi"))]/collar.dmi" //If this file doesn't exist, the end result is that COLLAR_LAYER will be unchanged (empty) so there won't be an issue.
- var/icon/icon_file = new(icon_path)
+ icon_path = "[copytext(icon_path, 1, findtext(icon_path, "/suit.dmi"))]/collar.dmi" //If this file doesn't exist, the end result is that COLLAR_LAYER will be unchanged (empty).
+ var/icon/icon_file
+ if(fexists(icon_path)) //Just ensuring the nonexistance of a file with the above path won't cause a runtime.
+ icon_file = new(icon_path)
standing = image("icon" = icon_file, "icon_state" = "[wear_suit.icon_state]")
else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[species.name])
var/icon_path = "[wear_suit.sprite_sheets[species.name]]"
- icon_path = "[copytext(icon_path, 1, findtext(icon_path, "/suit.dmi"))]/collar.dmi" //If this file doesn't exist, the end result is that COLLAR_LAYER will be unchanged (empty) so there won't be an issue.
- var/icon/icon_file = new(icon_path)
+ icon_path = "[copytext(icon_path, 1, findtext(icon_path, "/suit.dmi"))]/collar.dmi" //If this file doesn't exist, the end result is that COLLAR_LAYER will be unchanged (empty).
+ var/icon/icon_file
+ if(fexists(icon_path)) //Just ensuring the nonexistance of a file with the above path won't cause a runtime.
+ icon_file = new(icon_path)
standing = image("icon" = icon_file, "icon_state" = "[wear_suit.icon_state]")
else
if(wear_suit.icon_state in C.IconStates())
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 96cef960c8f..b2dffb540be 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -815,7 +815,8 @@ var/list/ai_verbs_default = list(
"default",
"floating face",
"xeno queen",
- "eldritch"
+ "eldritch",
+ "ancient machine"
)
input = input("Please select a hologram:") as null|anything in icon_list
if(input)
@@ -829,6 +830,8 @@ var/list/ai_verbs_default = list(
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo3"))
if("eldritch")
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo4"))
+ if("ancient machine")
+ holo_icon = getHologramIcon(icon('icons/mob/ancient_machine.dmi', "ancient_machine"))
return
/mob/living/silicon/ai/proc/corereturn()
@@ -1040,4 +1043,4 @@ var/list/ai_verbs_default = list(
eyeobj.setLoc(get_turf(C))
client.eye = eyeobj
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 7b7713c8540..8412aa322cb 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -303,7 +303,7 @@
/mob/living/silicon/robot/drone/Bump(atom/movable/AM as mob|obj, yes)
- if (!yes || ( \
+ if(!yes || ( \
!istype(AM,/obj/machinery/door) && \
!istype(AM,/obj/machinery/recharge_station) && \
!istype(AM,/obj/machinery/disposal/deliveryChute) && \
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index b18ff0abea3..8a66bc1fb89 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -315,7 +315,7 @@ var/list/robot_verbs_default = list(
if(camera && "Robots" in camera.network)
camera.network.Add("Medical")
module_sprites["Basic"] = "Medbot"
- module_sprites["Standard"] = "surgeon"
+ module_sprites["Surgeon"] = "surgeon"
module_sprites["Advanced Droid"] = "droid-medical"
module_sprites["Needles"] = "medicalrobot"
module_sprites["Standard"] = "robotMedi"
@@ -1486,4 +1486,4 @@ var/list/robot_verbs_default = list(
if(1)
disable_component("comms", 160)
if(2)
- disable_component("comms", 60)
\ No newline at end of file
+ disable_component("comms", 60)
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 04e6c0d7a2f..e0196fbcec2 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -164,7 +164,7 @@
if(!item_to_add)
usr.visible_message("[usr] pets [src].","You rest your hand on [src]'s back for a moment.")
return
- if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess
+ if(istype(item_to_add,/obj/item/weapon/grenade/plastic/c4)) // last thing he ever wears, I guess
item_to_add.afterattack(src,usr,1)
return
@@ -208,7 +208,7 @@
//Many hats added, Some will probably be removed, just want to see which ones are popular.
/mob/living/simple_animal/pet/corgi/proc/place_on_head(obj/item/item_to_add, var/mob/user as mob)
- if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess
+ if(istype(item_to_add,/obj/item/weapon/grenade/plastic/c4)) // last thing he ever wears, I guess
item_to_add.afterattack(src,user,1)
return
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index 287c3aaa69d..83e8b78164f 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -135,6 +135,7 @@
var/alerted = 0
var/ore_eaten = 1
var/chase_time = 100
+ var/will_burrow = 1
/mob/living/simple_animal/hostile/asteroid/goldgrub/New()
..()
@@ -170,7 +171,7 @@
visible_message("The ore was swallowed whole!")
/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/Burrow()//Begin the chase to kill the goldgrub in time
- if(!alerted)
+ if(!alerted && will_burrow)
alerted = 1
spawn(chase_time)
if(alerted)
diff --git a/code/modules/paperwork/frames.dm b/code/modules/paperwork/frames.dm
index f988cf117cc..46f4e12d97e 100644
--- a/code/modules/paperwork/frames.dm
+++ b/code/modules/paperwork/frames.dm
@@ -224,7 +224,7 @@
explosive.forceMove(user.loc)
explosive = null
qdel(src)
- if(istype(I, /obj/item/weapon/grenade) || istype(I, /obj/item/weapon/c4))
+ if(istype(I, /obj/item/weapon/grenade) || istype(I, /obj/item/weapon/grenade/plastic/c4))
if(explosive)
to_chat(user, "There is already a device attached behind \the [src], remove it first.")
return 1
@@ -268,11 +268,6 @@
var/obj/item/weapon/grenade/G = explosive
explosive = null
G.prime()
- else if(istype(explosive, /obj/item/weapon/c4))
- var/obj/item/weapon/c4/C = explosive
- explosive = null
- C.target = get_step(get_turf(src), dir)
- C.explode(get_turf(loc))
/obj/structure/sign/picture_frame/proc/toggle_tilt(mob/user)
if(!isliving(usr) || usr.stat)
@@ -312,4 +307,4 @@
/obj/structure/sign/picture_frame/hear_message(mob/living/M as mob, msg)
..()
for(var/obj/O in contents)
- O.hear_message(M, msg)
\ No newline at end of file
+ O.hear_message(M, msg)
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 5f0b10febb2..cebdab67d65 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -1,3 +1,5 @@
+#define EMAG_DELAY 50
+
/obj/machinery/photocopier
name = "photocopier"
icon = 'icons/obj/library.dmi'
@@ -9,6 +11,7 @@
idle_power_usage = 30
active_power_usage = 200
power_channel = EQUIP
+ var/emag_cooldown
atom_say_verb = "bleeps"
var/obj/item/copyitem = null //what's in the copier!
var/copies = 1 //how many copies to print!
@@ -51,6 +54,9 @@
if(toner <= 0)
break
+ if(emag_cooldown > world.time)
+ return
+
if(istype(copyitem, /obj/item/weapon/paper))
copy(copyitem)
sleep(15)
@@ -237,9 +243,11 @@
G.take_damage(0, 30)
spawn(20)
H.emote("scream")
+ emag_cooldown = world.time + EMAG_DELAY
else
to_chat(ass, "Something smells toasty...")
ass.apply_damage(30, BURN)
+ emag_cooldown = world.time + EMAG_DELAY
if(ishuman(ass)) //Suit checks are in check_ass
var/mob/living/carbon/human/H = ass
temp_img = icon('icons/obj/butts.dmi', H.species.butt_sprite)
@@ -334,3 +342,5 @@
name = "toner cartridge"
icon_state = "tonercartridge"
var/toner_amount = 30
+
+#undef EMAG_DELAY
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 0d7bfe6889c..87ce338afd1 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -99,11 +99,22 @@
var/global/list/status_overlays_lighting
var/global/list/status_overlays_environ
var/indestructible = 0 // If set, prevents aliens from destroying it
+ var/keep_preset_name = 0
var/report_power_alarm = 1
var/shock_proof = 0 //if set to 1, this APC will not arc bolts of electricity if it's overloaded.
+/obj/machinery/power/apc/worn_out
+ name = "\improper Worn out APC"
+ keep_preset_name = 1
+ locked = 0
+ environ = 0
+ equipment = 0
+ lighting = 0
+ operating = 0
+
+
/obj/machinery/power/apc/noalarm
report_power_alarm = 0
@@ -192,15 +203,19 @@
cell.maxcharge = cell_type // cell_type is maximum charge (old default was 1000 or 2500 (values one and two respectively)
cell.charge = start_charge * cell.maxcharge / 100.0 // (convert percentage to actual value)
- var/area/A = src.loc.loc
+ var/area/A = get_area(src)
//if area isn't specified use current
- if(isarea(A) && src.areastring == null)
- src.area = A
+ if(keep_preset_name)
+ if(isarea(A))
+ area = A
+ // no-op, keep the name
+ else if(isarea(A) && src.areastring == null)
+ area = A
name = "\improper [area.name] APC"
else
- src.area = get_area_name(areastring)
+ area = get_area_name(areastring)
name = "\improper [area.name] APC"
area.apc |= src
update_icon()
@@ -623,7 +638,7 @@
else
if(istype(user, /mob/living/silicon))
return src.attack_hand(user)
- if (!opened && wiresexposed && \
+ if(!opened && wiresexposed && \
(istype(W, /obj/item/device/multitool) || \
istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/device/assembly/signaler)))
return src.attack_hand(user)
@@ -853,7 +868,7 @@
if(istype(user, /mob/living/silicon))
var/mob/living/silicon/ai/AI = user
var/mob/living/silicon/robot/robot = user
- if ( \
+ if( \
src.aidisabled || \
malfhack && istype(malfai) && \
( \
@@ -1382,4 +1397,4 @@
else
return 0
-#undef APC_UPDATE_ICON_COOLDOWN
\ No newline at end of file
+#undef APC_UPDATE_ICON_COOLDOWN
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 3a0a0b1df2a..8833e047a7e 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -82,6 +82,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
//
/obj/machinery/gravity_generator/main/station/initialize()
+ ..()
setup_parts()
middle.overlays += "activated"
update_list()
@@ -215,17 +216,17 @@ var/const/GRAV_NEEDS_WRENCH = 3
/obj/machinery/gravity_generator/main/attack_hand(mob/user as mob)
if(!..())
return interact(user)
-
+
/obj/machinery/gravity_generator/main/attack_ai(mob/user as mob)
return 1
-
+
/obj/machinery/gravity_generator/main/attack_ghost(mob/user as mob)
return interact(user)
/obj/machinery/gravity_generator/main/interact(mob/user as mob)
if(stat & BROKEN)
return
-
+
var/dat = "Gravity Generator Breaker: "
if(breaker)
dat += "ON OFF"
diff --git a/code/modules/power/treadmill.dm b/code/modules/power/treadmill.dm
index 8ae75a982a4..0dc2bbb5f76 100644
--- a/code/modules/power/treadmill.dm
+++ b/code/modules/power/treadmill.dm
@@ -138,6 +138,7 @@
var/redeem_immediately = 0 // redeem immediately for holding cell
/obj/machinery/treadmill_monitor/initialize()
+ ..()
if(id)
for(var/obj/machinery/power/treadmill/T in machines)
if(T.id == id)
@@ -222,4 +223,4 @@
#undef FONT_SIZE
#undef FONT_COLOR
#undef FONT_STYLE
-#undef CHARS_PER_LINE
\ No newline at end of file
+#undef CHARS_PER_LINE
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 0fe3d7645fd..fae10a20d01 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -655,25 +655,41 @@
else if(href_list["change_pill"])
#define MAX_PILL_SPRITE 20 //max icon state of the pill sprites
var/dat = ""
+ var/j = 0
for(var/i = 1 to MAX_PILL_SPRITE)
- dat += "![](\"pill[i].png\") |
"
+ j++
+ if(j == 1)
+ dat += ""
+ dat += " | "
+ if(j == 5)
+ dat += "
"
+ j = 0
dat += "
"
- usr << browse(dat, "window=chem_master")
+ usr << browse(dat, "window=chem_master_iconsel;size=225x193")
return
else if(href_list["change_bottle"])
#define MAX_BOTTLE_SPRITE 20 //max icon state of the bottle sprites
var/dat = ""
+ var/j = 0
for(var/i = 1 to MAX_BOTTLE_SPRITE)
- dat += "![](\"bottle[i].png\") |
"
+ j++
+ if(j == 1)
+ dat += ""
+ dat += " | "
+ if(j == 5)
+ dat += "
"
+ j = 0
dat += "
"
- usr << browse(dat, "window=chem_master")
+ usr << browse(dat, "window=chem_master_iconsel;size=225x193")
return
else if(href_list["pill_sprite"])
pillsprite = href_list["pill_sprite"]
+ usr << browse(null, "window=chem_master_iconsel")
else if(href_list["bottle_sprite"])
bottlesprite = href_list["bottle_sprite"]
+ usr << browse(null, "window=chem_master_iconsel")
- . = 1
+ nanomanager.update_uis(src)
return
/obj/machinery/chem_master/attack_ai(mob/user as mob)
@@ -689,13 +705,10 @@
return
/obj/machinery/chem_master/ui_interact(mob/user, ui_key="main", var/datum/nanoui/ui = null, var/force_open = 1)
- if(!(user.client in has_sprites))
- spawn()
- has_sprites += user.client
- for(var/i = 1 to MAX_PILL_SPRITE)
- usr << browse_rsc(icon('icons/obj/chemical.dmi', "pill" + num2text(i)), "pill[i].png")
- for(var/i = 1 to MAX_BOTTLE_SPRITE)
- usr << browse_rsc(icon('icons/obj/chemical.dmi', "bottle" + num2text(i)), "bottle[i].png")
+
+ var/datum/asset/chem_master/assets = get_asset_datum(/datum/asset/chem_master)
+ assets.send(user)
+
var/data = list()
data["condi"] = condi
diff --git a/code/modules/reagents/newchem/paradise_pop.dm b/code/modules/reagents/newchem/paradise_pop.dm
new file mode 100644
index 00000000000..4ba859c430e
--- /dev/null
+++ b/code/modules/reagents/newchem/paradise_pop.dm
@@ -0,0 +1,66 @@
+
+/*
+ Paradise Pop reagents
+ Created through the bottler machine via bottler_recipes, not through standard reactions
+ Eventually will have special effects (minor mostly) tied to their reagents, but for now are purely for flavor
+
+ Make sure to yell at me to finish giving them effects later
+ -FalseIncarnate
+*/
+
+
+//Paradise Punch: No effect, aside from maybe messages about how tasty it is or something
+/datum/reagent/paradise_punch
+ name = "Paradise Punch"
+ id = "paradise_punch"
+ description = "Tastes just how you'd think Paradise would if you could bottle it."
+ reagent_state = LIQUID
+ color = "#cc0044"
+
+//Apple-pocalypse: Low chance to cause a goonchem vortex that pulls things within a very small radius (2 tiles?) towards the drinker
+/datum/reagent/apple_pocalypse
+ name = "Apple-pocalypse"
+ id = "apple-pocalypse"
+ description = "If doomsday came in fruit form, it'd probably be apples."
+ reagent_state = LIQUID
+ color = "#44FF44"
+
+//Berry Banned: This one is tasty and safe to drink, might have a low chance of healing a random damage type?
+/datum/reagent/berry_banned
+ name = "Berry Banned"
+ id = "berry_banned"
+ description = "Reason for ban: Excessive Flavor."
+ reagent_state = LIQUID
+ color = "#FF44FF"
+
+//Berry Banned 2: This one is tasty and toxic. Deals toxin damage and MAYBE plays the "BWOINK!" sound if it kills someone?
+/datum/reagent/berry_banned2
+ name = "Berry Banned"
+ id = "berry_banned2"
+ description = "Reason for ban: Excessive Flavor."
+ reagent_state = LIQUID
+ color = "#FF44FF"
+
+//Blackeye Brew: Chance to make the drinker say greytider-themed things like "I thought clown was valid!"
+/datum/reagent/blackeye_brew
+ name = "Blackeye Brew"
+ id = "blackeye_brew"
+ description = "Creamy, smooth flavor, just like the bald heads of the masses. Supposedly aged for 30 years."
+ reagent_state = LIQUID
+ color = "#4d2600"
+
+//Grape Granade: causes the drinker to sometimes burp, has a low chance to cause a goonchem vortex that pushes things within a very small radius (1-2 tiles) away from the drinker
+/datum/reagent/grape_granade
+ name = "Grape Granade"
+ id = "grape_granade"
+ description = "Exploding with grape flavor and a favorite among ERT members system-wide."
+ reagent_state = LIQUID
+ color = "#9933ff"
+
+//Meteor Malt: Sometimes causes screen shakes for the drinker like a meteor impact, low chance to add 1-5 units of a random mineral reagent to the drinker's blood (iron, copper, silver, gold, uranium, carbon, etc)
+/datum/reagent/meteor_malt
+ name = "Meteor Malt"
+ id = "meteor_malt"
+ description = "Soft drinks have been detected on collision course with your tastebuds."
+ reagent_state = LIQUID
+ color = "#cc9900"
diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm
index 611649dcf80..d114460b244 100644
--- a/code/modules/reagents/reagent_containers/food/cans.dm
+++ b/code/modules/reagents/reagent_containers/food/cans.dm
@@ -1,6 +1,7 @@
/obj/item/weapon/reagent_containers/food/drinks/cans
- var canopened = 0
- var is_glass = 0
+ var/canopened = 0
+ var/is_glass = 0
+ var/is_plastic = 0
/obj/item/weapon/reagent_containers/food/drinks/cans/New()
..()
@@ -16,6 +17,9 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/proc/crush(mob/user)
var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(user.loc)
crushed_can.icon_state = icon_state
+ //inherit material vars for recycling purposes
+ crushed_can.is_glass = is_glass
+ crushed_can.is_plastic = is_plastic
if(is_glass)
playsound(user.loc, 'sound/effects/Glassbr3.ogg', rand(10, 50), 1)
crushed_can.name = "broken bottle"
@@ -85,6 +89,7 @@
name = "Bottled Water"
desc = "Introduced to the vending machines by Skrellian request, this water comes straight from the Martian poles."
icon_state = "waterbottle"
+ is_plastic = 1
New()
..()
reagents.add_reagent("water", 30)
@@ -259,3 +264,62 @@
New()
..()
reagents.add_reagent("synthanol", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler
+ name = "generic beverage container"
+ desc = "this shouldn't ever be spawned. shame on you"
+ icon_state = "glass_bottle"
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/on_reagent_change()
+ update_icon()
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/pickup(mob/user)
+ ..()
+ update_icon()
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/dropped(mob/user)
+ ..()
+ update_icon()
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/attack_hand()
+ ..()
+ update_icon()
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/update_icon()
+ overlays.Cut()
+
+ if(reagents.total_volume)
+ var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
+
+ switch(round(reagents.total_volume))
+ if(0 to 9)
+ filling.icon_state = "[icon_state]-10"
+ if(10 to 19)
+ filling.icon_state = "[icon_state]10"
+ if(20 to 29)
+ filling.icon_state = "[icon_state]20"
+ if(30 to 39)
+ filling.icon_state = "[icon_state]30"
+ if(40 to 49)
+ filling.icon_state = "[icon_state]40"
+ if(50 to INFINITY)
+ filling.icon_state = "[icon_state]50"
+
+ filling.icon += mix_color_from_reagents(reagents.reagent_list)
+ overlays += filling
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/glass_bottle
+ name = "glass bottle"
+ desc = "A glass bottle suitable for beverages."
+ icon_state = "glass_bottle"
+ is_glass = 1
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/plastic_bottle
+ name = "plastic bottle"
+ desc = "A plastic bottle suitable for beverages."
+ icon_state = "plastic_bottle"
+ is_plastic = 1
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bottler/metal_can
+ name = "metal can"
+ desc = "A metal can suitable for beverages."
+ icon_state = "metal_can"
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index c8819cfe071..c63a857ea0a 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -146,7 +146,7 @@
return
else
return 1
- if ( \
+ if( \
!isturf(src.loc) || \
!(locate(/obj/structure/table) in src.loc) && \
!(locate(/obj/machinery/optable) in src.loc) && \
@@ -712,6 +712,18 @@
reagents.add_reagent("toxin", 3)
bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/lizardmeat
+ name = "mutant lizard meat"
+ desc = "Seems to be a slab of meat from some mutant lizard thing?"
+ icon_state = "xenomeat"
+ filling_color = "#43DE18"
+
+ New()
+ ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("toxin", 3)
+ bitesize = 3
+
/obj/item/weapon/reagent_containers/food/snacks/spiderleg
name = "spider leg"
desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?"
diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm
index 3e23348881f..686c4234bc2 100644
--- a/code/modules/reagents/reagent_containers/glass_containers.dm
+++ b/code/modules/reagents/reagent_containers/glass_containers.dm
@@ -205,13 +205,20 @@
var/percent = round((reagents.total_volume / volume) * 100)
switch(percent)
- if(0 to 9) filling.icon_state = "[icon_state]-10"
- if(10 to 24) filling.icon_state = "[icon_state]10"
- if(25 to 49) filling.icon_state = "[icon_state]25"
- if(50 to 74) filling.icon_state = "[icon_state]50"
- if(75 to 79) filling.icon_state = "[icon_state]75"
- if(80 to 90) filling.icon_state = "[icon_state]80"
- if(91 to INFINITY) filling.icon_state = "[icon_state]100"
+ if(0 to 9)
+ filling.icon_state = "[icon_state]-10"
+ if(10 to 24)
+ filling.icon_state = "[icon_state]10"
+ if(25 to 49)
+ filling.icon_state = "[icon_state]25"
+ if(50 to 74)
+ filling.icon_state = "[icon_state]50"
+ if(75 to 79)
+ filling.icon_state = "[icon_state]75"
+ if(80 to 90)
+ filling.icon_state = "[icon_state]80"
+ if(91 to INFINITY)
+ filling.icon_state = "[icon_state]100"
filling.icon += mix_color_from_reagents(reagents.reagent_list)
overlays += filling
diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm
index 8a056d3e67d..0f23b2a6532 100644
--- a/code/modules/research/designs/equipment_designs.dm
+++ b/code/modules/research/designs/equipment_designs.dm
@@ -21,6 +21,16 @@
build_path = /obj/item/clothing/glasses/hud/health
category = list("Equipment")
+/datum/design/health_hud_night
+ name = "Night Vision Health Scanner HUD"
+ desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
+ id = "health_hud_night"
+ req_tech = list("biotech" = 4, "magnets" = 5)
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_URANIUM = 1000, MAT_SILVER = 250)
+ build_path = /obj/item/clothing/glasses/hud/health/night
+ category = list("Equipment")
+
/datum/design/magboots
name = "Magnetic Boots"
desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle."
@@ -41,14 +51,14 @@
build_path = /obj/item/clothing/glasses/night
category = list("Equipment")
-/datum/design/health_hud_night
- name = "Night Vision Health Scanner HUD"
- desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
- id = "health_hud_night"
- req_tech = list("biotech" = 4, "magnets" = 5)
+/datum/design/security_hud
+ name = "Security HUD"
+ desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status."
+ id = "security_hud"
+ req_tech = list("magnets" = 3, "combat" = 2)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_URANIUM = 1000, MAT_SILVER = 250)
- build_path = /obj/item/clothing/glasses/hud/health/night
+ materials = list(MAT_METAL = 50, MAT_GLASS = 50)
+ build_path = /obj/item/clothing/glasses/hud/security
category = list("Equipment")
/datum/design/security_hud_night
@@ -61,16 +71,6 @@
build_path = /obj/item/clothing/glasses/hud/security/night
category = list("Equipment")
-/datum/design/nvgmesons
- name = "Night Vision Optical Meson Scanners"
- desc = "Prototype meson scanners fitted with an extra sensor which amplifies the visible light spectrum and overlays it to the UHD display."
- id = "nvgmesons"
- req_tech = list("materials" = 5, "magnets" = 5, "engineering" = 4)
- build_type = PROTOLATHE
- materials = list(MAT_METAL = 300, MAT_GLASS = 400, MAT_PLASMA = 250, MAT_URANIUM = 1000)
- build_path = /obj/item/clothing/glasses/meson/night
- category = list("Equipment")
-
/datum/design/mesons
name = "Optical Meson Scanners"
desc = "Used for seeing walls, floors, and stuff through anything."
@@ -81,14 +81,14 @@
build_path = /obj/item/clothing/glasses/meson
category = list("Equipment")
-/datum/design/security_hud
- name = "Security HUD"
- desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status."
- id = "security_hud"
- req_tech = list("magnets" = 3, "combat" = 2)
+/datum/design/nvgmesons
+ name = "Night Vision Optical Meson Scanners"
+ desc = "Prototype meson scanners fitted with an extra sensor which amplifies the visible light spectrum and overlays it to the UHD display."
+ id = "nvgmesons"
+ req_tech = list("materials" = 5, "magnets" = 5, "engineering" = 4)
build_type = PROTOLATHE
- materials = list(MAT_METAL = 50, MAT_GLASS = 50)
- build_path = /obj/item/clothing/glasses/hud/security
+ materials = list(MAT_METAL = 300, MAT_GLASS = 400, MAT_PLASMA = 250, MAT_URANIUM = 1000)
+ build_path = /obj/item/clothing/glasses/meson/night
category = list("Equipment")
/datum/design/air_horn
@@ -170,3 +170,23 @@
materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$plasma" = 300)
build_path = /obj/item/clothing/glasses/hud/diagnostic/night
category = list("Equipment")
+
+/datum/design/hydroponic_hud
+ name = "Hydroponic HUD"
+ desc = "A HUD used to analyze the health and status of plants growing in hydro trays and soil."
+ id = "hydroponic_hud"
+ req_tech = list("magnets" = 3, "biotech" = 3)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 50, "$glass" = 50)
+ build_path = /obj/item/clothing/glasses/hud/hydroponic
+ category = list("Equipment")
+
+/datum/design/hydroponic_hud_night
+ name = "Night Vision Hydroponic HUD"
+ desc = "A HUD used to analyze the health and status of plants growing in low-light environments."
+ id = "hydroponic_hud_night"
+ req_tech = list("magnets" = 5, "biotech" = 4)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$plasma" = 200)
+ build_path = /obj/item/clothing/glasses/hud/hydroponic/night
+ category = list("Equipment")
\ No newline at end of file
diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm
index 6cbe31a7ed9..1b1788eb1a1 100644
--- a/code/modules/research/xenoarchaeology/finds/finds.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds.dm
@@ -296,9 +296,7 @@
if(20)
//arcane clothing
apply_prefix = 0
- var/list/possible_spawns = list(/obj/item/clothing/head/culthood,
- /obj/item/clothing/head/magus,
- /obj/item/clothing/head/culthood/alt,
+ var/list/possible_spawns = list(/obj/item/clothing/head/magus,
/obj/item/clothing/head/helmet/space/cult)
var/new_type = pick(possible_spawns)
diff --git a/code/modules/ruins/ruin_areas.dm b/code/modules/ruins/ruin_areas.dm
new file mode 100644
index 00000000000..fc51dcc0155
--- /dev/null
+++ b/code/modules/ruins/ruin_areas.dm
@@ -0,0 +1,49 @@
+//Parent types
+
+/area/ruin/
+ name = "\improper Unexplored Location"
+ icon_state = "away"
+ has_gravity = 1
+ there_can_be_many = 1
+
+
+/area/ruin/unpowered
+ always_unpowered = 0
+
+/area/ruin/unpowered/no_grav
+ has_gravity = 0
+
+/area/ruin/powered
+ requires_power = 0
+
+
+
+
+//Areas
+
+/area/ruin/unpowered/no_grav/way_home
+ name = "\improper Salvation"
+ icon_state = "away"
+
+/area/ruin/powered/snow_biodome
+
+/area/ruin/powered/golem_ship
+ name = "Free Golem Ship"
+
+// Ruins of "onehalf" ship
+/area/ruin/onehalf/hallway
+ name = "Hallway"
+ icon_state = "hallC"
+
+
+/area/ruin/onehalf/drone_bay
+ name = "Mining Drone Bay"
+ icon_state = "engine"
+
+/area/ruin/onehalf/dorms_med
+ name = "Crew Quarters"
+ icon_state = "Sleep"
+
+/area/ruin/onehalf/bridge
+ name = "Bridge"
+ icon_state = "bridge"
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 663f2677725..f076c7ee977 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -843,7 +843,7 @@
name = "\improper Airtight plastic flaps"
desc = "Heavy duty, airtight, plastic flaps."
-/obj/structure/plasticflaps/mining/New()
+/obj/structure/plasticflaps/mining/initialize()
air_update_turf(1)
..()
@@ -857,4 +857,4 @@
#undef ORDER_SCREEN_WIDTH
#undef ORDER_SCREEN_HEIGHT
#undef SUPPLY_SCREEN_WIDTH
-#undef SUPPLY_SCREEN_HEIGHT
\ No newline at end of file
+#undef SUPPLY_SCREEN_HEIGHT
diff --git a/code/modules/spacial_allocator/zlevel.dm b/code/modules/spacial_allocator/zlevel.dm
new file mode 100644
index 00000000000..8b8bec70b87
--- /dev/null
+++ b/code/modules/spacial_allocator/zlevel.dm
@@ -0,0 +1,73 @@
+/datum/zlevel
+ var/flags = 0
+ var/dirt_count = 0
+ var/zpos
+ var/list/init_list = list()
+
+/datum/zlevel/New(z)
+ zpos = z
+
+/datum/zlevel/proc/resume_init()
+ if(dirt_count > 0)
+ throw EXCEPTION("Init told to resume when z-level still dirty. Z level: '[zpos]'")
+ log_debug("Releasing freeze on z-level '[zpos]'!")
+ log_debug("Beginning initialization!")
+ var/list/our_atoms = init_list // OURS NOW!!! (Keeping this list to ourselves will prevent hijack)
+ init_list = list()
+ var/list/late_maps = list()
+ var/list/pipes = list()
+ var/list/cables = list()
+ var/watch = start_watch()
+ for(var/schmoo in our_atoms)
+ var/atom/movable/AM = schmoo
+ if(AM) // to catch stuff like the nuke disk that no longer exists
+
+ // This can mess with our state - we leave these for last
+ if(istype(AM, /obj/effect/landmark/map_loader))
+ late_maps.Add(AM)
+ continue
+ AM.initialize()
+ if(istype(AM, /obj/machinery/atmospherics))
+ pipes.Add(AM)
+ else if(istype(AM, /obj/structure/cable))
+ cables.Add(AM)
+ log_debug("Primary initialization finished in [stop_watch(watch)]s.")
+ our_atoms.Cut()
+ if(pipes.len)
+ do_pipes(pipes)
+ if(cables.len)
+ do_cables(cables)
+ if(late_maps.len)
+ do_late_maps(late_maps)
+
+/datum/zlevel/proc/do_pipes(list/pipes)
+ var/watch = start_watch()
+ log_debug("Building pipenets on z-level '[zpos]'!")
+ for(var/schmoo in pipes)
+ var/obj/machinery/atmospherics/machine = schmoo
+ if(machine)
+ machine.build_network()
+ pipes.Cut()
+ log_debug("Took [stop_watch(watch)]s")
+
+/datum/zlevel/proc/do_cables(list/cables)
+ var/watch = start_watch()
+ log_debug("Building powernets on z-level '[zpos]'!")
+ for(var/schmoo in cables)
+ var/obj/structure/cable/C = schmoo
+ if(C)
+ makepowernet_for(C)
+ cables.Cut()
+ log_debug("Took [stop_watch(watch)]s")
+
+/datum/zlevel/proc/do_late_maps(list/late_maps)
+ var/watch = start_watch()
+ log_debug("Loading map templates on z-level '[zpos]'!")
+ zlevels.add_dirt(zpos) // Let's not repeatedly resume init for each template
+ for(var/schmoo in late_maps)
+ var/obj/effect/landmark/map_loader/ML = schmoo
+ if(ML)
+ ML.initialize()
+ late_maps.Cut()
+ zlevels.remove_dirt(zpos)
+ log_debug("Took [stop_watch(watch)]s")
diff --git a/code/modules/spacial_allocator/zlevel_manager.dm b/code/modules/spacial_allocator/zlevel_manager.dm
new file mode 100644
index 00000000000..3c6fb0a0048
--- /dev/null
+++ b/code/modules/spacial_allocator/zlevel_manager.dm
@@ -0,0 +1,89 @@
+var/global/datum/zlev_manager/zlevels = new
+
+/datum/zlev_manager
+ // A list of z-levels
+ var/list/z_list = list()
+
+
+// Populate our z level list
+/datum/zlev_manager/proc/initialize()
+ z_list.len = world.maxz
+ for(var/i = 1, i <= world.maxz, i++)
+ z_list[i] = new /datum/zlevel(i)
+
+
+
+/datum/zlev_manager/proc/get_zlev(z)
+ if(z < 1)
+ throw EXCEPTION("Non-positive z level given!")
+ else if(z > z_list.len)
+ throw EXCEPTION("Untracked z level: '[z]'")
+ else
+ return z_list[z]
+
+// For when you need the z-level to be at a certain point
+/datum/zlev_manager/proc/increase_max_zlevel_to(new_maxz)
+ if(world.maxz>=new_maxz)
+ return
+ while(world.maxznew_maxz)
+ kill_topmost_zlevel()
+
+// Decrements the max z-level by one
+// not normally used, but hey the swapmap loader wanted it
+/datum/zlev_manager/proc/kill_topmost_zlevel()
+ var/our_z = world.maxz
+ qdel(z_list[our_z])
+ z_list.len--
+ world.maxz--
+
+/*
+* "Dirt" management
+* "Dirt" is used to keep track of whether a z level should automatically have
+* stuff on it initialize or not - the map loaders, when set to defer init, place
+* a freeze on the z levels they touch so as to prevent atmos from exploding,
+* among other things
+*/
+
+
+// Returns whether the given z level has a freeze on initialization
+/datum/zlev_manager/proc/is_zlevel_dirty(z)
+ var/datum/zlevel/our_z = get_zlev(z)
+ return (our_z.dirt_count > 0)
+
+
+// Increases the dirt count on a z level
+/datum/zlev_manager/proc/add_dirt(z)
+ var/datum/zlevel/our_z = get_zlev(z)
+ if(our_z.dirt_count == 0)
+ log_debug("Placing an init freeze on z-level '[our_z.zpos]'!")
+ our_z.dirt_count++
+
+
+// Decreases the dirt count on a z level
+/datum/zlev_manager/proc/remove_dirt(z)
+ var/datum/zlevel/our_z = get_zlev(z)
+ our_z.dirt_count--
+ if(our_z.dirt_count == 0)
+ our_z.resume_init()
+ if(our_z.dirt_count < 0)
+ log_debug("WARNING: Imbalanced dirt removal")
+ our_z.dirt_count = 0
+
+/datum/zlev_manager/proc/postpone_init(z, thing)
+ var/datum/zlevel/our_z = get_zlev(z)
+ our_z.init_list.Add(thing)
diff --git a/code/world.dm b/code/world.dm
index a829cbde35a..e11070d8e79 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -41,9 +41,6 @@ var/global/datum/global_init/init = new ()
timezoneOffset = text2num(time2text(0,"hh")) * 36000
- if(config && config.log_runtime)
- log = file("data/logs/runtime/[time2text(world.realtime,"YYYY-MM-DD-(hh-mm-ss)")]-runtime.log")
-
callHook("startup")
src.update_status()
diff --git a/config/example/config.txt b/config/example/config.txt
index ca829933479..2f723c704f4 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -24,7 +24,7 @@ JOBS_HAVE_MINIMAL_ACCESS
## log OOC channel
LOG_OOC
-## log client Say
+## log client Say
LOG_SAY
## log admin actions
@@ -67,7 +67,7 @@ LOG_RUNTIME
KICK_INACTIVE
## probablities for game modes chosen in "secret" and "random" modes
-##
+##
## default probablity is 1, increase to make that mode more likely to be picked
## set to 0 to disable that mode
PROBABILITY EXTENDED 2
@@ -195,7 +195,7 @@ LOAD_JOBS_FROM_TXT
## Remove the # mark infront of this to forbid admins from posssessing the singularity.
#FORBID_SINGULO_POSSESSION
-## Remove the # to show a popup 'reply to' window to every non-admin that recieves an adminPM.
+## Remove the # to show a popup 'reply to' window to every non-admin that recieves an adminPM.
## The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off)
#POPUP_ADMIN_PM
@@ -260,7 +260,7 @@ GHOST_INTERACTION
## Default is "python" on Windows, "/usr/bin/env python2" on UNIX.
#PYTHON_PATH pythonw
-## Defines which Z-levels the station exists on.
+## Defines which Z-levels the station exists on.
STATION_LEVELS 1
## Defines which Z-levels are used for admin functionality, such as Central Command and the Syndicate Shuttle
@@ -304,6 +304,9 @@ PLAYER_REROUTE_CAP 0
## Disable the loading of away missions
#DISABLE_AWAY_MISSIONS
+## Disable the loading of space ruins
+DISABLE_SPACE_RUINS
+
## Uncomment to disable the OOC/LOOC channel by default.
#DISABLE_OOC
@@ -320,4 +323,4 @@ PLAYER_REROUTE_CAP 0
#DISABLE_CID_WARN_POPUP
## How many loadout points players may spend in character setup
-#MAX_LOADOUT_POINTS 5
\ No newline at end of file
+#MAX_LOADOUT_POINTS 5
diff --git a/config/example/spaceRuinBlacklist.txt b/config/example/spaceRuinBlacklist.txt
new file mode 100644
index 00000000000..148cdeef583
--- /dev/null
+++ b/config/example/spaceRuinBlacklist.txt
@@ -0,0 +1,24 @@
+#Listing maps here will blacklist them from generating in space.
+#Maps must be the full path to them
+#A list of maps valid to blacklist can be found at _maps\map_files\RandomRuins\SpaceRuins\_maplisting.txt
+#SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START
+
+#_maps/map_files/RandomRuins/SpaceRuins/way_home.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/derelict1.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/derelict2.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/derelict3.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/emptyshell.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/gasthelizards.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
+#_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm
diff --git a/html/changelog.html b/html/changelog.html
index bc903312b77..53d19fd8d73 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,91 @@
-->
+
13 July 2016
+
Ar3nn updated:
+
+ - Adds a silence button to newscasters, which will silence the regular update sounds
+
+
Chakirski updated:
+
+ - Adds new bacon sprites.
+ - Bacon can now be cooked from the grill. Just grill raw bacon.
+ - Raw cutlets are now sliceable into raw bacon strips.
+ - Plasma and N20 look more gassy.
+
+
DaveTheHeadcrab updated:
+
+ - Greys no longer speak in wingdings.
+ - Greys now have a species-specific language.
+
+
Fox McCloud updated:
+
+ - Overall borg power useage has been lowered
+ - Borgs who have completely run out of power can now still move around/see/talk, but they will be unable to interact with machinery/doors around them; they can still bump open doors, however. Borgs with no cell are still completely paralyzed and can't do anything.
+ - IPCs are now properly impacted by space's burn damage
+ - NT Rep's cane stuns for less and invokes a cooldown between use, similar to telebatons
+ - Oxygen damage number changed a bit; damage is based upon volume lost more now
+ - Species that have blood but are oxygen immune will now take tox damage
+ - Health analyzers will now work with species with exotic blood and inform the user what type of exotic blood they have
+ - Other machinery that display blood levels (op table, sleepers, advanced scanners, etc) will now work with exotic blood
+ - Changeling regen will now properly restore blood if you have exotic blood fix Fixes being blurry for 20+ minutes when you were low on blood for a mere 3 minutes
+ - Heart damage impacting blood volume removed
+ - Nutrition draining when low on blood removed
+ - Station cinematics shouldn't have inventory overlays over top of the animation
+ - Station cinematics should properly clear off the screen and delete now
+ - pAIs are no longer valid targets for gun turrets (like on the syndicate ship)
+ - Adds in Rathen's secret, a new spell for the wizard that AoE stuns
+ - Removed borg jetpacks
+ - Adds in borg ion pulse system; borgs with ion pulse enabled consume extra power for each turf they move but can travel on space. Can upgrade any borg, at R&D with an ion pulse upgrade
+ - Adds in cyborg self repair upgrade: very slowly repairs cyborgs at the cost of extra power. Available at R&D
+ - Mining cyborg module tweaked slightly: GPS, shovel, mini welding tool and mini extinguisher added, wrench and screwdriver removed
+ - reset borg module removes speed boost
+ - Fixes borg's stun arm bypassing shields
+
+
KasparoVy updated:
+
+ - Adds Vox compatible versions of all jumpskirts.
+ - Adds Vox compatible version of the CMO jumpsuit.
+
+
Krausus updated:
+
+ - Players will ALMOST DEFINITELY never get stuck as plants anymore. I mean it this time!
+ - Fixed morgue trays not updating themselves when you ghost into/out of your body.
+
+
Kyep updated:
+
+ - Changed access requirement on lethal injection locker to sec access (same access required for the chair its right next to.
+ - Changed access requirement on exile implant locker to armory access.
+ - Ghosts no longer miss out on ERTs due to not knowing it was called, or not being able to find the verb. They are now prompted about joining an ERT when one is called.
+ - Fixed a condition where 'we are assembling an ERT' message is broadcast, but no ERT is generated.
+ - Typo fixes in ERT messages.
+ - Entering a cryo pod, then deliberately selecting OOC->Ghost, and clicking yes on the prompt, will now instantly send you to long-term storage, removing you from the round, despawning your body, freeing your job slot, and giving a new objective to any antag that had you as a target.
+ - Announcements about someone entering long-term storage via a cryopod now include that person's rank.
+ - When an antag target cryos, the message the antag gets about their objectives changing is now clearer.
+
+
TheDZD updated:
+
+ - Adds "salts" as a say verb for deadchat ghosts.
+
+
TullyBurnalot updated:
+
+ - Universal Recorder added to NT Rep Locker
+ - Box of recorder tapes added to NT Rep and IAA Locker
+ - Fax Guide added to Captain, HoS, HoP, NT Rep and IAA Lockers
+ - Butt copy alert added to photocopiers
+ - Butt copy alert comes with *ping noise
+ - Photocopiers start with 60 toner
+
+
Twinmold updated:
+
+ - Vampires with sleeping carp (traitor+vampire rounds) can now suck people's blood like normal.
+
+
monster860 updated:
+
+ - The ChemMaster now uses NanoUI! Yey!
+ - Alerts are no broken ghostly outlines
+
+
09 July 2016
Chakirski updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 0479451006d..e620d091fe4 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2136,3 +2136,92 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
Twinmold:
- bugfix: Fixes the inconsistency of getting 2 metal rods when you wirecutter a
destroyed grille down to 1.
+2016-07-13:
+ Ar3nn:
+ - rscadd: Adds a silence button to newscasters, which will silence the regular update
+ sounds
+ Chakirski:
+ - imageadd: Adds new bacon sprites.
+ - rscadd: Bacon can now be cooked from the grill. Just grill raw bacon.
+ - tweak: Raw cutlets are now sliceable into raw bacon strips.
+ - tweak: Plasma and N20 look more gassy.
+ DaveTheHeadcrab:
+ - tweak: Greys no longer speak in wingdings.
+ - rscadd: Greys now have a species-specific language.
+ Fox McCloud:
+ - tweak: Overall borg power useage has been lowered
+ - tweak: Borgs who have completely run out of power can now still move around/see/talk,
+ but they will be unable to interact with machinery/doors around them; they can
+ still bump open doors, however. Borgs with no cell are still completely paralyzed
+ and can't do anything.
+ - tweak: IPCs are now properly impacted by space's burn damage
+ - tweak: NT Rep's cane stuns for less and invokes a cooldown between use, similar
+ to telebatons
+ - tweak: Oxygen damage number changed a bit; damage is based upon volume lost more
+ now
+ - tweak: Species that have blood but are oxygen immune will now take tox damage
+ - rscadd: Health analyzers will now work with species with exotic blood and inform
+ the user what type of exotic blood they have
+ - rscadd: Other machinery that display blood levels (op table, sleepers, advanced
+ scanners, etc) will now work with exotic blood
+ - bugfix: Changeling regen will now properly restore blood if you have exotic blood
+ fix Fixes being blurry for 20+ minutes when you were low on blood for a mere
+ 3 minutes
+ - tweak: Heart damage impacting blood volume removed
+ - tweak: Nutrition draining when low on blood removed
+ - bugfix: Station cinematics shouldn't have inventory overlays over top of the animation
+ - bugfix: Station cinematics should properly clear off the screen and delete now
+ - bugfix: pAIs are no longer valid targets for gun turrets (like on the syndicate
+ ship)
+ - rscadd: Adds in Rathen's secret, a new spell for the wizard that AoE stuns
+ - rscdel: Removed borg jetpacks
+ - rscadd: Adds in borg ion pulse system; borgs with ion pulse enabled consume extra
+ power for each turf they move but can travel on space. Can upgrade any borg,
+ at R&D with an ion pulse upgrade
+ - rscadd: 'Adds in cyborg self repair upgrade: very slowly repairs cyborgs at the
+ cost of extra power. Available at R&D'
+ - tweak: 'Mining cyborg module tweaked slightly: GPS, shovel, mini welding tool
+ and mini extinguisher added, wrench and screwdriver removed'
+ - tweak: reset borg module removes speed boost
+ - bugfix: Fixes borg's stun arm bypassing shields
+ KasparoVy:
+ - imageadd: Adds Vox compatible versions of all jumpskirts.
+ - imageadd: Adds Vox compatible version of the CMO jumpsuit.
+ Krausus:
+ - bugfix: Players will ALMOST DEFINITELY never get stuck as plants anymore. I mean
+ it this time!
+ - bugfix: Fixed morgue trays not updating themselves when you ghost into/out of
+ your body.
+ Kyep:
+ - tweak: Changed access requirement on lethal injection locker to sec access (same
+ access required for the chair its right next to.
+ - tweak: Changed access requirement on exile implant locker to armory access.
+ - tweak: Ghosts no longer miss out on ERTs due to not knowing it was called, or
+ not being able to find the verb. They are now prompted about joining an ERT
+ when one is called.
+ - bugfix: Fixed a condition where 'we are assembling an ERT' message is broadcast,
+ but no ERT is generated.
+ - bugfix: Typo fixes in ERT messages.
+ - tweak: Entering a cryo pod, then deliberately selecting OOC->Ghost, and clicking
+ yes on the prompt, will now instantly send you to long-term storage, removing
+ you from the round, despawning your body, freeing your job slot, and giving
+ a new objective to any antag that had you as a target.
+ - tweak: Announcements about someone entering long-term storage via a cryopod now
+ include that person's rank.
+ - tweak: When an antag target cryos, the message the antag gets about their objectives
+ changing is now clearer.
+ TheDZD:
+ - rscadd: Adds "salts" as a say verb for deadchat ghosts.
+ TullyBurnalot:
+ - rscadd: Universal Recorder added to NT Rep Locker
+ - rscadd: Box of recorder tapes added to NT Rep and IAA Locker
+ - rscadd: Fax Guide added to Captain, HoS, HoP, NT Rep and IAA Lockers
+ - rscadd: Butt copy alert added to photocopiers
+ - rscadd: Butt copy alert comes with *ping noise
+ - tweak: Photocopiers start with 60 toner
+ Twinmold:
+ - bugfix: Vampires with sleeping carp (traitor+vampire rounds) can now suck people's
+ blood like normal.
+ monster860:
+ - rscadd: The ChemMaster now uses NanoUI! Yey!
+ - bugfix: Alerts are no broken ghostly outlines
diff --git a/html/changelogs/AutoChangeLog-pr-4691.yml b/html/changelogs/AutoChangeLog-pr-4691.yml
new file mode 100644
index 00000000000..f5da3e847c1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4691.yml
@@ -0,0 +1,4 @@
+author: Tauka Usanake
+delete-after: True
+changes:
+ - rscadd: "Adds a Hydroponics HUD and a night vision version of it that can both be created in R&D. It provides additional details on plants in hydro trays and soil plots. Shows the health, nutrient, water, toxin, pest, and weed level of the plant as well as whenever it is ready to be harvested or is dead."
diff --git a/html/changelogs/AutoChangeLog-pr-4780.yml b/html/changelogs/AutoChangeLog-pr-4780.yml
new file mode 100644
index 00000000000..b12b862e58b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4780.yml
@@ -0,0 +1,9 @@
+author: CrAzYPiLoT
+delete-after: True
+changes:
+ - rscadd: "Ports randomized space ruins from /tg/ station. There is a number of maps which can be spawned at any location on the empty z-level at roundstart, and up to three random ones will be chosen each round. Credits to KorPhaeron."
+ - rscadd: "Lays the groundwork for a future lavaland implementation, if we choose to have it."
+ - rscadd: "Adds a feature to the map loader where areas with the right var set can be distinctly initialized on map load - meaning separate APCs, and the like."
+ - rscadd: "Using a z-level specific initialization freeze system, large elaborate maps like the cyberiad can be loaded without a single runtime, with minimal impact on the round elsewhere."
+ - rscadd: "Adds a delete mode to the \"Fill\" buildmode - just alt-click for the second corner, and everything within will be removed."
+ - rscadd: "Adds a \"Jump To\" function in VV, which is useful for getting an idea of what exactly you're looking at."
diff --git a/html/changelogs/AutoChangeLog-pr-4838.yml b/html/changelogs/AutoChangeLog-pr-4838.yml
new file mode 100644
index 00000000000..aaa0b54a91f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4838.yml
@@ -0,0 +1,6 @@
+author: FalseIncarnate
+delete-after: True
+changes:
+ - rscadd: "Adds new Bottler machine for making unique beverages! Order one from cargo today!"
+ - rscadd: "Adds 6 new drinks obtainable via the Bottler. Get brewing!"
+ - bugfix: "Grapes now can be properly juiced again, as they now have the right kitchen tag."
diff --git a/html/changelogs/AutoChangeLog-pr-4841.yml b/html/changelogs/AutoChangeLog-pr-4841.yml
deleted file mode 100644
index e3528f8993d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4841.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: DaveTheHeadcrab
-delete-after: True
-changes:
- - tweak: "Greys no longer speak in wingdings."
- - rscadd: "Greys now have a species-specific language."
diff --git a/html/changelogs/AutoChangeLog-pr-4843.yml b/html/changelogs/AutoChangeLog-pr-4843.yml
new file mode 100644
index 00000000000..4f34b686053
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4843.yml
@@ -0,0 +1,11 @@
+author: FreeStylaLT
+delete-after: True
+changes:
+ - rscadd: "Added courtroom, left of brig."
+ - tweak: "Remapped brig"
+ - tweak: "Moved prisoner processing and evidence storage to the right of brig, next to Detective's office."
+ - tweak: "Changed current processing to Interrogation and a hallway."
+ - tweak: "Re-mapped Conference and Locker rooms."
+ - tweak: "Lots of other minor tweaks to brig."
+ - tweak: "Seriously, way too many small changes to list here, go and have a look at the brig yourself."
+ - rscdel: "Removed temp. detainment and observation from brig."
diff --git a/html/changelogs/AutoChangeLog-pr-4895.yml b/html/changelogs/AutoChangeLog-pr-4895.yml
new file mode 100644
index 00000000000..c2a7433e6a0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-4895.yml
@@ -0,0 +1,4 @@
+author: TullyBBurnalot
+delete-after: True
+changes:
+ - tweak: "Handless cuffing no longer possible. Can still cuff people with one hand"
diff --git a/html/changelogs/AutoChangeLog-pr-4911.yml b/html/changelogs/AutoChangeLog-pr-4911.yml
deleted file mode 100644
index 9191d06bfd1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4911.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Kyep
-delete-after: True
-changes:
- - tweak: "Changed access requirement on lethal injection locker to sec access (same access required for the chair its right next to."
- - tweak: "Changed access requirement on exile implant locker to armory access."
diff --git a/html/changelogs/AutoChangeLog-pr-4916.yml b/html/changelogs/AutoChangeLog-pr-4916.yml
deleted file mode 100644
index 8df9fa04b87..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4916.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Ar3nn
-delete-after: True
-changes:
- - rscadd: "Adds a silence button to newscasters, which will silence the regular update sounds"
diff --git a/html/changelogs/AutoChangeLog-pr-4917.yml b/html/changelogs/AutoChangeLog-pr-4917.yml
deleted file mode 100644
index 5c7bd363b8e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4917.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: TullyBurnalot
-delete-after: True
-changes:
- - rscadd: "Universal Recorder added to NT Rep Locker"
- - rscadd: "Box of recorder tapes added to NT Rep and IAA Locker"
- - rscadd: "Fax Guide added to Captain, HoS, HoP, NT Rep and IAA Lockers"
- - rscadd: "Butt copy alert added to photocopiers"
- - rscadd: "Butt copy alert comes with *ping noise"
- - tweak: "Photocopiers start with 60 toner"
diff --git a/html/changelogs/AutoChangeLog-pr-4934.yml b/html/changelogs/AutoChangeLog-pr-4934.yml
deleted file mode 100644
index e789b4f517d..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4934.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Chakirski
-delete-after: True
-changes:
- - imageadd: "Adds new bacon sprites."
- - rscadd: "Bacon can now be cooked from the grill. Just grill raw bacon."
- - tweak: "Raw cutlets are now sliceable into raw bacon strips."
diff --git a/html/changelogs/AutoChangeLog-pr-4935.yml b/html/changelogs/AutoChangeLog-pr-4935.yml
deleted file mode 100644
index 40ed76b8432..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4935.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Twinmold
-delete-after: True
-changes:
- - bugfix: "Vampires with sleeping carp (traitor+vampire rounds) can now suck people's blood like normal."
diff --git a/html/changelogs/AutoChangeLog-pr-4951.yml b/html/changelogs/AutoChangeLog-pr-4951.yml
deleted file mode 100644
index 2f051f3949f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4951.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Kyep
-delete-after: True
-changes:
- - tweak: "Ghosts no longer miss out on ERTs due to not knowing it was called, or not being able to find the verb. They are now prompted about joining an ERT when one is called."
- - bugfix: "Fixed a condition where 'we are assembling an ERT' message is broadcast, but no ERT is generated."
- - bugfix: "Typo fixes in ERT messages."
diff --git a/html/changelogs/AutoChangeLog-pr-4952.yml b/html/changelogs/AutoChangeLog-pr-4952.yml
deleted file mode 100644
index eaf232c228a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4952.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes:
- - tweak: "Overall borg power useage has been lowered"
- - tweak: "Borgs who have completely run out of power can now still move around/see/talk, but they will be unable to interact with machinery/doors around them; they can still bump open doors, however. Borgs with no cell are still completely paralyzed and can't do anything."
diff --git a/html/changelogs/AutoChangeLog-pr-4959.yml b/html/changelogs/AutoChangeLog-pr-4959.yml
deleted file mode 100644
index 1d9e2845aa9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4959.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: TheDZD
-delete-after: True
-changes:
- - rscadd: "Adds \"salts\" as a say verb for deadchat ghosts."
diff --git a/html/changelogs/AutoChangeLog-pr-4961.yml b/html/changelogs/AutoChangeLog-pr-4961.yml
deleted file mode 100644
index a5f21055bcd..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4961.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: monster860
-delete-after: True
-changes:
- - rscadd: "The ChemMaster now uses NanoUI! Yey!"
diff --git a/html/changelogs/AutoChangeLog-pr-4962.yml b/html/changelogs/AutoChangeLog-pr-4962.yml
deleted file mode 100644
index d15c28ee3a9..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4962.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes:
- - tweak: "IPCs are now properly impacted by space's burn damage"
diff --git a/html/changelogs/AutoChangeLog-pr-4964.yml b/html/changelogs/AutoChangeLog-pr-4964.yml
deleted file mode 100644
index cca341018b1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4964.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Kyep
-delete-after: True
-changes:
- - tweak: "Entering a cryo pod, then deliberately selecting OOC->Ghost, and clicking yes on the prompt, will now instantly send you to long-term storage, removing you from the round, despawning your body, freeing your job slot, and giving a new objective to any antag that had you as a target."
- - tweak: "Announcements about someone entering long-term storage via a cryopod now include that person's rank."
- - tweak: "When an antag target cryos, the message the antag gets about their objectives changing is now clearer."
diff --git a/html/changelogs/AutoChangeLog-pr-4966.yml b/html/changelogs/AutoChangeLog-pr-4966.yml
deleted file mode 100644
index 2f49fb22cbb..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4966.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes:
- - tweak: "NT Rep's cane stuns for less and invokes a cooldown between use, similar to telebatons"
diff --git a/html/changelogs/AutoChangeLog-pr-4968.yml b/html/changelogs/AutoChangeLog-pr-4968.yml
deleted file mode 100644
index adec06f4144..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4968.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes:
- - tweak: "Oxygen damage number changed a bit; damage is based upon volume lost more now"
- - tweak: "Species that have blood but are oxygen immune will now take tox damage"
- - rscadd: "Health analyzers will now work with species with exotic blood and inform the user what type of exotic blood they have"
- - rscadd: "Other machinery that display blood levels (op table, sleepers, advanced scanners, etc) will now work with exotic blood"
- - bugfix: "Changeling regen will now properly restore blood if you have exotic blood
-fix Fixes being blurry for 20+ minutes when you were low on blood for a mere 3 minutes"
- - tweak: "Heart damage impacting blood volume removed"
- - tweak: "Nutrition draining when low on blood removed"
diff --git a/html/changelogs/AutoChangeLog-pr-4970.yml b/html/changelogs/AutoChangeLog-pr-4970.yml
deleted file mode 100644
index 30561fba155..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4970.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: KasparoVy
-delete-after: True
-changes:
- - imageadd: "Adds Vox compatible versions of all jumpskirts."
- - imageadd: "Adds Vox compatible version of the CMO jumpsuit."
diff --git a/html/changelogs/AutoChangeLog-pr-4975.yml b/html/changelogs/AutoChangeLog-pr-4975.yml
deleted file mode 100644
index d87aee8d714..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4975.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes:
- - bugfix: "Station cinematics shouldn't have inventory overlays over top of the animation"
- - bugfix: "Station cinematics should properly clear off the screen and delete now"
diff --git a/html/changelogs/AutoChangeLog-pr-4976.yml b/html/changelogs/AutoChangeLog-pr-4976.yml
deleted file mode 100644
index ae783b1d4a4..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4976.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: monster860
-delete-after: True
-changes:
- - bugfix: "Alerts are no broken ghostly outlines"
diff --git a/html/changelogs/AutoChangeLog-pr-4978.yml b/html/changelogs/AutoChangeLog-pr-4978.yml
deleted file mode 100644
index f1140de1da8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4978.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Krausus
-delete-after: True
-changes:
- - bugfix: "Players will ALMOST DEFINITELY never get stuck as plants anymore. I mean it this time!"
diff --git a/html/changelogs/AutoChangeLog-pr-4979.yml b/html/changelogs/AutoChangeLog-pr-4979.yml
deleted file mode 100644
index ea98f89744f..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4979.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes:
- - bugfix: "pAIs are no longer valid targets for gun turrets (like on the syndicate ship)"
diff --git a/html/changelogs/AutoChangeLog-pr-4980.yml b/html/changelogs/AutoChangeLog-pr-4980.yml
deleted file mode 100644
index e1f70d1aa58..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4980.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes:
- - rscadd: "Adds in Rathen's secret, a new spell for the wizard that AoE stuns"
diff --git a/html/changelogs/AutoChangeLog-pr-4987.yml b/html/changelogs/AutoChangeLog-pr-4987.yml
deleted file mode 100644
index 058b661fa14..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4987.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes:
- - rscdel: "Removed borg jetpacks"
- - rscadd: "Adds in borg ion pulse system; borgs with ion pulse enabled consume extra power for each turf they move but can travel on space. Can upgrade any borg, at R&D with an ion pulse upgrade"
- - rscadd: "Adds in cyborg self repair upgrade: very slowly repairs cyborgs at the cost of extra power. Available at R&D"
- - tweak: "Mining cyborg module tweaked slightly: GPS, shovel, mini welding tool and mini extinguisher added, wrench and screwdriver removed"
- - tweak: "reset borg module removes speed boost"
diff --git a/html/changelogs/AutoChangeLog-pr-4989.yml b/html/changelogs/AutoChangeLog-pr-4989.yml
deleted file mode 100644
index e68a59d92e6..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4989.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes:
- - bugfix: "Fixes borg's stun arm bypassing shields"
diff --git a/html/changelogs/AutoChangeLog-pr-4991.yml b/html/changelogs/AutoChangeLog-pr-4991.yml
deleted file mode 100644
index abb6fbabd11..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4991.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Krausus
-delete-after: True
-changes:
- - bugfix: "Fixed morgue trays not updating themselves when you ghost into/out of your body."
diff --git a/html/changelogs/AutoChangeLog-pr-4992.yml b/html/changelogs/AutoChangeLog-pr-4992.yml
deleted file mode 100644
index 28c4e2a7362..00000000000
--- a/html/changelogs/AutoChangeLog-pr-4992.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Chakirski
-delete-after: True
-changes:
- - tweak: "Plasma and N20 look more gassy."
diff --git a/html/changelogs/AutoChangeLog-pr-5002.yml b/html/changelogs/AutoChangeLog-pr-5002.yml
new file mode 100644
index 00000000000..2cc493a1396
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5002.yml
@@ -0,0 +1,5 @@
+author: Chakirski
+delete-after: True
+changes:
+ - imageadd: "Adds M.E. Reaper sprite."
+ - rscadd: "AI can now choose a 32x64 reaper hologram."
diff --git a/html/changelogs/AutoChangeLog-pr-5006.yml b/html/changelogs/AutoChangeLog-pr-5006.yml
new file mode 100644
index 00000000000..bdb7ca07b95
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5006.yml
@@ -0,0 +1,5 @@
+author: Fox McCloud
+delete-after: True
+changes:
+ - rscadd: "Adds in fans which can block atmospherics passing over them"
+ - bugfix: "All mass driver blast doors have a fan underneath them, allowing you to use them repeatedly instead of once"
diff --git a/html/changelogs/AutoChangeLog-pr-5010.yml b/html/changelogs/AutoChangeLog-pr-5010.yml
new file mode 100644
index 00000000000..c271978add0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5010.yml
@@ -0,0 +1,4 @@
+author: Ar3nn
+delete-after: True
+changes:
+ - rscdel: "Gets rid of some weird lattices floating in mid-space"
diff --git a/html/changelogs/AutoChangeLog-pr-5011.yml b/html/changelogs/AutoChangeLog-pr-5011.yml
new file mode 100644
index 00000000000..382c456aa44
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5011.yml
@@ -0,0 +1,4 @@
+author: TullyBurnalot
+delete-after: True
+changes:
+ - rscadd: "When emagged, Photocopiers now have a cooldown if used to copy butts"
diff --git a/html/changelogs/AutoChangeLog-pr-5014.yml b/html/changelogs/AutoChangeLog-pr-5014.yml
new file mode 100644
index 00000000000..d0e42fdf454
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5014.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes:
+ - bugfix: "Fixes medical, security, and employment records not being displayed"
diff --git a/html/changelogs/AutoChangeLog-pr-5037.yml b/html/changelogs/AutoChangeLog-pr-5037.yml
new file mode 100644
index 00000000000..16ea58b944e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5037.yml
@@ -0,0 +1,7 @@
+author: monster860
+delete-after: True
+changes:
+ - rscadd: "The ChemMaster now uses the asset cache, eliminating the enormous lag spike when you first use it. Yey!"
+ - bugfix: "Fixes the window not closing when selecting an icon for the chem-master"
+ - bugfix: "Fixes the chem master window not updating when selecting an icon"
+ - tweak: "The chem-master icon selection window now has a 4x5 grid of icons."
diff --git a/html/changelogs/AutoChangeLog-pr-5041.yml b/html/changelogs/AutoChangeLog-pr-5041.yml
new file mode 100644
index 00000000000..e2e9b771382
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5041.yml
@@ -0,0 +1,6 @@
+author: DaveTheHeadcrab
+delete-after: True
+changes:
+ - tweak: "Plastic explosives are now a subtype of grenades. Shouldn't be any noticable difference for players."
+ - tweak: "Plastic explosives no longer use the wire datum. You may directly attach an assembly holder (Such as a remote signaller + igniter assembly)"
+ - rscadd: "Adds X-4 shaped charges, designed for breaching explosively without harming the user. Pick some up at your local nukies r us."
diff --git a/html/changelogs/AutoChangeLog-pr-5048.yml b/html/changelogs/AutoChangeLog-pr-5048.yml
new file mode 100644
index 00000000000..9bc066a0d59
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5048.yml
@@ -0,0 +1,4 @@
+author: Chakirski
+delete-after: True
+changes:
+ - tweak: "Cigarette packs no longer show near-duplicate messages when examined."
diff --git a/html/changelogs/AutoChangeLog-pr-5056.yml b/html/changelogs/AutoChangeLog-pr-5056.yml
new file mode 100644
index 00000000000..d61ca42084b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5056.yml
@@ -0,0 +1,5 @@
+author: KasparoVy
+delete-after: True
+changes:
+ - bugfix: "Wearing a suit will no longer cause runtimes due to the way suit-collars are handled."
+ - bugfix: "The north direction sprite of the Vulpkanin 'Patch' facial hair style won't hang a pixel off the head anymore."
diff --git a/icons/mob/ancient_machine.dmi b/icons/mob/ancient_machine.dmi
new file mode 100644
index 00000000000..190e48e7803
Binary files /dev/null and b/icons/mob/ancient_machine.dmi differ
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index 28399ab1ce1..402bf49bd5c 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 89719ebca26..63deb7f9acc 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index a6dd62c013e..92d1ac397ef 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index 0012ecc2d06..79df46605a2 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 27168c30865..0ac606eb617 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 2f7154777fd..1a84149f45f 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/species/vox/head.dmi b/icons/mob/species/vox/head.dmi
index b8203a5623d..930e24dfa86 100644
Binary files a/icons/mob/species/vox/head.dmi and b/icons/mob/species/vox/head.dmi differ
diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/species/vox/suit.dmi
index b8340ac1c9c..e4159ed2450 100644
Binary files a/icons/mob/species/vox/suit.dmi and b/icons/mob/species/vox/suit.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index ea31b07c4cb..a7da1046b05 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/assemblies.dmi b/icons/obj/assemblies.dmi
index 1a24c945dff..2fd457f5638 100644
Binary files a/icons/obj/assemblies.dmi and b/icons/obj/assemblies.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 6ad7d94bda7..0fc42d7bd4d 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 195d6137fca..224454d5245 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 9d6207aa2c3..abd21586fb5 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 36ba65a32e3..dd3633784a5 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi
index e0b3b047628..ad8268ad59d 100644
Binary files a/icons/obj/grenade.dmi and b/icons/obj/grenade.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index bf752f1ca21..301a990639e 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/lavaland/survival_pod.dmi b/icons/obj/lavaland/survival_pod.dmi
new file mode 100644
index 00000000000..62aad7854d2
Binary files /dev/null and b/icons/obj/lavaland/survival_pod.dmi differ
diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi
index 42ba9cf7f29..b82dcb47f3c 100644
Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ
diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi
index faea5fe4180..6edd905c554 100644
Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index cb1c5e0ded3..4baa2b25ae6 100755
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/paradise.dme b/paradise.dme
index fbbf5394196..2e8a0d0200b 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -199,6 +199,7 @@
#include "code\datums\periodic_news.dm"
#include "code\datums\progressbar.dm"
#include "code\datums\recipe.dm"
+#include "code\datums\ruins.dm"
#include "code\datums\spell.dm"
#include "code\datums\supplypacks.dm"
#include "code\datums\uplink_item.dm"
@@ -268,6 +269,7 @@
#include "code\datums\helper_datums\map_template.dm"
#include "code\datums\helper_datums\teleport.dm"
#include "code\datums\helper_datums\topic_input.dm"
+#include "code\datums\ruins\space.dm"
#include "code\datums\spells\area_teleport.dm"
#include "code\datums\spells\bloodcrawl.dm"
#include "code\datums\spells\charge.dm"
@@ -1123,6 +1125,8 @@
#include "code\modules\client\preference\loadout\loadout.dm"
#include "code\modules\client\preference\loadout\loadout_accessories.dm"
#include "code\modules\client\preference\loadout\loadout_general.dm"
+#include "code\modules\client\preference\loadout\loadout_hat.dm"
+#include "code\modules\client\preference\loadout\loadout_suit.dm"
#include "code\modules\client\preference\loadout\loadout_uniform.dm"
#include "code\modules\clothing\clothing.dm"
#include "code\modules\clothing\glasses\glasses.dm"
@@ -1175,6 +1179,7 @@
#include "code\modules\clothing\suits\alien.dm"
#include "code\modules\clothing\suits\armor.dm"
#include "code\modules\clothing\suits\bio.dm"
+#include "code\modules\clothing\suits\hood.dm"
#include "code\modules\clothing\suits\jobs.dm"
#include "code\modules\clothing\suits\labcoat.dm"
#include "code\modules\clothing\suits\miscellaneous.dm"
@@ -1323,6 +1328,8 @@
#include "code\modules\food\recipes_microwave.dm"
#include "code\modules\food\recipes_oven.dm"
#include "code\modules\food\recipes_table.dm"
+#include "code\modules\food\beverages\bottler.dm"
+#include "code\modules\food\beverages\bottler_recipes.dm"
#include "code\modules\garbage_collection\garbage_collector.dm"
#include "code\modules\garbage_collection\gc_testing.dm"
#include "code\modules\holiday\christmas.dm"
@@ -1821,6 +1828,7 @@
#include "code\modules\reagents\newchem\medicine.dm"
#include "code\modules\reagents\newchem\newchem_procs.dm"
#include "code\modules\reagents\newchem\other.dm"
+#include "code\modules\reagents\newchem\paradise_pop.dm"
#include "code\modules\reagents\newchem\patch.dm"
#include "code\modules\reagents\newchem\pyro.dm"
#include "code\modules\reagents\newchem\toxins.dm"
@@ -1958,6 +1966,7 @@
#include "code\modules\research\xenoarchaeology\tools\tools_pickaxe.dm"
#include "code\modules\research\xenobiology\xenobio_camera.dm"
#include "code\modules\research\xenobiology\xenobiology.dm"
+#include "code\modules\ruins\ruin_areas.dm"
#include "code\modules\scripting\Errors.dm"
#include "code\modules\scripting\Options.dm"
#include "code\modules\scripting\AST\AST Nodes.dm"
@@ -1990,6 +1999,8 @@
#include "code\modules\spacepods\parts.dm"
#include "code\modules\spacepods\pod_fabricator.dm"
#include "code\modules\spacepods\spacepod.dm"
+#include "code\modules\spacial_allocator\zlevel.dm"
+#include "code\modules\spacial_allocator\zlevel_manager.dm"
#include "code\modules\store\items.dm"
#include "code\modules\store\store.dm"
#include "code\modules\surgery\bones.dm"