diff --git a/code/modules/admin/verbs/randomverbs.dm.rej b/code/modules/admin/verbs/randomverbs.dm.rej
deleted file mode 100644
index 9941251566..0000000000
--- a/code/modules/admin/verbs/randomverbs.dm.rej
+++ /dev/null
@@ -1,25 +0,0 @@
-diff a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm (rejected hunks)
-@@ -1246,7 +1246,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
- to_chat(usr, "ERROR: Client not found.")
- return
-
-- C.set_db_player_flags()
-+ if(!C.set_db_player_flags())
-+ to_chat(usr, "ERROR: Unable read player flags from database. Please check logs.")
- var/dbflags = C.prefs.db_flags
- var/newstate = FALSE
- if(dbflags & DB_FLAG_EXEMPT)
-@@ -1254,6 +1255,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
- else
- newstate = TRUE
-
-- message_admins("[key_name_admin(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name_admin(C)]")
-- log_admin("[key_name(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name(C)]")
-- C.update_flag_db(DB_FLAG_EXEMPT, newstate)
-\ No newline at end of file
-+ if(C.update_flag_db(DB_FLAG_EXEMPT, newstate))
-+ to_chat(usr, "ERROR: Unable to update player flags. Please check logs.")
-+ else
-+ message_admins("[key_name_admin(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name_admin(C)]")
-+ log_admin("[key_name(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name(C)]")
-\ No newline at end of file
diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm
index c3d6c24717..a16e58056b 100644
--- a/code/modules/atmospherics/environmental/LINDA_system.dm
+++ b/code/modules/atmospherics/environmental/LINDA_system.dm
@@ -106,7 +106,7 @@
T.air_update_turf(1)
air_update_turf(1)
-/atom/proc/atmos_spawn_air(text) //because a lot of people loves to copy paste awful code lets just make a easy proc to spawn your plasma fires
+/atom/proc/atmos_spawn_air(text) //because a lot of people loves to copy paste awful code lets just make an easy proc to spawn your plasma fires
var/turf/open/T = get_turf(src)
if(!istype(T))
return
diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index f5eb898163..ad1ba46d86 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -1,482 +1,482 @@
- /*
-What are the archived variables for?
- Calculations are done using the archived variables with the results merged into the regular variables.
- This prevents race conditions that arise based on the order of tile processing.
-*/
-#define MINIMUM_HEAT_CAPACITY 0.0003
-#define QUANTIZE(variable) (round(variable,0.0000001))/*I feel the need to document what happens here. Basically this is used to catch most rounding errors, however it's previous value made it so that
- once gases got hot enough, most procedures wouldnt occur due to the fact that the mole counts would get rounded away. Thus, we lowered it a few orders of magnititude */
-
-GLOBAL_LIST_INIT(meta_gas_info, meta_gas_list()) //see ATMOSPHERICS/gas_types.dm
-GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
-
-/proc/init_gaslist_cache()
- . = list()
- for(var/id in GLOB.meta_gas_info)
- var/list/cached_gas = new(3)
-
- .[id] = cached_gas
-
- cached_gas[MOLES] = 0
- cached_gas[ARCHIVE] = 0
- cached_gas[GAS_META] = GLOB.meta_gas_info[id]
-
-#define GASLIST(id, out_list)\
- var/list/tmp_gaslist = GLOB.gaslist_cache[id];\
- out_list = tmp_gaslist.Copy();
-
-/datum/gas_mixture
- var/list/gases
- var/temperature //kelvins
- var/tmp/temperature_archived
- var/volume //liters
- var/last_share
- var/list/reaction_results
-
-/datum/gas_mixture/New(volume = CELL_VOLUME)
- gases = new
- temperature = 0
- temperature_archived = 0
- src.volume = volume
- last_share = 0
- reaction_results = new
-
-//listmos procs
-
- //assert_gas(gas_id) - used to guarantee that the gas list for this id exists.
- //Must be used before adding to a gas. May be used before reading from a gas.
-/datum/gas_mixture/proc/assert_gas(gas_id)
- var/cached_gases = gases
- if(cached_gases[gas_id])
- return
- GASLIST(gas_id, cached_gases[gas_id])
-
- //assert_gases(args) - shorthand for calling assert_gas() once for each gas type.
-/datum/gas_mixture/proc/assert_gases()
- for(var/id in args)
- assert_gas(id)
-
- //add_gas(gas_id) - similar to assert_gas(), but does not check for an existing
- //gas list for this id. This can clobber existing gases.
- //Used instead of assert_gas() when you know the gas does not exist. Faster than assert_gas().
-/datum/gas_mixture/proc/add_gas(gas_id)
- GASLIST(gas_id, gases[gas_id])
-
- //add_gases(args) - shorthand for calling add_gas() once for each gas_type.
-/datum/gas_mixture/proc/add_gases()
- var/cached_gases = gases
- for(var/id in args)
- GASLIST(id, cached_gases[id])
-
- //garbage_collect() - removes any gas list which is empty.
- //If called with a list as an argument, only removes gas lists with IDs from that list.
- //Must be used after subtracting from a gas. Must be used after assert_gas()
- //if assert_gas() was called only to read from the gas.
- //By removing empty gases, processing speed is increased.
-/datum/gas_mixture/proc/garbage_collect(list/tocheck)
- var/list/cached_gases = gases
- for(var/id in (tocheck || cached_gases))
- if(cached_gases[id][MOLES] <= 0 && cached_gases[id][ARCHIVE] <= 0)
- cached_gases -= id
-
- //PV = nRT
-/datum/gas_mixture/proc/heat_capacity() //joules per kelvin
- var/list/cached_gases = gases
- . = 0
- for(var/id in cached_gases)
- var/gas_data = cached_gases[id]
- . += gas_data[MOLES] * gas_data[GAS_META][META_GAS_SPECIFIC_HEAT]
-
-/datum/gas_mixture/proc/heat_capacity_archived() //joules per kelvin
- var/list/cached_gases = gases
- . = 0
- for(var/id in cached_gases)
- var/gas_data = cached_gases[id]
- . += gas_data[ARCHIVE] * gas_data[GAS_META][META_GAS_SPECIFIC_HEAT]
-
-//prefer this in performance critical areas
-#define TOTAL_MOLES(cached_gases, out_var)\
- out_var = 0;\
- for(var/total_moles_id in cached_gases){\
- out_var += cached_gases[total_moles_id][MOLES];\
- }
-
-/datum/gas_mixture/proc/total_moles()
- var/cached_gases = gases
- TOTAL_MOLES(cached_gases, .)
-
-/datum/gas_mixture/proc/return_pressure() //kilopascals
- if(volume > 0) // to prevent division by zero
- var/cached_gases = gases
- TOTAL_MOLES(cached_gases, .)
- . *= R_IDEAL_GAS_EQUATION * temperature / volume
- return
- return 0
-
-/datum/gas_mixture/proc/return_temperature() //kelvins
- return temperature
-
-/datum/gas_mixture/proc/return_volume() //liters
- return max(0, volume)
-
-/datum/gas_mixture/proc/thermal_energy() //joules
- return temperature * heat_capacity()
-
-/datum/gas_mixture/proc/archive()
- //Update archived versions of variables
- //Returns: 1 in all cases
-
-/datum/gas_mixture/proc/merge(datum/gas_mixture/giver)
- //Merges all air from giver into self. Deletes giver.
- //Returns: 1 if we are mutable, 0 otherwise
-
-/datum/gas_mixture/proc/remove(amount)
- //Proportionally removes amount of gas from the gas_mixture
- //Returns: gas_mixture with the gases removed
-
-/datum/gas_mixture/proc/remove_ratio(ratio)
- //Proportionally removes amount of gas from the gas_mixture
- //Returns: gas_mixture with the gases removed
-
-/datum/gas_mixture/proc/copy()
- //Creates new, identical gas mixture
- //Returns: duplicate gas mixture
-
-/datum/gas_mixture/proc/copy_from(datum/gas_mixture/sample)
- //Copies variables from sample
- //Returns: 1 if we are mutable, 0 otherwise
-
-/datum/gas_mixture/proc/copy_from_turf(turf/model)
- //Copies all gas info from the turf into the gas list along with temperature
- //Returns: 1 if we are mutable, 0 otherwise
-
-/datum/gas_mixture/proc/parse_gas_string(gas_string)
- //Copies variables from a particularly formatted string.
- //Returns: 1 if we are mutable, 0 otherwise
-
-/datum/gas_mixture/proc/share(datum/gas_mixture/sharer)
- //Performs air sharing calculations between two gas_mixtures assuming only 1 boundary length
- //Returns: amount of gas exchanged (+ if sharer received)
-
-/datum/gas_mixture/proc/after_share(datum/gas_mixture/sharer)
- //called on share's sharer to let it know it just got some gases
-
-/datum/gas_mixture/proc/temperature_share(datum/gas_mixture/sharer, conduction_coefficient)
- //Performs temperature sharing calculations (via conduction) between two gas_mixtures assuming only 1 boundary length
- //Returns: new temperature of the sharer
-
-/datum/gas_mixture/proc/compare(datum/gas_mixture/sample)
- //Compares sample to self to see if within acceptable ranges that group processing may be enabled
- //Returns: a string indicating what check failed, or "" if check passes
-
-/datum/gas_mixture/proc/react(turf/open/dump_location)
- //Performs various reactions such as combustion or fusion (LOL)
- //Returns: 1 if any reaction took place; 0 otherwise
-
-/datum/gas_mixture/archive()
- var/list/cached_gases = gases
-
- temperature_archived = temperature
- for(var/id in cached_gases)
- cached_gases[id][ARCHIVE] = cached_gases[id][MOLES]
-
- return 1
-
-/datum/gas_mixture/merge(datum/gas_mixture/giver)
- if(!giver)
- return 0
-
- //heat transfer
- if(abs(temperature - giver.temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
- var/self_heat_capacity = heat_capacity()
- var/giver_heat_capacity = giver.heat_capacity()
- var/combined_heat_capacity = giver_heat_capacity + self_heat_capacity
- if(combined_heat_capacity)
- temperature = (giver.temperature * giver_heat_capacity + temperature * self_heat_capacity) / combined_heat_capacity
-
- var/list/cached_gases = gases //accessing datum vars is slower than proc vars
- var/list/giver_gases = giver.gases
- //gas transfer
- for(var/giver_id in giver_gases)
- assert_gas(giver_id)
- cached_gases[giver_id][MOLES] += giver_gases[giver_id][MOLES]
-
- return 1
-
-/datum/gas_mixture/remove(amount)
- var/sum
- var/list/cached_gases = gases
- TOTAL_MOLES(cached_gases, sum)
- amount = min(amount, sum) //Can not take more air than tile has!
- if(amount <= 0)
- return null
- var/datum/gas_mixture/removed = new
- var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars
-
- removed.temperature = temperature
- for(var/id in cached_gases)
- removed.add_gas(id)
- removed_gases[id][MOLES] = QUANTIZE((cached_gases[id][MOLES] / sum) * amount)
- cached_gases[id][MOLES] -= removed_gases[id][MOLES]
- garbage_collect()
-
- return removed
-
-/datum/gas_mixture/remove_ratio(ratio)
- if(ratio <= 0)
- return null
- ratio = min(ratio, 1)
-
- var/list/cached_gases = gases
- var/datum/gas_mixture/removed = new
- var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars
-
- removed.temperature = temperature
- for(var/id in cached_gases)
- removed.add_gas(id)
- removed_gases[id][MOLES] = QUANTIZE(cached_gases[id][MOLES] * ratio)
- cached_gases[id][MOLES] -= removed_gases[id][MOLES]
-
- garbage_collect()
-
- return removed
-
-/datum/gas_mixture/copy()
- var/list/cached_gases = gases
- var/datum/gas_mixture/copy = new
- var/list/copy_gases = copy.gases
-
- copy.temperature = temperature
- for(var/id in cached_gases)
- copy.add_gas(id)
- copy_gases[id][MOLES] = cached_gases[id][MOLES]
-
- return copy
-
-/datum/gas_mixture/copy_from(datum/gas_mixture/sample)
- var/list/cached_gases = gases //accessing datum vars is slower than proc vars
- var/list/sample_gases = sample.gases
-
- temperature = sample.temperature
- for(var/id in sample_gases)
- assert_gas(id)
- cached_gases[id][MOLES] = sample_gases[id][MOLES]
-
- //remove all gases not in the sample
- cached_gases &= sample_gases
-
- return 1
-
-/datum/gas_mixture/copy_from_turf(turf/model)
- parse_gas_string(model.initial_gas_mix)
-
- //acounts for changes in temperature
- var/turf/model_parent = model.parent_type
- if(model.temperature != initial(model.temperature) || model.temperature != initial(model_parent.temperature))
- temperature = model.temperature
-
- return 1
-
-/datum/gas_mixture/parse_gas_string(gas_string)
- var/list/gases = src.gases
- var/list/gas = params2list(gas_string)
- if(gas["TEMP"])
- temperature = text2num(gas["TEMP"])
- gas -= "TEMP"
- gases.Cut()
- for(var/id in gas)
- add_gas(id)
- gases[id][MOLES] = text2num(gas[id])
- return 1
-
-/datum/gas_mixture/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
- if(!sharer)
- return 0
-
- var/list/cached_gases = gases
- var/list/sharer_gases = sharer.gases
-
- var/temperature_delta = temperature_archived - sharer.temperature_archived
- var/abs_temperature_delta = abs(temperature_delta)
-
- var/old_self_heat_capacity = 0
- var/old_sharer_heat_capacity = 0
- if(abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
- old_self_heat_capacity = heat_capacity()
- old_sharer_heat_capacity = sharer.heat_capacity()
-
- var/heat_capacity_self_to_sharer = 0 //heat capacity of the moles transferred from us to the sharer
- var/heat_capacity_sharer_to_self = 0 //heat capacity of the moles transferred from the sharer to us
-
- var/moved_moles = 0
- var/abs_moved_moles = 0
-
- //GAS TRANSFER
- for(var/id in sharer_gases - cached_gases) // create gases not in our cache
- add_gas(id)
- for(var/id in cached_gases) // transfer gases
- if(!sharer_gases[id]) //checking here prevents an uneeded proc call if the check fails.
- sharer.add_gas(id)
-
- var/gas = cached_gases[id]
- var/sharergas = sharer_gases[id]
-
- var/delta = QUANTIZE(gas[ARCHIVE] - sharergas[ARCHIVE])/(atmos_adjacent_turfs+1) //the amount of gas that gets moved between the mixtures
-
- if(delta && abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
- var/gas_heat_capacity = delta * gas[GAS_META][META_GAS_SPECIFIC_HEAT]
- if(delta > 0)
- heat_capacity_self_to_sharer += gas_heat_capacity
- else
- heat_capacity_sharer_to_self -= gas_heat_capacity //subtract here instead of adding the absolute value because we know that delta is negative. saves a proc call.
-
- gas[MOLES] -= delta
- sharergas[MOLES] += delta
- moved_moles += delta
- abs_moved_moles += abs(delta)
-
- last_share = abs_moved_moles
-
- //THERMAL ENERGY TRANSFER
- if(abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
- var/new_self_heat_capacity = old_self_heat_capacity + heat_capacity_sharer_to_self - heat_capacity_self_to_sharer
- var/new_sharer_heat_capacity = old_sharer_heat_capacity + heat_capacity_self_to_sharer - heat_capacity_sharer_to_self
-
- //transfer of thermal energy (via changed heat capacity) between self and sharer
- if(new_self_heat_capacity > MINIMUM_HEAT_CAPACITY)
- temperature = (old_self_heat_capacity*temperature - heat_capacity_self_to_sharer*temperature_archived + heat_capacity_sharer_to_self*sharer.temperature_archived)/new_self_heat_capacity
-
- if(new_sharer_heat_capacity > MINIMUM_HEAT_CAPACITY)
- sharer.temperature = (old_sharer_heat_capacity*sharer.temperature-heat_capacity_sharer_to_self*sharer.temperature_archived + heat_capacity_self_to_sharer*temperature_archived)/new_sharer_heat_capacity
- //thermal energy of the system (self and sharer) is unchanged
-
- if(abs(old_sharer_heat_capacity) > MINIMUM_HEAT_CAPACITY)
- if(abs(new_sharer_heat_capacity/old_sharer_heat_capacity - 1) < 0.10) // <10% change in sharer heat capacity
- temperature_share(sharer, OPEN_HEAT_TRANSFER_COEFFICIENT)
-
- var/list/unique_gases = cached_gases ^ sharer_gases
- if(unique_gases.len) //if all gases were present in both mixtures, we know that no gases are 0
- garbage_collect(cached_gases - sharer_gases) //any gases the sharer had, we are guaranteed to have. gases that it didn't have we are not.
- sharer.garbage_collect(sharer_gases - cached_gases) //the reverse is equally true
- sharer.after_share(src, atmos_adjacent_turfs)
- if(temperature_delta > MINIMUM_TEMPERATURE_TO_MOVE || abs(moved_moles) > MINIMUM_MOLES_DELTA_TO_MOVE)
- var/our_moles
- TOTAL_MOLES(cached_gases,our_moles)
- var/their_moles
- TOTAL_MOLES(sharer_gases,their_moles)
- var/delta_pressure = temperature_archived*(our_moles + moved_moles) - sharer.temperature_archived*(their_moles - moved_moles)
- return delta_pressure * R_IDEAL_GAS_EQUATION / volume
-
-/datum/gas_mixture/after_share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
- return
-
-/datum/gas_mixture/temperature_share(datum/gas_mixture/sharer, conduction_coefficient, sharer_temperature, sharer_heat_capacity)
- //transfer of thermal energy (via conduction) between self and sharer
- if(sharer)
- sharer_temperature = sharer.temperature_archived
- var/temperature_delta = temperature_archived - sharer_temperature
- if(abs(temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
- var/self_heat_capacity = heat_capacity_archived()
- sharer_heat_capacity = sharer_heat_capacity || sharer.heat_capacity_archived()
-
- if((sharer_heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY))
- var/heat = conduction_coefficient*temperature_delta* \
- (self_heat_capacity*sharer_heat_capacity/(self_heat_capacity+sharer_heat_capacity))
-
- temperature = max(temperature - heat/self_heat_capacity, TCMB)
- sharer_temperature = max(sharer_temperature + heat/sharer_heat_capacity, TCMB)
- if(sharer)
- sharer.temperature = sharer_temperature
- return sharer_temperature
- //thermal energy of the system (self and sharer) is unchanged
-
-/datum/gas_mixture/compare(datum/gas_mixture/sample)
- var/list/sample_gases = sample.gases //accessing datum vars is slower than proc vars
- var/list/cached_gases = gases
-
- for(var/id in cached_gases | sample_gases) // compare gases from either mixture
- var/gas_moles = cached_gases[id]
- gas_moles = gas_moles ? gas_moles[MOLES] : 0
- var/sample_moles = sample_gases[id]
- sample_moles = sample_moles ? sample_moles[MOLES] : 0
- var/delta = abs(gas_moles - sample_moles)
- if(delta > MINIMUM_MOLES_DELTA_TO_MOVE && \
- delta > gas_moles * MINIMUM_AIR_RATIO_TO_MOVE)
- return id
-
- var/our_moles
- TOTAL_MOLES(cached_gases, our_moles)
- if(our_moles > MINIMUM_MOLES_DELTA_TO_MOVE)
- var/temp = temperature
- var/sample_temp = sample.temperature
-
- var/temperature_delta = abs(temp - sample_temp)
- if(temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND)
- return "temp"
-
- return ""
-
-/datum/gas_mixture/react(turf/open/dump_location)
- . = 0
- if(temperature < TCMB) //just for safety
- temperature = TCMB
- reaction_results = new
-
- var/list/cached_gases = gases
- var/temp = temperature
- var/ener = thermal_energy()
-
- reaction_loop:
- for(var/r in SSair.gas_reactions)
- var/datum/gas_reaction/reaction = r
-
- var/list/min_reqs = reaction.min_requirements.Copy()
- if((min_reqs["TEMP"] && temp < min_reqs["TEMP"]) \
- || (min_reqs["ENER"] && ener < min_reqs["ENER"]))
- continue
- min_reqs -= "TEMP"
- min_reqs -= "ENER"
-
- for(var/id in min_reqs)
- if(!cached_gases[id] || cached_gases[id][MOLES] < min_reqs[id])
- continue reaction_loop
- //at this point, all minimum requirements for the reaction are satisfied.
-
- /* currently no reactions have maximum requirements, so we can leave the checks commented out for a slight performance boost
- var/list/max_reqs = reaction.max_requirements.Copy()
- if((max_reqs["TEMP"] && temp > max_reqs["TEMP"]) \
- || (max_reqs["ENER"] && ener > max_reqs["ENER"]))
- continue
- max_reqs -= "TEMP"
- max_reqs -= "ENER"
-
- for(var/id in max_reqs)
- if(cached_gases[id] && cached_gases[id][MOLES] > max_reqs[id])
- continue reaction_loop
- //at this point, all requirements for the reaction are satisfied. we can now react()
- */
-
- . |= reaction.react(src, dump_location)
- if(.)
- garbage_collect()
-
-//Takes the amount of the gas you want to PP as an argument
-//So I don't have to do some hacky switches/defines/magic strings
-//eg:
-//Tox_PP = get_partial_pressure(gas_mixture.toxins)
-//O2_PP = get_partial_pressure(gas_mixture.oxygen)
-
-/datum/gas_mixture/proc/get_breath_partial_pressure(gas_pressure)
- return (gas_pressure * R_IDEAL_GAS_EQUATION * temperature) / BREATH_VOLUME
-//inverse
-/datum/gas_mixture/proc/get_true_breath_pressure(partial_pressure)
- return (partial_pressure * BREATH_VOLUME) / (R_IDEAL_GAS_EQUATION * temperature)
-
-//Mathematical proofs:
-/*
-get_breath_partial_pressure(gas_pp) --> gas_pp/total_moles()*breath_pp = pp
-get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles()
-
-10/20*5 = 2.5
-10 = 2.5/5*20
-*/
+ /*
+What are the archived variables for?
+ Calculations are done using the archived variables with the results merged into the regular variables.
+ This prevents race conditions that arise based on the order of tile processing.
+*/
+#define MINIMUM_HEAT_CAPACITY 0.0003
+#define QUANTIZE(variable) (round(variable,0.0000001))/*I feel the need to document what happens here. Basically this is used to catch most rounding errors, however it's previous value made it so that
+ once gases got hot enough, most procedures wouldnt occur due to the fact that the mole counts would get rounded away. Thus, we lowered it a few orders of magnititude */
+
+GLOBAL_LIST_INIT(meta_gas_info, meta_gas_list()) //see ATMOSPHERICS/gas_types.dm
+GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
+
+/proc/init_gaslist_cache()
+ . = list()
+ for(var/id in GLOB.meta_gas_info)
+ var/list/cached_gas = new(3)
+
+ .[id] = cached_gas
+
+ cached_gas[MOLES] = 0
+ cached_gas[ARCHIVE] = 0
+ cached_gas[GAS_META] = GLOB.meta_gas_info[id]
+
+#define GASLIST(id, out_list)\
+ var/list/tmp_gaslist = GLOB.gaslist_cache[id];\
+ out_list = tmp_gaslist.Copy();
+
+/datum/gas_mixture
+ var/list/gases
+ var/temperature //kelvins
+ var/tmp/temperature_archived
+ var/volume //liters
+ var/last_share
+ var/list/reaction_results
+
+/datum/gas_mixture/New(volume = CELL_VOLUME)
+ gases = new
+ temperature = 0
+ temperature_archived = 0
+ src.volume = volume
+ last_share = 0
+ reaction_results = new
+
+//listmos procs
+
+ //assert_gas(gas_id) - used to guarantee that the gas list for this id exists.
+ //Must be used before adding to a gas. May be used before reading from a gas.
+/datum/gas_mixture/proc/assert_gas(gas_id)
+ var/cached_gases = gases
+ if(cached_gases[gas_id])
+ return
+ GASLIST(gas_id, cached_gases[gas_id])
+
+ //assert_gases(args) - shorthand for calling assert_gas() once for each gas type.
+/datum/gas_mixture/proc/assert_gases()
+ for(var/id in args)
+ assert_gas(id)
+
+ //add_gas(gas_id) - similar to assert_gas(), but does not check for an existing
+ //gas list for this id. This can clobber existing gases.
+ //Used instead of assert_gas() when you know the gas does not exist. Faster than assert_gas().
+/datum/gas_mixture/proc/add_gas(gas_id)
+ GASLIST(gas_id, gases[gas_id])
+
+ //add_gases(args) - shorthand for calling add_gas() once for each gas_type.
+/datum/gas_mixture/proc/add_gases()
+ var/cached_gases = gases
+ for(var/id in args)
+ GASLIST(id, cached_gases[id])
+
+ //garbage_collect() - removes any gas list which is empty.
+ //If called with a list as an argument, only removes gas lists with IDs from that list.
+ //Must be used after subtracting from a gas. Must be used after assert_gas()
+ //if assert_gas() was called only to read from the gas.
+ //By removing empty gases, processing speed is increased.
+/datum/gas_mixture/proc/garbage_collect(list/tocheck)
+ var/list/cached_gases = gases
+ for(var/id in (tocheck || cached_gases))
+ if(cached_gases[id][MOLES] <= 0 && cached_gases[id][ARCHIVE] <= 0)
+ cached_gases -= id
+
+ //PV = nRT
+/datum/gas_mixture/proc/heat_capacity() //joules per kelvin
+ var/list/cached_gases = gases
+ . = 0
+ for(var/id in cached_gases)
+ var/gas_data = cached_gases[id]
+ . += gas_data[MOLES] * gas_data[GAS_META][META_GAS_SPECIFIC_HEAT]
+
+/datum/gas_mixture/proc/heat_capacity_archived() //joules per kelvin
+ var/list/cached_gases = gases
+ . = 0
+ for(var/id in cached_gases)
+ var/gas_data = cached_gases[id]
+ . += gas_data[ARCHIVE] * gas_data[GAS_META][META_GAS_SPECIFIC_HEAT]
+
+//prefer this in performance critical areas
+#define TOTAL_MOLES(cached_gases, out_var)\
+ out_var = 0;\
+ for(var/total_moles_id in cached_gases){\
+ out_var += cached_gases[total_moles_id][MOLES];\
+ }
+
+/datum/gas_mixture/proc/total_moles()
+ var/cached_gases = gases
+ TOTAL_MOLES(cached_gases, .)
+
+/datum/gas_mixture/proc/return_pressure() //kilopascals
+ if(volume > 0) // to prevent division by zero
+ var/cached_gases = gases
+ TOTAL_MOLES(cached_gases, .)
+ . *= R_IDEAL_GAS_EQUATION * temperature / volume
+ return
+ return 0
+
+/datum/gas_mixture/proc/return_temperature() //kelvins
+ return temperature
+
+/datum/gas_mixture/proc/return_volume() //liters
+ return max(0, volume)
+
+/datum/gas_mixture/proc/thermal_energy() //joules
+ return temperature * heat_capacity()
+
+/datum/gas_mixture/proc/archive()
+ //Update archived versions of variables
+ //Returns: 1 in all cases
+
+/datum/gas_mixture/proc/merge(datum/gas_mixture/giver)
+ //Merges all air from giver into self. Deletes giver.
+ //Returns: 1 if we are mutable, 0 otherwise
+
+/datum/gas_mixture/proc/remove(amount)
+ //Proportionally removes amount of gas from the gas_mixture
+ //Returns: gas_mixture with the gases removed
+
+/datum/gas_mixture/proc/remove_ratio(ratio)
+ //Proportionally removes amount of gas from the gas_mixture
+ //Returns: gas_mixture with the gases removed
+
+/datum/gas_mixture/proc/copy()
+ //Creates new, identical gas mixture
+ //Returns: duplicate gas mixture
+
+/datum/gas_mixture/proc/copy_from(datum/gas_mixture/sample)
+ //Copies variables from sample
+ //Returns: 1 if we are mutable, 0 otherwise
+
+/datum/gas_mixture/proc/copy_from_turf(turf/model)
+ //Copies all gas info from the turf into the gas list along with temperature
+ //Returns: 1 if we are mutable, 0 otherwise
+
+/datum/gas_mixture/proc/parse_gas_string(gas_string)
+ //Copies variables from a particularly formatted string.
+ //Returns: 1 if we are mutable, 0 otherwise
+
+/datum/gas_mixture/proc/share(datum/gas_mixture/sharer)
+ //Performs air sharing calculations between two gas_mixtures assuming only 1 boundary length
+ //Returns: amount of gas exchanged (+ if sharer received)
+
+/datum/gas_mixture/proc/after_share(datum/gas_mixture/sharer)
+ //called on share's sharer to let it know it just got some gases
+
+/datum/gas_mixture/proc/temperature_share(datum/gas_mixture/sharer, conduction_coefficient)
+ //Performs temperature sharing calculations (via conduction) between two gas_mixtures assuming only 1 boundary length
+ //Returns: new temperature of the sharer
+
+/datum/gas_mixture/proc/compare(datum/gas_mixture/sample)
+ //Compares sample to self to see if within acceptable ranges that group processing may be enabled
+ //Returns: a string indicating what check failed, or "" if check passes
+
+/datum/gas_mixture/proc/react(turf/open/dump_location)
+ //Performs various reactions such as combustion or fusion (LOL)
+ //Returns: 1 if any reaction took place; 0 otherwise
+
+/datum/gas_mixture/archive()
+ var/list/cached_gases = gases
+
+ temperature_archived = temperature
+ for(var/id in cached_gases)
+ cached_gases[id][ARCHIVE] = cached_gases[id][MOLES]
+
+ return 1
+
+/datum/gas_mixture/merge(datum/gas_mixture/giver)
+ if(!giver)
+ return 0
+
+ //heat transfer
+ if(abs(temperature - giver.temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
+ var/self_heat_capacity = heat_capacity()
+ var/giver_heat_capacity = giver.heat_capacity()
+ var/combined_heat_capacity = giver_heat_capacity + self_heat_capacity
+ if(combined_heat_capacity)
+ temperature = (giver.temperature * giver_heat_capacity + temperature * self_heat_capacity) / combined_heat_capacity
+
+ var/list/cached_gases = gases //accessing datum vars is slower than proc vars
+ var/list/giver_gases = giver.gases
+ //gas transfer
+ for(var/giver_id in giver_gases)
+ assert_gas(giver_id)
+ cached_gases[giver_id][MOLES] += giver_gases[giver_id][MOLES]
+
+ return 1
+
+/datum/gas_mixture/remove(amount)
+ var/sum
+ var/list/cached_gases = gases
+ TOTAL_MOLES(cached_gases, sum)
+ amount = min(amount, sum) //Can not take more air than tile has!
+ if(amount <= 0)
+ return null
+ var/datum/gas_mixture/removed = new
+ var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars
+
+ removed.temperature = temperature
+ for(var/id in cached_gases)
+ removed.add_gas(id)
+ removed_gases[id][MOLES] = QUANTIZE((cached_gases[id][MOLES] / sum) * amount)
+ cached_gases[id][MOLES] -= removed_gases[id][MOLES]
+ garbage_collect()
+
+ return removed
+
+/datum/gas_mixture/remove_ratio(ratio)
+ if(ratio <= 0)
+ return null
+ ratio = min(ratio, 1)
+
+ var/list/cached_gases = gases
+ var/datum/gas_mixture/removed = new
+ var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars
+
+ removed.temperature = temperature
+ for(var/id in cached_gases)
+ removed.add_gas(id)
+ removed_gases[id][MOLES] = QUANTIZE(cached_gases[id][MOLES] * ratio)
+ cached_gases[id][MOLES] -= removed_gases[id][MOLES]
+
+ garbage_collect()
+
+ return removed
+
+/datum/gas_mixture/copy()
+ var/list/cached_gases = gases
+ var/datum/gas_mixture/copy = new
+ var/list/copy_gases = copy.gases
+
+ copy.temperature = temperature
+ for(var/id in cached_gases)
+ copy.add_gas(id)
+ copy_gases[id][MOLES] = cached_gases[id][MOLES]
+
+ return copy
+
+/datum/gas_mixture/copy_from(datum/gas_mixture/sample)
+ var/list/cached_gases = gases //accessing datum vars is slower than proc vars
+ var/list/sample_gases = sample.gases
+
+ temperature = sample.temperature
+ for(var/id in sample_gases)
+ assert_gas(id)
+ cached_gases[id][MOLES] = sample_gases[id][MOLES]
+
+ //remove all gases not in the sample
+ cached_gases &= sample_gases
+
+ return 1
+
+/datum/gas_mixture/copy_from_turf(turf/model)
+ parse_gas_string(model.initial_gas_mix)
+
+ //acounts for changes in temperature
+ var/turf/model_parent = model.parent_type
+ if(model.temperature != initial(model.temperature) || model.temperature != initial(model_parent.temperature))
+ temperature = model.temperature
+
+ return 1
+
+/datum/gas_mixture/parse_gas_string(gas_string)
+ var/list/gases = src.gases
+ var/list/gas = params2list(gas_string)
+ if(gas["TEMP"])
+ temperature = text2num(gas["TEMP"])
+ gas -= "TEMP"
+ gases.Cut()
+ for(var/id in gas)
+ add_gas(id)
+ gases[id][MOLES] = text2num(gas[id])
+ return 1
+
+/datum/gas_mixture/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
+ if(!sharer)
+ return 0
+
+ var/list/cached_gases = gases
+ var/list/sharer_gases = sharer.gases
+
+ var/temperature_delta = temperature_archived - sharer.temperature_archived
+ var/abs_temperature_delta = abs(temperature_delta)
+
+ var/old_self_heat_capacity = 0
+ var/old_sharer_heat_capacity = 0
+ if(abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
+ old_self_heat_capacity = heat_capacity()
+ old_sharer_heat_capacity = sharer.heat_capacity()
+
+ var/heat_capacity_self_to_sharer = 0 //heat capacity of the moles transferred from us to the sharer
+ var/heat_capacity_sharer_to_self = 0 //heat capacity of the moles transferred from the sharer to us
+
+ var/moved_moles = 0
+ var/abs_moved_moles = 0
+
+ //GAS TRANSFER
+ for(var/id in sharer_gases - cached_gases) // create gases not in our cache
+ add_gas(id)
+ for(var/id in cached_gases) // transfer gases
+ if(!sharer_gases[id]) //checking here prevents an uneeded proc call if the check fails.
+ sharer.add_gas(id)
+
+ var/gas = cached_gases[id]
+ var/sharergas = sharer_gases[id]
+
+ var/delta = QUANTIZE(gas[ARCHIVE] - sharergas[ARCHIVE])/(atmos_adjacent_turfs+1) //the amount of gas that gets moved between the mixtures
+
+ if(delta && abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
+ var/gas_heat_capacity = delta * gas[GAS_META][META_GAS_SPECIFIC_HEAT]
+ if(delta > 0)
+ heat_capacity_self_to_sharer += gas_heat_capacity
+ else
+ heat_capacity_sharer_to_self -= gas_heat_capacity //subtract here instead of adding the absolute value because we know that delta is negative. saves a proc call.
+
+ gas[MOLES] -= delta
+ sharergas[MOLES] += delta
+ moved_moles += delta
+ abs_moved_moles += abs(delta)
+
+ last_share = abs_moved_moles
+
+ //THERMAL ENERGY TRANSFER
+ if(abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
+ var/new_self_heat_capacity = old_self_heat_capacity + heat_capacity_sharer_to_self - heat_capacity_self_to_sharer
+ var/new_sharer_heat_capacity = old_sharer_heat_capacity + heat_capacity_self_to_sharer - heat_capacity_sharer_to_self
+
+ //transfer of thermal energy (via changed heat capacity) between self and sharer
+ if(new_self_heat_capacity > MINIMUM_HEAT_CAPACITY)
+ temperature = (old_self_heat_capacity*temperature - heat_capacity_self_to_sharer*temperature_archived + heat_capacity_sharer_to_self*sharer.temperature_archived)/new_self_heat_capacity
+
+ if(new_sharer_heat_capacity > MINIMUM_HEAT_CAPACITY)
+ sharer.temperature = (old_sharer_heat_capacity*sharer.temperature-heat_capacity_sharer_to_self*sharer.temperature_archived + heat_capacity_self_to_sharer*temperature_archived)/new_sharer_heat_capacity
+ //thermal energy of the system (self and sharer) is unchanged
+
+ if(abs(old_sharer_heat_capacity) > MINIMUM_HEAT_CAPACITY)
+ if(abs(new_sharer_heat_capacity/old_sharer_heat_capacity - 1) < 0.1) // <10% change in sharer heat capacity
+ temperature_share(sharer, OPEN_HEAT_TRANSFER_COEFFICIENT)
+
+ var/list/unique_gases = cached_gases ^ sharer_gases
+ if(unique_gases.len) //if all gases were present in both mixtures, we know that no gases are 0
+ garbage_collect(cached_gases - sharer_gases) //any gases the sharer had, we are guaranteed to have. gases that it didn't have we are not.
+ sharer.garbage_collect(sharer_gases - cached_gases) //the reverse is equally true
+ sharer.after_share(src, atmos_adjacent_turfs)
+ if(temperature_delta > MINIMUM_TEMPERATURE_TO_MOVE || abs(moved_moles) > MINIMUM_MOLES_DELTA_TO_MOVE)
+ var/our_moles
+ TOTAL_MOLES(cached_gases,our_moles)
+ var/their_moles
+ TOTAL_MOLES(sharer_gases,their_moles)
+ var/delta_pressure = temperature_archived*(our_moles + moved_moles) - sharer.temperature_archived*(their_moles - moved_moles)
+ return delta_pressure * R_IDEAL_GAS_EQUATION / volume
+
+/datum/gas_mixture/after_share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
+ return
+
+/datum/gas_mixture/temperature_share(datum/gas_mixture/sharer, conduction_coefficient, sharer_temperature, sharer_heat_capacity)
+ //transfer of thermal energy (via conduction) between self and sharer
+ if(sharer)
+ sharer_temperature = sharer.temperature_archived
+ var/temperature_delta = temperature_archived - sharer_temperature
+ if(abs(temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
+ var/self_heat_capacity = heat_capacity_archived()
+ sharer_heat_capacity = sharer_heat_capacity || sharer.heat_capacity_archived()
+
+ if((sharer_heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY))
+ var/heat = conduction_coefficient*temperature_delta* \
+ (self_heat_capacity*sharer_heat_capacity/(self_heat_capacity+sharer_heat_capacity))
+
+ temperature = max(temperature - heat/self_heat_capacity, TCMB)
+ sharer_temperature = max(sharer_temperature + heat/sharer_heat_capacity, TCMB)
+ if(sharer)
+ sharer.temperature = sharer_temperature
+ return sharer_temperature
+ //thermal energy of the system (self and sharer) is unchanged
+
+/datum/gas_mixture/compare(datum/gas_mixture/sample)
+ var/list/sample_gases = sample.gases //accessing datum vars is slower than proc vars
+ var/list/cached_gases = gases
+
+ for(var/id in cached_gases | sample_gases) // compare gases from either mixture
+ var/gas_moles = cached_gases[id]
+ gas_moles = gas_moles ? gas_moles[MOLES] : 0
+ var/sample_moles = sample_gases[id]
+ sample_moles = sample_moles ? sample_moles[MOLES] : 0
+ var/delta = abs(gas_moles - sample_moles)
+ if(delta > MINIMUM_MOLES_DELTA_TO_MOVE && \
+ delta > gas_moles * MINIMUM_AIR_RATIO_TO_MOVE)
+ return id
+
+ var/our_moles
+ TOTAL_MOLES(cached_gases, our_moles)
+ if(our_moles > MINIMUM_MOLES_DELTA_TO_MOVE)
+ var/temp = temperature
+ var/sample_temp = sample.temperature
+
+ var/temperature_delta = abs(temp - sample_temp)
+ if(temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND)
+ return "temp"
+
+ return ""
+
+/datum/gas_mixture/react(turf/open/dump_location)
+ . = 0
+ if(temperature < TCMB) //just for safety
+ temperature = TCMB
+ reaction_results = new
+
+ var/list/cached_gases = gases
+ var/temp = temperature
+ var/ener = thermal_energy()
+
+ reaction_loop:
+ for(var/r in SSair.gas_reactions)
+ var/datum/gas_reaction/reaction = r
+
+ var/list/min_reqs = reaction.min_requirements.Copy()
+ if((min_reqs["TEMP"] && temp < min_reqs["TEMP"]) \
+ || (min_reqs["ENER"] && ener < min_reqs["ENER"]))
+ continue
+ min_reqs -= "TEMP"
+ min_reqs -= "ENER"
+
+ for(var/id in min_reqs)
+ if(!cached_gases[id] || cached_gases[id][MOLES] < min_reqs[id])
+ continue reaction_loop
+ //at this point, all minimum requirements for the reaction are satisfied.
+
+ /* currently no reactions have maximum requirements, so we can leave the checks commented out for a slight performance boost
+ var/list/max_reqs = reaction.max_requirements.Copy()
+ if((max_reqs["TEMP"] && temp > max_reqs["TEMP"]) \
+ || (max_reqs["ENER"] && ener > max_reqs["ENER"]))
+ continue
+ max_reqs -= "TEMP"
+ max_reqs -= "ENER"
+
+ for(var/id in max_reqs)
+ if(cached_gases[id] && cached_gases[id][MOLES] > max_reqs[id])
+ continue reaction_loop
+ //at this point, all requirements for the reaction are satisfied. we can now react()
+ */
+
+ . |= reaction.react(src, dump_location)
+ if(.)
+ garbage_collect()
+
+//Takes the amount of the gas you want to PP as an argument
+//So I don't have to do some hacky switches/defines/magic strings
+//eg:
+//Tox_PP = get_partial_pressure(gas_mixture.toxins)
+//O2_PP = get_partial_pressure(gas_mixture.oxygen)
+
+/datum/gas_mixture/proc/get_breath_partial_pressure(gas_pressure)
+ return (gas_pressure * R_IDEAL_GAS_EQUATION * temperature) / BREATH_VOLUME
+//inverse
+/datum/gas_mixture/proc/get_true_breath_pressure(partial_pressure)
+ return (partial_pressure * BREATH_VOLUME) / (R_IDEAL_GAS_EQUATION * temperature)
+
+//Mathematical proofs:
+/*
+get_breath_partial_pressure(gas_pp) --> gas_pp/total_moles()*breath_pp = pp
+get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles()
+
+10/20*5 = 2.5
+10 = 2.5/5*20
+*/
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index 1060c2daf2..a37e4d61c4 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -108,8 +108,6 @@
var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow
var/temperature = air.temperature
var/list/cached_results = air.reaction_results
-
- //to_chat(world, "pre [temperature], [cached_gases["o2"][MOLES]], [cached_gases["plasma"][MOLES]]")
cached_results[id] = 0
//General volatile gas burn
@@ -165,8 +163,6 @@
if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
air.temperature = (temperature*old_heat_capacity + energy_released)/new_heat_capacity
- //to_chat(world, "post [temperature], [cached_gases["o2"][MOLES]], [cached_gases["plasma"][MOLES]]")
-
//let the floor know a fire is happening
if(istype(location))
temperature = air.temperature
@@ -201,7 +197,6 @@
//Fusion wont occur if the level of impurities is too high.
return NO_REACTION
- //to_chat(world, "pre [temperature, [cached_gases["plasma"][MOLES]], [cached_gases["co2"][MOLES]])
var/old_heat_capacity = air.heat_capacity()
var/carbon_efficency = min(cached_gases["plasma"][MOLES]/cached_gases["co2"][MOLES],MAX_CARBON_EFFICENCY)
var/reaction_energy = air.thermal_energy()
@@ -226,7 +221,6 @@
if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
air.temperature = max(((temperature*old_heat_capacity + reaction_energy)/new_heat_capacity),TCMB)
//Prevents whatever mechanism is causing it to hit negative temperatures.
- //to_chat(world, "post [temperature], [cached_gases["plasma"][MOLES]], [cached_gases["co2"][MOLES]])
return REACTING
#undef REACTING
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 58a450bec9..6de564da6d 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -73,7 +73,7 @@
var/datum/radio_frequency/radio_connection
var/list/TLV = list( // Breathable air.
- "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.80, ONE_ATMOSPHERE* 0.90, ONE_ATMOSPHERE * 1.10, ONE_ATMOSPHERE * 1.20), // kPa
+ "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE* 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa
"temperature" = new/datum/tlv(T0C, T0C+10, T0C+40, T0C+66), // K
"o2" = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
"n2" = new/datum/tlv(-1, -1, 1000, 1000), // Partial pressure, kpa
@@ -101,7 +101,7 @@
/obj/machinery/airalarm/kitchen_cold_room // Copypasta: to check temperatures.
TLV = list(
- "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.80, ONE_ATMOSPHERE* 0.90, ONE_ATMOSPHERE * 1.10, ONE_ATMOSPHERE * 1.20), // kPa
+ "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE* 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa
"temperature" = new/datum/tlv(200,210,273.15,283.15), // K
"o2" = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
"n2" = new/datum/tlv(-1, -1, 1000, 1000), // Partial pressure, kpa
@@ -415,7 +415,6 @@
signal.data["sigtype"] = "command"
radio_connection.post_signal(src, signal, GLOB.RADIO_FROM_AIRALARM)
-// to_chat(world, text("Signal [] Broadcasted to []", command, target))
return 1
@@ -709,6 +708,16 @@
qdel(W)
return
+ if(istype(W, /obj/item/device/electroadaptive_pseudocircuit))
+ var/obj/item/device/electroadaptive_pseudocircuit/P = W
+ if(!P.adapt_circuit(user, 25))
+ return
+ user.visible_message("[user] fabricates a circuit and places it into [src].", \
+ "You adapt an air alarm circuit and slot it into the assembly.")
+ buildstage = 1
+ update_icon()
+ return
+
if(istype(W, /obj/item/wrench))
to_chat(user, "You detach \the [src] from the wall.")
playsound(src.loc, W.usesound, 50, 1)
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index 977d48fbd7..585b4c4550 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -91,7 +91,7 @@ Pipelines + Other Objects -> Pipe network
/obj/machinery/atmospherics/proc/can_be_node(obj/machinery/atmospherics/target)
if(target.initialize_directions & get_dir(target,src))
- return 1
+ return TRUE
/obj/machinery/atmospherics/proc/pipeline_expansion()
return nodes
@@ -208,6 +208,17 @@ Pipelines + Other Objects -> Pipe network
pipe_overlay = . = pipeimages[identifier] = image(iconset, iconstate, dir = direction)
pipe_overlay.color = col
+/obj/machinery/atmospherics/proc/icon_addintact(var/obj/machinery/atmospherics/node)
+ var/image/img = getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "pipe_intact", get_dir(src,node), node.pipe_color)
+ underlays += img
+ return img.dir
+
+/obj/machinery/atmospherics/proc/icon_addbroken(var/connected = FALSE)
+ var/unconnected = (~connected) & initialize_directions
+ for(var/direction in GLOB.cardinals)
+ if(unconnected & direction)
+ underlays += getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "pipe_exposed", direction)
+
/obj/machinery/atmospherics/on_construction(pipe_type, obj_color)
if(can_unwrench)
add_atom_colour(obj_color, FIXED_COLOUR_PRIORITY)
@@ -275,7 +286,7 @@ Pipelines + Other Objects -> Pipe network
/obj/machinery/atmospherics/proc/can_crawl_through()
- return 1
+ return TRUE
/obj/machinery/atmospherics/proc/returnPipenets()
return list()
@@ -288,4 +299,5 @@ Pipelines + Other Objects -> Pipe network
//Used for certain children of obj/machinery/atmospherics to not show pipe vision when mob is inside it.
/obj/machinery/atmospherics/proc/can_see_pipes()
- return 1
\ No newline at end of file
+ return TRUE
+
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
index f76eb3bb65..786aff1038 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
@@ -1,70 +1,63 @@
-//node2, air2, network2 correspond to input
-//node1, air1, network1 correspond to output
-
-
-/obj/machinery/atmospherics/components/binary/circulator
- name = "circulator/heat exchanger"
- desc = "A gas circulator pump and heat exchanger."
- icon_state = "circ1-off"
-
- var/side = CIRC_LEFT
- var/status = 0
-
- var/last_pressure_delta = 0
-
+//node2, air2, network2 correspond to input
+//node1, air1, network1 correspond to output
+
+
+/obj/machinery/atmospherics/components/binary/circulator
+ name = "circulator/heat exchanger"
+ desc = "A gas circulator pump and heat exchanger."
+ icon_state = "circ1-off"
+
+ var/side = CIRC_LEFT
+ var/status = 0
+
+ var/last_pressure_delta = 0
+
anchored = TRUE
density = TRUE
-
- var/global/const/CIRC_LEFT = 1
- var/global/const/CIRC_RIGHT = 2
-
-
-/obj/machinery/atmospherics/components/binary/circulator/proc/return_transfer_air()
-
- var/datum/gas_mixture/air1 = AIR1
- var/datum/gas_mixture/air2 = AIR2
-
- var/output_starting_pressure = air1.return_pressure()
- var/input_starting_pressure = air2.return_pressure()
-
- if(output_starting_pressure >= input_starting_pressure-10)
- //Need at least 10 KPa difference to overcome friction in the mechanism
- last_pressure_delta = 0
- return null
-
- //Calculate necessary moles to transfer using PV = nRT
- if(air2.temperature>0)
- var/pressure_delta = (input_starting_pressure - output_starting_pressure)/2
-
- var/transfer_moles = pressure_delta*air1.volume/(air2.temperature * R_IDEAL_GAS_EQUATION)
-
- last_pressure_delta = pressure_delta
-
- //to_chat(world, "pressure_delta = [pressure_delta]; transfer_moles = [transfer_moles];")
-
- //Actually transfer the gas
- var/datum/gas_mixture/removed = air2.remove(transfer_moles)
-
- update_parents()
-
- return removed
-
- else
- last_pressure_delta = 0
-
-/obj/machinery/atmospherics/components/binary/circulator/process_atmos()
- ..()
- update_icon()
-
-/obj/machinery/atmospherics/components/binary/circulator/update_icon()
- if(stat & (BROKEN|NOPOWER))
- icon_state = "circ[side]-p"
- else if(last_pressure_delta > 0)
- if(last_pressure_delta > ONE_ATMOSPHERE)
- icon_state = "circ[side]-run"
- else
- icon_state = "circ[side]-slow"
- else
- icon_state = "circ[side]-off"
-
- return 1
+ var/global/const/CIRC_LEFT = 1
+ var/global/const/CIRC_RIGHT = 2
+
+
+/obj/machinery/atmospherics/components/binary/circulator/proc/return_transfer_air()
+
+ var/datum/gas_mixture/air1 = AIR1
+ var/datum/gas_mixture/air2 = AIR2
+
+ var/output_starting_pressure = air1.return_pressure()
+ var/input_starting_pressure = air2.return_pressure()
+
+ if(output_starting_pressure >= input_starting_pressure-10)
+ //Need at least 10 KPa difference to overcome friction in the mechanism
+ last_pressure_delta = 0
+ return null
+
+ //Calculate necessary moles to transfer using PV = nRT
+ if(air2.temperature>0)
+ var/pressure_delta = (input_starting_pressure - output_starting_pressure)/2
+
+ var/transfer_moles = pressure_delta*air1.volume/(air2.temperature * R_IDEAL_GAS_EQUATION)
+
+ last_pressure_delta = pressure_delta
+ var/datum/gas_mixture/removed = air2.remove(transfer_moles)
+
+ update_parents()
+
+ return removed
+
+ else
+ last_pressure_delta = 0
+
+/obj/machinery/atmospherics/components/binary/circulator/process_atmos()
+ ..()
+ update_icon()
+
+/obj/machinery/atmospherics/components/binary/circulator/update_icon()
+ if(!is_operational())
+ icon_state = "circ[side]-p"
+ else if(last_pressure_delta > 0)
+ if(last_pressure_delta > ONE_ATMOSPHERE)
+ icon_state = "circ[side]-run"
+ else
+ icon_state = "circ[side]-slow"
+ else
+ icon_state = "circ[side]-off"
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
index 1ef52cc787..15f0ccddd2 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
@@ -1,211 +1,207 @@
-/*
-Acts like a normal vent, but has an input AND output.
-*/
-#define EXT_BOUND 1
-#define INPUT_MIN 2
-#define OUTPUT_MAX 4
-
-/obj/machinery/atmospherics/components/binary/dp_vent_pump
- icon = 'icons/obj/atmospherics/components/unary_devices.dmi' //We reuse the normal vent icons!
- icon_state = "dpvent_map"
-
- //node2 is output port
- //node1 is input port
-
- name = "dual-port air vent"
- desc = "Has a valve and pump attached to it. There are two ports."
-
- level = 1
- var/frequency = 0
- var/id = null
- var/datum/radio_frequency/radio_connection
-
+/*
+Acts like a normal vent, but has an input AND output.
+*/
+#define EXT_BOUND 1
+#define INPUT_MIN 2
+#define OUTPUT_MAX 4
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump
+ icon = 'icons/obj/atmospherics/components/unary_devices.dmi' //We reuse the normal vent icons!
+ icon_state = "dpvent_map"
+
+ //node2 is output port
+ //node1 is input port
+
+ name = "dual-port air vent"
+ desc = "Has a valve and pump attached to it. There are two ports."
+
+ level = 1
+ var/frequency = 0
+ var/id = null
+ var/datum/radio_frequency/radio_connection
+
var/on = FALSE
- var/pump_direction = 1 //0 = siphoning, 1 = releasing
-
- var/external_pressure_bound = ONE_ATMOSPHERE
- var/input_pressure_min = 0
- var/output_pressure_max = 0
-
- var/pressure_checks = EXT_BOUND
- //EXT_BOUND: Do not pass external_pressure_bound
- //INPUT_MIN: Do not pass input_pressure_min
- //OUTPUT_MAX: Do not pass output_pressure_max
-
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/on
- on = TRUE
- icon_state = "dpvent_map_on"
-
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/Destroy()
+ var/pump_direction = 1 //0 = siphoning, 1 = releasing
+
+ var/external_pressure_bound = ONE_ATMOSPHERE
+ var/input_pressure_min = 0
+ var/output_pressure_max = 0
+
+ var/pressure_checks = EXT_BOUND
+ //EXT_BOUND: Do not pass external_pressure_bound
+ //INPUT_MIN: Do not pass input_pressure_min
+ //OUTPUT_MAX: Do not pass output_pressure_max
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/on
+ on = TRUE
+ icon_state = "dpvent_map_on"
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/Destroy()
SSradio.remove_object(src, frequency)
- return ..()
-
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume
- name = "large dual-port air vent"
-
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on
- on = TRUE
- icon_state = "dpvent_map_on"
-
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/New()
- ..()
- var/datum/gas_mixture/air1 = AIR1
- var/datum/gas_mixture/air2 = AIR2
- air1.volume = 1000
- air2.volume = 1000
-
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/update_icon_nopipes()
- cut_overlays()
- if(showpipe)
- add_overlay(getpipeimage('icons/obj/atmospherics/components/unary_devices.dmi', "dpvent_cap"))
-
- if(!on || stat & (NOPOWER|BROKEN))
- icon_state = "vent_off"
- return
-
- if(pump_direction)
- icon_state = "vent_out"
- else
- icon_state = "vent_in"
-
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/process_atmos()
- ..()
-
- if(!on)
- return FALSE
- var/datum/gas_mixture/air1 = AIR1
- var/datum/gas_mixture/air2 = AIR2
-
- var/datum/gas_mixture/environment = loc.return_air()
- var/environment_pressure = environment.return_pressure()
-
- if(pump_direction) //input -> external
- var/pressure_delta = 10000
-
- if(pressure_checks&EXT_BOUND)
- pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure))
- if(pressure_checks&INPUT_MIN)
- pressure_delta = min(pressure_delta, (air1.return_pressure() - input_pressure_min))
-
- if(pressure_delta > 0)
- if(air1.temperature > 0)
- var/transfer_moles = pressure_delta*environment.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
-
- var/datum/gas_mixture/removed = air1.remove(transfer_moles)
- //Removed can be null if there is no atmosphere in air1
- if(!removed)
- return FALSE
-
- loc.assume_air(removed)
- air_update_turf()
-
- var/datum/pipeline/parent1 = PARENT1
- parent1.update = 1
-
- else //external -> output
- var/pressure_delta = 10000
-
- if(pressure_checks&EXT_BOUND)
- pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound))
- if(pressure_checks&INPUT_MIN)
- pressure_delta = min(pressure_delta, (output_pressure_max - air2.return_pressure()))
-
- if(pressure_delta > 0)
- if(environment.temperature > 0)
- var/transfer_moles = pressure_delta*air2.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
-
- var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
- //removed can be null if there is no air in the location
- if(!removed)
- return FALSE
-
- air2.merge(removed)
- air_update_turf()
-
- var/datum/pipeline/parent2 = PARENT2
- parent2.update = 1
-
- return TRUE
-
- //Radio remote control
-
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/proc/set_frequency(new_frequency)
- SSradio.remove_object(src, frequency)
- frequency = new_frequency
- if(frequency)
- radio_connection = SSradio.add_object(src, frequency, filter = GLOB.RADIO_ATMOSIA)
-
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/proc/broadcast_status()
- if(!radio_connection)
- return 0
-
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.source = src
-
- signal.data = list(
- "tag" = id,
- "device" = "ADVP",
- "power" = on,
- "direction" = pump_direction?("release"):("siphon"),
- "checks" = pressure_checks,
- "input" = input_pressure_min,
- "output" = output_pressure_max,
- "external" = external_pressure_bound,
- "sigtype" = "status"
- )
- radio_connection.post_signal(src, signal, filter = GLOB.RADIO_ATMOSIA)
-
- return 1
-
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/atmosinit()
- ..()
- if(frequency)
- set_frequency(frequency)
- broadcast_status()
-
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/receive_signal(datum/signal/signal)
-
- if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
- return 0
- if("power" in signal.data)
- on = text2num(signal.data["power"])
-
- if("power_toggle" in signal.data)
- on = !on
-
- if("set_direction" in signal.data)
- pump_direction = text2num(signal.data["set_direction"])
-
- if("checks" in signal.data)
- pressure_checks = text2num(signal.data["checks"])
-
- if("purge" in signal.data)
- pressure_checks &= ~1
- pump_direction = 0
-
- if("stabalize" in signal.data)
- pressure_checks |= 1
- pump_direction = 1
-
- if("set_input_pressure" in signal.data)
- input_pressure_min = Clamp(text2num(signal.data["set_input_pressure"]),0,ONE_ATMOSPHERE*50)
-
- if("set_output_pressure" in signal.data)
- output_pressure_max = Clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50)
-
- if("set_external_pressure" in signal.data)
- external_pressure_bound = Clamp(text2num(signal.data["set_external_pressure"]),0,ONE_ATMOSPHERE*50)
-
- if("status" in signal.data)
- spawn(2)
- broadcast_status()
- return //do not update_icon
- //if(signal.data["tag"])
- spawn(2)
- broadcast_status()
- update_icon()
-
-#undef EXT_BOUND
-#undef INPUT_MIN
-#undef OUTPUT_MAX
+ return ..()
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume
+ name = "large dual-port air vent"
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/on
+ on = TRUE
+ icon_state = "dpvent_map_on"
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/New()
+ ..()
+ var/datum/gas_mixture/air1 = AIR1
+ var/datum/gas_mixture/air2 = AIR2
+ air1.volume = 1000
+ air2.volume = 1000
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/update_icon_nopipes()
+ cut_overlays()
+ if(showpipe)
+ add_overlay(getpipeimage('icons/obj/atmospherics/components/unary_devices.dmi', "dpvent_cap"))
+
+ if(!on || !is_operational())
+ icon_state = "vent_off"
+ return
+
+ if(pump_direction)
+ icon_state = "vent_out"
+ else
+ icon_state = "vent_in"
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/process_atmos()
+ ..()
+
+ if(!on)
+ return
+ var/datum/gas_mixture/air1 = AIR1
+ var/datum/gas_mixture/air2 = AIR2
+
+ var/datum/gas_mixture/environment = loc.return_air()
+ var/environment_pressure = environment.return_pressure()
+
+ if(pump_direction) //input -> external
+ var/pressure_delta = 10000
+
+ if(pressure_checks&EXT_BOUND)
+ pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure))
+ if(pressure_checks&INPUT_MIN)
+ pressure_delta = min(pressure_delta, (air1.return_pressure() - input_pressure_min))
+
+ if(pressure_delta > 0)
+ if(air1.temperature > 0)
+ var/transfer_moles = pressure_delta*environment.volume/(air1.temperature * R_IDEAL_GAS_EQUATION)
+
+ var/datum/gas_mixture/removed = air1.remove(transfer_moles)
+ //Removed can be null if there is no atmosphere in air1
+ if(!removed)
+ return
+
+ loc.assume_air(removed)
+ air_update_turf()
+
+ var/datum/pipeline/parent1 = PARENT1
+ parent1.update = 1
+
+ else //external -> output
+ var/pressure_delta = 10000
+
+ if(pressure_checks&EXT_BOUND)
+ pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound))
+ if(pressure_checks&INPUT_MIN)
+ pressure_delta = min(pressure_delta, (output_pressure_max - air2.return_pressure()))
+
+ if(pressure_delta > 0)
+ if(environment.temperature > 0)
+ var/transfer_moles = pressure_delta*air2.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
+
+ var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+ //removed can be null if there is no air in the location
+ if(!removed)
+ return
+
+ air2.merge(removed)
+ air_update_turf()
+
+ var/datum/pipeline/parent2 = PARENT2
+ parent2.update = 1
+
+ //Radio remote control
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/proc/set_frequency(new_frequency)
+ SSradio.remove_object(src, frequency)
+ frequency = new_frequency
+ if(frequency)
+ radio_connection = SSradio.add_object(src, frequency, filter = GLOB.RADIO_ATMOSIA)
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/proc/broadcast_status()
+ if(!radio_connection)
+ return
+
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.source = src
+
+ signal.data = list(
+ "tag" = id,
+ "device" = "ADVP",
+ "power" = on,
+ "direction" = pump_direction?("release"):("siphon"),
+ "checks" = pressure_checks,
+ "input" = input_pressure_min,
+ "output" = output_pressure_max,
+ "external" = external_pressure_bound,
+ "sigtype" = "status"
+ )
+ radio_connection.post_signal(src, signal, filter = GLOB.RADIO_ATMOSIA)
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/atmosinit()
+ ..()
+ if(frequency)
+ set_frequency(frequency)
+ broadcast_status()
+
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/receive_signal(datum/signal/signal)
+ if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
+ return
+
+ if("power" in signal.data)
+ on = text2num(signal.data["power"])
+
+ if("power_toggle" in signal.data)
+ on = !on
+
+ if("set_direction" in signal.data)
+ pump_direction = text2num(signal.data["set_direction"])
+
+ if("checks" in signal.data)
+ pressure_checks = text2num(signal.data["checks"])
+
+ if("purge" in signal.data)
+ pressure_checks &= ~1
+ pump_direction = 0
+
+ if("stabalize" in signal.data)
+ pressure_checks |= 1
+ pump_direction = 1
+
+ if("set_input_pressure" in signal.data)
+ input_pressure_min = Clamp(text2num(signal.data["set_input_pressure"]),0,ONE_ATMOSPHERE*50)
+
+ if("set_output_pressure" in signal.data)
+ output_pressure_max = Clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50)
+
+ if("set_external_pressure" in signal.data)
+ external_pressure_bound = Clamp(text2num(signal.data["set_external_pressure"]),0,ONE_ATMOSPHERE*50)
+
+ if("status" in signal.data)
+ spawn(2)
+ broadcast_status()
+ return //do not update_icon
+ //if(signal.data["tag"])
+ spawn(2)
+ broadcast_status()
+ update_icon()
+
+#undef EXT_BOUND
+#undef INPUT_MIN
+#undef OUTPUT_MAX
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
index d2e6a3ae72..158c272543 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
@@ -12,7 +12,7 @@ Passive gate is similar to the regular pump except:
name = "passive gate"
desc = "A one-way air valve that does not require power."
- can_unwrench = 1
+ can_unwrench = TRUE
var/on = FALSE
var/target_pressure = ONE_ATMOSPHERE
@@ -36,7 +36,7 @@ Passive gate is similar to the regular pump except:
/obj/machinery/atmospherics/components/binary/passive_gate/process_atmos()
..()
if(!on)
- return 0
+ return
var/datum/gas_mixture/air1 = AIR1
var/datum/gas_mixture/air2 = AIR2
@@ -47,7 +47,7 @@ Passive gate is similar to the regular pump except:
if(output_starting_pressure >= min(target_pressure,input_starting_pressure-10))
//No need to pump gas if target is already reached or input pressure is too low
//Need at least 10 KPa difference to overcome friction in the mechanism
- return 1
+ return
//Calculate necessary moles to transfer using PV = nRT
if((air1.total_moles() > 0) && (air1.temperature>0))
@@ -73,7 +73,7 @@ Passive gate is similar to the regular pump except:
/obj/machinery/atmospherics/components/binary/passive_gate/proc/broadcast_status()
if(!radio_connection)
- return 0
+ return
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
@@ -89,8 +89,6 @@ Passive gate is similar to the regular pump except:
radio_connection.post_signal(src, signal, filter = GLOB.RADIO_ATMOSIA)
- return 1
-
/obj/machinery/atmospherics/components/binary/passive_gate/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -137,7 +135,7 @@ Passive gate is similar to the regular pump except:
/obj/machinery/atmospherics/components/binary/passive_gate/receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
- return 0
+ return
var/old_on = on //for logging
@@ -159,16 +157,14 @@ Passive gate is similar to the regular pump except:
broadcast_status()
update_icon()
- return
/obj/machinery/atmospherics/components/binary/passive_gate/power_change()
..()
update_icon()
/obj/machinery/atmospherics/components/binary/passive_gate/can_unwrench(mob/user)
- if(..())
- if(on)
- to_chat(user, "You cannot unwrench [src], turn it off first!")
- else
- return 1
+ . = ..()
+ if(. && on)
+ to_chat(user, "You cannot unwrench [src], turn it off first!")
+ return FALSE
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
index 0ec1b57a2e..c5242fb5cc 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
@@ -17,7 +17,7 @@ Thus, the two variables affect pump operation are set in New():
name = "gas pump"
desc = "A pump that moves gas by pressure."
- can_unwrench = 1
+ can_unwrench = TRUE
var/on = FALSE
var/target_pressure = ONE_ATMOSPHERE
@@ -36,7 +36,7 @@ Thus, the two variables affect pump operation are set in New():
return ..()
/obj/machinery/atmospherics/components/binary/pump/update_icon_nopipes()
- if(stat & NOPOWER)
+ if(!is_operational())
icon_state = "pump_off"
return
@@ -44,10 +44,8 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/pump/process_atmos()
// ..()
- if(stat & (NOPOWER|BROKEN))
- return 0
- if(!on)
- return 0
+ if(!on || !is_operational())
+ return
var/datum/gas_mixture/air1 = AIR1
var/datum/gas_mixture/air2 = AIR2
@@ -56,7 +54,7 @@ Thus, the two variables affect pump operation are set in New():
if((target_pressure - output_starting_pressure) < 0.01)
//No need to pump gas if target is already reached!
- return 1
+ return
//Calculate necessary moles to transfer using PV=nRT
if((air1.total_moles() > 0) && (air1.temperature>0))
@@ -69,8 +67,6 @@ Thus, the two variables affect pump operation are set in New():
update_parents()
- return 1
-
//Radio remote control
/obj/machinery/atmospherics/components/binary/pump/proc/set_frequency(new_frequency)
SSradio.remove_object(src, frequency)
@@ -80,7 +76,7 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/pump/proc/broadcast_status()
if(!radio_connection)
- return 0
+ return
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
@@ -96,8 +92,6 @@ Thus, the two variables affect pump operation are set in New():
radio_connection.post_signal(src, signal, filter = GLOB.RADIO_ATMOSIA)
- return 1
-
/obj/machinery/atmospherics/components/binary/pump/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -121,8 +115,7 @@ Thus, the two variables affect pump operation are set in New():
if("power")
on = !on
investigate_log("Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
- message_admins("Pump, [src.name], turned [on ? "on" : "off"] by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
- log_admin("[key_name(usr)] manipulated a pump at [x], [y], [z]")
+ message_admins("Pump, [src.name], turned [on ? "on" : "off"] by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)], [A]")
. = TRUE
if("pressure")
var/pressure = params["pressure"]
@@ -139,8 +132,7 @@ Thus, the two variables affect pump operation are set in New():
if(.)
target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
investigate_log("Pump, [src.name], was set to [target_pressure] kPa by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
- message_admins("Pump, [src.name], was set to [target_pressure] kPa by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
- log_admin("[key_name(usr)] manipulated a pump at [x], [y], [z]")
+ message_admins("Pump, [src.name], was set to [target_pressure] kPa by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)], [A]")
update_icon()
/obj/machinery/atmospherics/components/binary/pump/atmosinit()
@@ -150,7 +142,7 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/pump/receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
- return 0
+ return
var/old_on = on //for logging
@@ -172,21 +164,18 @@ Thus, the two variables affect pump operation are set in New():
broadcast_status()
update_icon()
- return
/obj/machinery/atmospherics/components/binary/pump/power_change()
..()
update_icon()
/obj/machinery/atmospherics/components/binary/pump/can_unwrench(mob/user)
- if(..())
- var/turf/T = get_turf(src)
- var/area/A = get_area(src)
- if(!(stat & NOPOWER) && on)
- to_chat(user, "You cannot unwrench [src], turn it off first!")
- else
- investigate_log("Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
- message_admins("Pump, [src.name], was unwrenched by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(T)]")
- log_admin("[key_name(usr)] unwrenched a pump at [x], [y], [z]")
- return 1
-
+ . = ..()
+ var/area/A = get_area(src)
+ if(. && on && is_operational())
+ to_chat(user, "You cannot unwrench [src], turn it off first!")
+ return FALSE
+ else
+ investigate_log("Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
+ message_admins("Pump, [src.name], was unwrenched by [ADMIN_LOOKUPFLW(user)] at [A]")
+ return TRUE
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
index bbee3bcb59..7ef6cf2142 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
@@ -7,7 +7,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
name = "manual valve"
desc = "A pipe valve"
- can_unwrench = 1
+ can_unwrench = TRUE
var/frequency = 0
var/id = null
@@ -57,8 +57,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
var/turf/T = get_turf(src)
var/area/A = get_area(src)
investigate_log("Valve, [src.name], was manipiulated by [key_name(usr)] at [x], [y], [z], [A]", "atmos")
- message_admins("Valve, [src.name], was manipulated by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(T)]")
- log_admin("[key_name(usr)] manipulated a manual valve at [x], [y], [z]")
+ message_admins("Valve, [src.name], was manipulated by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(T)], [A]")
/obj/machinery/atmospherics/components/binary/valve/digital // can be controlled by AI
@@ -71,7 +70,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
return src.attack_hand(user)
/obj/machinery/atmospherics/components/binary/valve/digital/update_icon_nopipes(animation)
- if(stat & NOPOWER)
+ if(!is_operational())
normalize_dir()
icon_state = "dvalve_nopower"
return
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
index 4d3cf733fb..227c34d9ca 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
@@ -17,7 +17,7 @@ Thus, the two variables affect pump operation are set in New():
name = "volumetric gas pump"
desc = "A pump that moves gas by volume."
- can_unwrench = 1
+ can_unwrench = TRUE
var/on = FALSE
var/transfer_rate = MAX_TRANSFER_RATE
@@ -34,7 +34,7 @@ Thus, the two variables affect pump operation are set in New():
on = TRUE
/obj/machinery/atmospherics/components/binary/volume_pump/update_icon_nopipes()
- if(stat & NOPOWER)
+ if(!is_operational())
icon_state = "volpump_off"
return
@@ -42,10 +42,8 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/volume_pump/process_atmos()
// ..()
- if(stat & (NOPOWER|BROKEN))
+ if(!on || !is_operational())
return
- if(!on)
- return 0
var/datum/gas_mixture/air1 = AIR1
var/datum/gas_mixture/air2 = AIR2
@@ -56,7 +54,7 @@ Thus, the two variables affect pump operation are set in New():
var/output_starting_pressure = air2.return_pressure()
if((input_starting_pressure < 0.01) || (output_starting_pressure > 9000))
- return 1
+ return
var/transfer_ratio = min(1, transfer_rate/air1.volume)
@@ -66,8 +64,6 @@ Thus, the two variables affect pump operation are set in New():
update_parents()
- return 1
-
/obj/machinery/atmospherics/components/binary/volume_pump/proc/set_frequency(new_frequency)
SSradio.remove_object(src, frequency)
frequency = new_frequency
@@ -76,7 +72,7 @@ Thus, the two variables affect pump operation are set in New():
/obj/machinery/atmospherics/components/binary/volume_pump/proc/broadcast_status()
if(!radio_connection)
- return 0
+ return
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
@@ -91,8 +87,6 @@ Thus, the two variables affect pump operation are set in New():
)
radio_connection.post_signal(src, signal)
- return 1
-
/obj/machinery/atmospherics/components/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -116,14 +110,12 @@ Thus, the two variables affect pump operation are set in New():
if(..())
return
var/turf/T = get_turf(src)
- //var/area/A = get_area(src)
+ var/area/A = get_area(src)
switch(action)
if("power")
on = !on
- investigate_log("Volume Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [loc.loc]", INVESTIGATE_ATMOS)
- message_admins("Volume Pump, [src.name], turned [on ? "on" : "off"] by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
- log_admin("[key_name(usr)] manipulated a volume pump at [x], [y], [z]")
-
+ investigate_log("Volume Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
+ message_admins("Volume Pump, [src.name], turned [on ? "on" : "off"] by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)], [A]")
. = TRUE
if("rate")
var/rate = params["rate"]
@@ -139,14 +131,13 @@ Thus, the two variables affect pump operation are set in New():
. = TRUE
if(.)
transfer_rate = Clamp(rate, 0, MAX_TRANSFER_RATE)
- investigate_log("Volume Pump, [src.name], was set to [transfer_rate] L/s by [key_name(usr)] at [x], [y], [z], [loc.loc]", INVESTIGATE_ATMOS)
- message_admins("Volume Pump, [src.name], was set to [transfer_rate] L/s by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
- log_admin("[key_name(usr)] manipulated a volume pump at [x], [y], [z]")
+ investigate_log("Volume Pump, [src.name], was set to [transfer_rate] L/s by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
+ message_admins("Volume Pump, [src.name], was set to [transfer_rate] L/s by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)], [A]")
update_icon()
/obj/machinery/atmospherics/components/binary/volume_pump/receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
- return 0
+ return
var/old_on = on //for logging
@@ -169,22 +160,18 @@ Thus, the two variables affect pump operation are set in New():
broadcast_status()
update_icon()
- return
/obj/machinery/atmospherics/components/binary/volume_pump/power_change()
..()
update_icon()
/obj/machinery/atmospherics/components/binary/volume_pump/can_unwrench(mob/user)
- if(..())
- var/turf/T = get_turf(src)
- //var/area/A = get_area(src)
- if(!(stat & NOPOWER) && on)
- to_chat(user, "You cannot unwrench [src], turn it off first!")
- else
- investigate_log("Volume Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [loc.loc]", INVESTIGATE_ATMOS)
- message_admins("Volume Pump, [src.name], was unwrenched by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
- log_admin("[key_name(usr)] unwrenched a volume pump at [x], [y], [z]")
-
- return 1
-
+ . = ..()
+ var/area/A = get_area(src)
+ if(. && on && is_operational())
+ to_chat(user, "You cannot unwrench [src], turn it off first!")
+ return FALSE
+ else
+ investigate_log("Volume Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
+ message_admins("Volume Pump, [src.name], was unwrenched by [ADMIN_LOOKUPFLW(usr)] at [A]")
+ return
diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm
index 95357a4a7f..5fb4611d92 100644
--- a/code/modules/atmospherics/machinery/components/components_base.dm
+++ b/code/modules/atmospherics/machinery/components/components_base.dm
@@ -23,18 +23,6 @@ On top of that, now people can add component-speciic procs/vars if they want!
Iconnery
*/
-/obj/machinery/atmospherics/components/proc/icon_addintact(var/obj/machinery/atmospherics/node)
- var/image/img = getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "pipe_intact", get_dir(src,node), node.pipe_color)
- underlays += img
-
- return img.dir
-
-/obj/machinery/atmospherics/components/proc/icon_addbroken(var/connected = FALSE)
- var/unconnected = (~connected) & initialize_directions
- for(var/direction in GLOB.cardinals)
- if(unconnected & direction)
- underlays += getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "pipe_exposed", direction)
-
/obj/machinery/atmospherics/components/proc/update_icon_nopipes()
return
@@ -52,7 +40,7 @@ Iconnery
if(!showpipe)
return //no need to update the pipes if they aren't showing
- var/connected = FALSE
+ var/connected = 0 //Direction bitset
for(DEVICE_TYPE_LOOP) //adds intact pieces
if(NODE_I)
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
index 87edfe8d11..c777e5fe17 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
@@ -2,7 +2,7 @@
name = "gas filter"
icon_state = "filter_off"
density = FALSE
- can_unwrench = 1
+ can_unwrench = TRUE
var/on = FALSE
var/target_pressure = ONE_ATMOSPHERE
var/filter_type = ""
@@ -11,7 +11,7 @@
/obj/machinery/atmospherics/components/trinary/filter/flipped
icon_state = "filter_off_f"
- flipped = 1
+ flipped = TRUE
// These two filter types have critical_machine flagged to on and thus causes the area they are in to be exempt from the Grid Check event.
@@ -43,27 +43,21 @@
..()
/obj/machinery/atmospherics/components/trinary/filter/update_icon_nopipes()
-
- if(!(stat & NOPOWER) && on && NODE1 && NODE2 && NODE3)
+ if(on && NODE1 && NODE2 && NODE3 && is_operational())
icon_state = "filter_on[flipped?"_f":""]"
return
-
icon_state = "filter_off[flipped?"_f":""]"
/obj/machinery/atmospherics/components/trinary/filter/power_change()
var/old_stat = stat
..()
- if(stat & NOPOWER)
- on = FALSE
- if(old_stat != stat)
+ if(stat != old_stat)
update_icon()
/obj/machinery/atmospherics/components/trinary/filter/process_atmos()
..()
- if(!on)
- return 0
- if(!(NODE1 && NODE2 && NODE3))
- return 0
+ if(!on || !(NODE1 && NODE2 && NODE3) || !is_operational())
+ return
var/datum/gas_mixture/air1 = AIR1
var/datum/gas_mixture/air2 = AIR2
@@ -73,7 +67,7 @@
if(output_starting_pressure >= target_pressure)
//No need to mix if target is already full!
- return 1
+ return
//Calculate necessary moles to transfer using PV=nRT
@@ -113,8 +107,6 @@
update_parents()
- return 1
-
/obj/machinery/atmospherics/components/trinary/filter/atmosinit()
set_frequency(frequency)
return ..()
@@ -167,3 +159,10 @@
investigate_log("was set to filter [filter_name] by [key_name(usr)]", INVESTIGATE_ATMOS)
. = TRUE
update_icon()
+
+/obj/machinery/atmospherics/components/trinary/filter/can_unwrench(mob/user)
+ . = ..()
+ if(. && on && is_operational())
+ to_chat(user, "You cannot unwrench [src], turn it off first!")
+ return FALSE
+
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
index 8c2622bb42..cb515ec75f 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
@@ -3,7 +3,7 @@
density = FALSE
name = "gas mixer"
- can_unwrench = 1
+ can_unwrench = TRUE
var/on = FALSE
@@ -15,7 +15,7 @@
/obj/machinery/atmospherics/components/trinary/mixer/flipped
icon_state = "mixer_off_f"
- flipped = 1
+ flipped = TRUE
/obj/machinery/atmospherics/components/trinary/mixer/update_icon()
cut_overlays()
@@ -29,18 +29,15 @@
return ..()
/obj/machinery/atmospherics/components/trinary/mixer/update_icon_nopipes()
- if(!(stat & NOPOWER) && on && NODE1 && NODE2 && NODE3)
+ if(on && NODE1 && NODE2 && NODE3 && is_operational())
icon_state = "mixer_on[flipped?"_f":""]"
return
-
icon_state = "mixer_off[flipped?"_f":""]"
/obj/machinery/atmospherics/components/trinary/mixer/power_change()
var/old_stat = stat
..()
- if(stat & NOPOWER)
- on = FALSE
- if(old_stat != stat)
+ if(stat != old_stat)
update_icon()
/obj/machinery/atmospherics/components/trinary/mixer/New()
@@ -51,10 +48,8 @@
/obj/machinery/atmospherics/components/trinary/mixer/process_atmos()
..()
- if(!on)
- return 0
- if(!(NODE1 && NODE2 && NODE3))
- return 0
+ if(!on || !(NODE1 && NODE2 && NODE3) && !is_operational())
+ return
var/datum/gas_mixture/air1 = AIR1
var/datum/gas_mixture/air2 = AIR2
@@ -64,7 +59,7 @@
if(output_starting_pressure >= target_pressure)
//No need to mix if target is already full!
- return 1
+ return
//Calculate necessary moles to transfer using PV=nRT
@@ -114,7 +109,7 @@
var/datum/pipeline/parent3 = PARENT3
parent3.update = TRUE
- return TRUE
+ return
/obj/machinery/atmospherics/components/trinary/mixer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
@@ -167,4 +162,12 @@
node1_concentration = max(0, min(1, node1_concentration - value))
investigate_log("was set to [node2_concentration] % on node 2 by [key_name(usr)]", INVESTIGATE_ATMOS)
. = TRUE
- update_icon()
\ No newline at end of file
+ update_icon()
+
+
+/obj/machinery/atmospherics/components/trinary/filter/can_unwrench(mob/user)
+ . = ..()
+ if(. && on && is_operational())
+ to_chat(user, "You cannot unwrench [src], turn it off first!")
+ return FALSE
+
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm
index 199d1907d8..14495cd237 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm
@@ -6,7 +6,7 @@
device_type = TRINARY
layer = GAS_FILTER_LAYER
- var/flipped = 0
+ var/flipped = FALSE
/obj/machinery/atmospherics/components/trinary/SetInitDirections()
switch(dir)
@@ -44,4 +44,4 @@ Housekeeping and pipe network stuff
node1_connect = turn(node1_connect, 180)
node3_connect = turn(node3_connect, 180)
- return list(node1_connect, node2_connect, node3_connect)
\ No newline at end of file
+ return list(node1_connect, node2_connect, node3_connect)
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 4583680d13..e368fdde92 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -33,7 +33,7 @@
var/escape_in_progress = FALSE
var/message_cooldown
- var/breakout_time = 0.5
+ var/breakout_time = 300
/obj/machinery/atmospherics/components/unary/cryo_cell/Initialize()
. = ..()
@@ -115,7 +115,7 @@
occupant_overlay.dir = SOUTH
occupant_overlay.pixel_y = 22
- if(on && is_operational() && !running_bob_anim)
+ if(on && !running_bob_anim && is_operational())
icon_state = "pod-on"
running_bob_anim = TRUE
run_bob_anim(TRUE, occupant_overlay)
@@ -246,9 +246,9 @@
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + CLICK_CD_BREAKOUT
user.visible_message("You see [user] kicking against the glass of [src]!", \
- "You struggle inside [src], kicking the release with your foot... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \
+ "You struggle inside [src], kicking the release with your foot... (this will take about [DisplayTimeText(breakout_time)].)", \
"You hear a thump from [src].")
- if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds
+ if(do_after(user,(breakout_time), target = src))
if(!user || user.stat != CONSCIOUS || user.loc != src )
return
user.visible_message("[user] successfully broke out of [src]!", \
@@ -349,7 +349,7 @@
data["cellTemperature"] = round(air1.temperature, 1)
data["isBeakerLoaded"] = beaker ? TRUE : FALSE
- var beakerContents = list()
+ var/beakerContents = list()
if(beaker && beaker.reagents && beaker.reagents.reagent_list.len)
for(var/datum/reagent/R in beaker.reagents.reagent_list)
beakerContents += list(list("name" = R.name, "volume" = R.volume))
@@ -378,6 +378,8 @@
if("ejectbeaker")
if(beaker)
beaker.forceMove(loc)
+ if(Adjacent(usr) && !issilicon(usr))
+ usr.put_in_hands(beaker)
beaker = null
. = TRUE
update_icon()
@@ -394,4 +396,11 @@
/obj/machinery/atmospherics/components/unary/cryo_cell/can_see_pipes()
return 0 //you can't see the pipe network when inside a cryo cell.
+/obj/machinery/atmospherics/components/unary/cryo_cell/return_temperature()
+ var/datum/gas_mixture/G = AIR1
+
+ if(G.total_moles() > 10)
+ return G.temperature
+ return ..()
+
#undef CRYOMOBS
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm b/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm
index 5ed771d41c..a1a67e2542 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm
@@ -10,12 +10,7 @@
var/update_cycle
/obj/machinery/atmospherics/components/unary/generator_input/update_icon()
- if(NODE1)
- icon_state = "intact"
- else
- icon_state = "exposed"
-
- return
+ icon_state = NODE1 ? "intact" : "exposed"
/obj/machinery/atmospherics/components/unary/generator_input/proc/return_exchange_air()
return AIR1
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
index 30ff1ebc30..ee6e31175b 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
@@ -5,7 +5,7 @@
name = "heat exchanger"
desc = "Exchanges heat between two input gases. Setup for fast heat transfer"
- can_unwrench = 1
+ can_unwrench = TRUE
layer = LOW_OBJ_LAYER
@@ -20,8 +20,6 @@
else
icon_state = "he_exposed"
- return
-
/obj/machinery/atmospherics/components/unary/heat_exchanger/atmosinit()
if(!partner)
var/partner_connect = turn(dir,180)
@@ -36,11 +34,8 @@
/obj/machinery/atmospherics/components/unary/heat_exchanger/process_atmos()
..()
- if(!partner)
- return 0
-
- if(SSair.times_fired <= update_cycle)
- return 0
+ if(!partner || SSair.times_fired <= update_cycle)
+ return
update_cycle = SSair.times_fired
partner.update_cycle = SSair.times_fired
@@ -67,5 +62,3 @@
if(abs(other_old_temperature-partner_air_contents.temperature) > 1)
partner.update_parents()
-
- return 1
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
index 0bf467f234..d46d5b47a0 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
@@ -30,7 +30,7 @@
if(showpipe)
add_overlay(getpipeimage(icon, "inje_cap", initialize_directions))
- if(!NODE1 || !on || stat & (NOPOWER|BROKEN))
+ if(!NODE1 || !on || !is_operational())
icon_state = "inje_off"
return
@@ -47,8 +47,8 @@
..()
injecting = 0
- if(!on || stat & (NOPOWER|BROKEN))
- return 0
+ if(!on || !is_operational())
+ return
var/datum/gas_mixture/air_contents = AIR1
@@ -62,11 +62,9 @@
update_parents()
- return 1
-
/obj/machinery/atmospherics/components/unary/outlet_injector/proc/inject()
- if(on || injecting || stat & (NOPOWER|BROKEN))
- return 0
+ if(on || injecting || !is_operational())
+ return
var/datum/gas_mixture/air_contents = AIR1
@@ -91,7 +89,7 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/proc/broadcast_status()
if(!radio_connection)
- return 0
+ return
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
@@ -108,8 +106,6 @@
radio_connection.post_signal(src, signal)
- return 1
-
/obj/machinery/atmospherics/components/unary/outlet_injector/atmosinit()
set_frequency(frequency)
broadcast_status()
@@ -117,7 +113,7 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
- return 0
+ return
if("power" in signal.data)
on = text2num(signal.data["power"])
@@ -139,8 +135,6 @@
broadcast_status()
return //do not update_icon
- //log_admin("DEBUG \[[world.timeofday]\]: outlet_injector/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
- //return
spawn(2)
broadcast_status()
update_icon()
@@ -188,9 +182,8 @@
broadcast_status()
/obj/machinery/atmospherics/components/unary/outlet_injector/can_unwrench(mob/user)
- if(..())
- if (!(stat & NOPOWER|BROKEN) && on)
- to_chat(user, "You cannot unwrench [src], turn it off first!")
- else
- return 1
+ . = ..()
+ if(. && on && is_operational())
+ to_chat(user, "You cannot unwrench [src], turn it off first!")
+ return FALSE
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
index 65f2c37ac7..e31d1efa96 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
@@ -19,7 +19,7 @@
if(showpipe)
add_overlay(getpipeimage('icons/obj/atmospherics/components/unary_devices.dmi', "scrub_cap", initialize_directions)) //it works for now
- if(!NODE1 || !on || stat & BROKEN)
+ if(!NODE1 || !on || !is_operational())
icon_state = "o2gen_off"
return
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
index 7dd6d62314..e17a2f796c 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
@@ -3,7 +3,7 @@
desc = "For connecting portables devices related to atmospherics control."
icon = 'icons/obj/atmospherics/components/unary_devices.dmi'
icon_state = "connector_map" //Only for mapping purposes, so mappers can see direction
- can_unwrench = 1
+ can_unwrench = TRUE
var/obj/machinery/portable_atmospherics/connected_device
use_power = NO_POWER_USE
level = 0
@@ -29,11 +29,10 @@
return ..()
/obj/machinery/atmospherics/components/unary/portables_connector/can_unwrench(mob/user)
- if(..())
- if(connected_device)
- to_chat(user, "You cannot unwrench [src], detach [connected_device] first!")
- else
- return 1
+ . = ..()
+ if(. && connected_device)
+ to_chat(user, "You cannot unwrench [src], detach [connected_device] first!")
+ return FALSE
/obj/machinery/atmospherics/components/unary/portables_connector/portableConnectorReturnAir()
return connected_device.portableConnectorReturnAir()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
index 6ea8b717bf..17fa3b2cdf 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
@@ -39,7 +39,6 @@
icon_state = icon_state_on
else
icon_state = initial(icon_state)
- return
/obj/machinery/atmospherics/components/unary/thermomachine/update_icon_nopipes()
cut_overlays()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index f52d2d9b2b..df44b4ca9e 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -10,7 +10,7 @@
desc = "Has a valve and pump attached to it."
icon_state = "vent_map"
use_power = IDLE_POWER_USE
- can_unwrench = 1
+ can_unwrench = TRUE
welded = FALSE
level = 1
layer = GAS_SCRUBBER_LAYER
@@ -92,7 +92,7 @@
icon_state = "vent_welded"
return
- if(!NODE1 || !on || stat & (NOPOWER|BROKEN))
+ if(!NODE1 || !on || !is_operational())
icon_state = "vent_off"
return
@@ -103,12 +103,12 @@
/obj/machinery/atmospherics/components/unary/vent_pump/process_atmos()
..()
- if(stat & (NOPOWER|BROKEN))
+ if(!is_operational())
return
- if (!NODE1)
+ if(!NODE1)
on = FALSE
if(!on || welded)
- return 0
+ return
var/datum/gas_mixture/air_contents = AIR1
var/datum/gas_mixture/environment = loc.return_air()
@@ -150,8 +150,6 @@
air_update_turf()
update_parents()
- return 1
-
//Radio remote control
/obj/machinery/atmospherics/components/unary/vent_pump/proc/set_frequency(new_frequency)
@@ -162,7 +160,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/proc/broadcast_status()
if(!radio_connection)
- return 0
+ return
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
@@ -189,8 +187,6 @@
radio_connection.post_signal(src, signal, radio_filter_out)
- return 1
-
/obj/machinery/atmospherics/components/unary/vent_pump/atmosinit()
//some vents work his own spesial way
@@ -202,11 +198,11 @@
..()
/obj/machinery/atmospherics/components/unary/vent_pump/receive_signal(datum/signal/signal)
- if(stat & (NOPOWER|BROKEN))
+ if(!is_operational())
return
//log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/atmospherics/components/unary/vent_pump/receive_signal([signal.debug_print()])")
if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
- return 0
+ return
if("purge" in signal.data)
pressure_checks &= ~EXT_BOUND
@@ -257,7 +253,6 @@
//log_admin("DEBUG \[[world.timeofday]\]: vent_pump/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
broadcast_status()
update_icon()
- return
/obj/machinery/atmospherics/components/unary/vent_pump/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weldingtool))
@@ -266,7 +261,8 @@
playsound(loc, WT.usesound, 40, 1)
to_chat(user, "You begin welding the vent...")
if(do_after(user, 20*W.toolspeed, target = src))
- if(!src || !WT.isOn()) return
+ if(!src || !WT.isOn())
+ return
playsound(src.loc, 'sound/items/welder2.ogg', 50, 1)
if(!welded)
user.visible_message("[user] welds the vent shut.", "You weld the vent shut.", "You hear welding.")
@@ -282,11 +278,10 @@
return ..()
/obj/machinery/atmospherics/components/unary/vent_pump/can_unwrench(mob/user)
- if(..())
- if(!(stat & NOPOWER) && on)
- to_chat(user, "You cannot unwrench [src], turn it off first!")
- else
- return 1
+ . = ..()
+ if(. && on && is_operational())
+ to_chat(user, "You cannot unwrench [src], turn it off first!")
+ return FALSE
/obj/machinery/atmospherics/components/unary/vent_pump/examine(mob/user)
..()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index 095473c32c..d92b061cec 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -8,7 +8,7 @@
use_power = IDLE_POWER_USE
idle_power_usage = 10
active_power_usage = 60
- can_unwrench = 1
+ can_unwrench = TRUE
welded = FALSE
level = 1
layer = GAS_SCRUBBER_LAYER
@@ -17,12 +17,12 @@
var/on = FALSE
var/scrubbing = SCRUBBING //0 = siphoning, 1 = scrubbing
- var/scrub_CO2 = 1
- var/scrub_Toxins = 0
- var/scrub_N2O = 0
- var/scrub_BZ = 0
- var/scrub_Freon = 0
- var/scrub_WaterVapor = 0
+ var/scrub_CO2 = TRUE
+ var/scrub_Toxins = FALSE
+ var/scrub_N2O = FALSE
+ var/scrub_BZ = FALSE
+ var/scrub_Freon = FALSE
+ var/scrub_WaterVapor = FALSE
var/volume_rate = 200
@@ -58,12 +58,8 @@
return ..()
/obj/machinery/atmospherics/components/unary/vent_scrubber/auto_use_power()
- if(!powered(power_channel))
- return 0
- if(!on || welded)
- return 0
- if(stat & (NOPOWER|BROKEN))
- return 0
+ if(!on || welded || !is_operational() || !powered(power_channel))
+ return FALSE
var/amount = idle_power_usage
@@ -86,7 +82,7 @@
if(widenet)
amount += amount * (adjacent_turfs.len * (adjacent_turfs.len / 2))
use_power(amount, power_channel)
- return 1
+ return TRUE
/obj/machinery/atmospherics/components/unary/vent_scrubber/update_icon_nopipes()
cut_overlays()
@@ -97,7 +93,7 @@
icon_state = "scrub_welded"
return
- if(!NODE1 || !on || stat & (NOPOWER|BROKEN))
+ if(!NODE1 || !on || !is_operational())
icon_state = "scrub_off"
return
@@ -113,7 +109,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/broadcast_status()
if(!radio_connection)
- return 0
+ return FALSE
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
@@ -143,7 +139,7 @@
radio_connection.post_signal(src, signal, radio_filter_out)
- return 1
+ return TRUE
/obj/machinery/atmospherics/components/unary/vent_scrubber/atmosinit()
radio_filter_in = frequency==initial(frequency)?(GLOB.RADIO_FROM_AIRALARM):null
@@ -156,20 +152,21 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/process_atmos()
..()
- if(stat & (NOPOWER|BROKEN))
- return
- if (!NODE1)
+ if(!is_operational())
+ return FALSE
+ if(!NODE1)
on = FALSE
if(!on || welded)
- return 0
+ return FALSE
scrub(loc)
if(widenet)
- for (var/turf/tile in adjacent_turfs)
+ for(var/turf/tile in adjacent_turfs)
scrub(tile)
+ return TRUE
/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/scrub(var/turf/tile)
- if (!istype(tile))
- return 0
+ if(!istype(tile))
+ return FALSE
var/datum/gas_mixture/environment = tile.return_air()
var/datum/gas_mixture/air_contents = AIR1
@@ -189,8 +186,8 @@
//Take a gas sample
var/datum/gas_mixture/removed = tile.remove_air(transfer_moles)
//Nothing left to remove from the tile
- if (isnull(removed))
- return
+ if(isnull(removed))
+ return FALSE
var/list/removed_gases = removed.gases
//Filter it
@@ -199,39 +196,39 @@
filtered_out.temperature = removed.temperature
if(scrub_Toxins && removed_gases["plasma"])
- filtered_out.assert_gas("plasma")
+ filtered_out.add_gas("plasma")
filtered_gases["plasma"][MOLES] = removed_gases["plasma"][MOLES]
removed.gases["plasma"][MOLES] = 0
if(scrub_CO2 && removed_gases["co2"])
- filtered_out.assert_gas("co2")
- filtered_out.gases["co2"][MOLES] = removed_gases["co2"][MOLES]
- removed.gases["co2"][MOLES] = 0
+ filtered_out.add_gas("co2")
+ filtered_gases["co2"][MOLES] = removed_gases["co2"][MOLES]
+ removed_gases["co2"][MOLES] = 0
if(removed_gases["agent_b"])
- filtered_out.assert_gas("agent_b")
- filtered_out.gases["agent_b"][MOLES] = removed_gases["agent_b"][MOLES]
- removed.gases["agent_b"][MOLES] = 0
+ filtered_out.add_gas("agent_b")
+ filtered_gases["agent_b"][MOLES] = removed_gases["agent_b"][MOLES]
+ removed_gases["agent_b"][MOLES] = 0
if(scrub_N2O && removed_gases["n2o"])
- filtered_out.assert_gas("n2o")
- filtered_out.gases["n2o"][MOLES] = removed_gases["n2o"][MOLES]
- removed.gases["n2o"][MOLES] = 0
+ filtered_out.add_gas("n2o")
+ filtered_gases["n2o"][MOLES] = removed_gases["n2o"][MOLES]
+ removed_gases["n2o"][MOLES] = 0
if(scrub_BZ && removed_gases["bz"])
- filtered_out.assert_gas("bz")
- filtered_out.gases["bz"][MOLES] = removed_gases["bz"][MOLES]
- removed.gases["bz"][MOLES] = 0
+ filtered_out.add_gas("bz")
+ filtered_gases["bz"][MOLES] = removed_gases["bz"][MOLES]
+ removed_gases["bz"][MOLES] = 0
if(scrub_Freon && removed_gases["freon"])
- filtered_out.assert_gas("freon")
- filtered_out.gases["freon"][MOLES] = removed_gases["freon"][MOLES]
- removed.gases["freon"][MOLES] = 0
+ filtered_out.add_gas("freon")
+ filtered_gases["freon"][MOLES] = removed_gases["freon"][MOLES]
+ removed_gases["freon"][MOLES] = 0
if(scrub_WaterVapor && removed_gases["water_vapor"])
- filtered_out.assert_gas("water_vapor")
- filtered_out.gases["water_vapor"][MOLES] = removed_gases["water_vapor"][MOLES]
- removed.gases["water_vapor"][MOLES] = 0
+ filtered_out.add_gas("water_vapor")
+ filtered_gases["water_vapor"][MOLES] = removed_gases["water_vapor"][MOLES]
+ removed_gases["water_vapor"][MOLES] = 0
removed.garbage_collect()
@@ -242,8 +239,8 @@
tile.air_update_turf()
else //Just siphoning all air
- if (air_contents.return_pressure()>=50*ONE_ATMOSPHERE)
- return
+ if(air_contents.return_pressure()>=50*ONE_ATMOSPHERE)
+ return FALSE
var/transfer_moles = environment.total_moles()*(volume_rate/environment.volume)
@@ -254,7 +251,7 @@
update_parents()
- return 1
+ return TRUE
//There is no easy way for an object to be notified of changes to atmos can pass flags_1
@@ -273,7 +270,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/receive_signal(datum/signal/signal)
- if(stat & (NOPOWER|BROKEN))
+ if(!is_operational())
return
if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
return 0
@@ -363,11 +360,10 @@
return ..()
/obj/machinery/atmospherics/components/unary/vent_scrubber/can_unwrench(mob/user)
- if(..())
- if (!(stat & NOPOWER) && on)
- to_chat(user, "You cannot unwrench [src], turn it off first!")
- else
- return 1
+ . = ..()
+ if(. && on && is_operational())
+ to_chat(user, "You cannot unwrench [src], turn it off first!")
+ return FALSE
/obj/machinery/atmospherics/components/unary/vent_scrubber/can_crawl_through()
return !welded
diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm
index 67b1d0d569..11a7881a98 100644
--- a/code/modules/atmospherics/machinery/datum_pipeline.dm
+++ b/code/modules/atmospherics/machinery/datum_pipeline.dm
@@ -5,7 +5,7 @@
var/list/obj/machinery/atmospherics/pipe/members
var/list/obj/machinery/atmospherics/components/other_atmosmch
- var/update = 1
+ var/update = TRUE
/datum/pipeline/New()
other_airs = list()
@@ -25,7 +25,7 @@
/datum/pipeline/process()
if(update)
- update = 0
+ update = FALSE
reconcile_air()
update = air.react()
@@ -114,6 +114,7 @@
other_airs.Add(E.other_airs)
E.members.Cut()
E.other_atmosmch.Cut()
+ update = TRUE
qdel(E)
/obj/machinery/atmospherics/proc/addMember(obj/machinery/atmospherics/A)
@@ -195,7 +196,7 @@
(partial_heat_capacity*target.heat_capacity/(partial_heat_capacity+target.heat_capacity))
air.temperature -= heat/total_heat_capacity
- update = 1
+ update = TRUE
/datum/pipeline/proc/return_air()
. = other_airs + air
diff --git a/code/modules/atmospherics/machinery/pipes/bluespace_pipe.dm b/code/modules/atmospherics/machinery/pipes/bluespace_pipe.dm
new file mode 100644
index 0000000000..476235d3d9
--- /dev/null
+++ b/code/modules/atmospherics/machinery/pipes/bluespace_pipe.dm
@@ -0,0 +1,47 @@
+GLOBAL_LIST_EMPTY(bluespace_pipes)
+
+/obj/machinery/atmospherics/pipe/bluespace
+ name = "bluespace pipe"
+ desc = "Transmits gas across large distances of space. Developed using bluespace technology."
+ icon = 'icons/obj/atmospherics/pipes/bluespace.dmi'
+ icon_state = "map"
+ dir = SOUTH
+ initialize_directions = SOUTH
+ device_type = UNARY
+ can_buckle = FALSE
+
+/obj/machinery/atmospherics/pipe/bluespace/New()
+ icon_state = "pipe"
+ GLOB.bluespace_pipes += src
+ ..()
+
+/obj/machinery/atmospherics/pipe/bluespace/Destroy()
+ GLOB.bluespace_pipes -= src
+ for(var/p in GLOB.bluespace_pipes)
+ var/obj/machinery/atmospherics/pipe/bluespace/P = p
+ QDEL_NULL(P.parent)
+ P.build_network()
+ return ..()
+
+/obj/machinery/atmospherics/pipe/bluespace/SetInitDirections()
+ initialize_directions = dir
+
+/obj/machinery/atmospherics/pipe/bluespace/pipeline_expansion()
+ return ..() + GLOB.bluespace_pipes - src
+
+/obj/machinery/atmospherics/components/pipe/bluespace/hide()
+ update_icon()
+
+/obj/machinery/atmospherics/pipe/bluespace/update_icon(showpipe)
+ underlays.Cut()
+ var/turf/T = loc
+ if(level != 2 && T.intact)
+ return //no need to update the pipes if they aren't showing
+ var/connected = 0 //Direction bitset
+ for(DEVICE_TYPE_LOOP) //adds intact pieces
+ if(NODE_I)
+ connected |= icon_addintact(NODE_I)
+ icon_addbroken(connected) //adds broken pieces
+
+/obj/machinery/atmospherics/pipe/bluespace/paint()
+ return FALSE
diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm
index ffc797860b..49383a74cb 100644
--- a/code/modules/atmospherics/machinery/pipes/pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipes.dm
@@ -42,11 +42,6 @@
invisibility = i ? INVISIBILITY_MAXIMUM : 0
update_icon()
-/obj/machinery/atmospherics/pipe/proc/check_pressure(pressure)
- //Return 1 if parent should continue checking other pipes
- //Return null if parent should stop checking other pipes. Recall: del(src) will by default return null
- return 1
-
/obj/machinery/atmospherics/pipe/proc/releaseAirToTurf()
if(air_temporary)
var/turf/T = loc
@@ -103,3 +98,10 @@
if(damage_flag == "melee" && damage_amount < 12)
return 0
. = ..()
+
+/obj/machinery/atmospherics/pipe/proc/paint(paint_color)
+ add_atom_colour(paint_color, FIXED_COLOUR_PRIORITY)
+ pipe_color = paint_color
+ update_node_icon()
+ return TRUE
+
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index 0bed5b94c7..2dc38a48f2 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -210,7 +210,7 @@
return
if(user.ckey in team_members)
if(user.ckey in recently_dead_ckeys)
- to_chat(user, "It must be more than [respawn_cooldown/10] seconds from your last death to respawn!")
+ to_chat(user, "It must be more than [DisplayTimeText(respawn_cooldown)] from your last death to respawn!")
return
var/client/new_team_member = user.client
if(user.mind && user.mind.current)
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index ed7fb77bac..9a721bee62 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -123,7 +123,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
to_chat(user, "Error: No destination found.")
return
if(world.time < wait)
- to_chat(user, "Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.")
+ to_chat(user, "Error: Warpspace triangulation in progress. Estimated time to completion: [DisplayTimeText(wait - world.time)].")
return
for(var/obj/machinery/gateway/G in linked)
diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm
index ea1f0081e5..fa9aff7f43 100644
--- a/code/modules/awaymissions/super_secret_room.dm
+++ b/code/modules/awaymissions/super_secret_room.dm
@@ -9,10 +9,13 @@
var/times_spoken_to = 0
var/list/shenanigans = list()
-/obj/structure/speaking_tile/New()
- var/savefile/S = new /savefile("data/npc_saves/Poly.sav")
- S["phrases"] >> shenanigans
- ..()
+/obj/structure/speaking_tile/Initialize()
+ . = ..()
+ var/json_file = file("data/npc_saves/Poly.json")
+ if(!fexists(json_file))
+ return
+ var/list/json = json_decode(file2text(json_file))
+ shenanigans = json["phrases"]
/obj/structure/speaking_tile/interact(mob/user)
if(!isliving(user) || speaking)
@@ -63,7 +66,7 @@
if(204)
SpeakPeace(list("Notice how there was no special message at 200?", "The slow automation of what used to be meaningful milestones?","It's all part of the joke."))
if(250)
- SpeakPeace(list("Congratulations.", "By my very loose calculations you've now wasted a decent chunk of the round doing this.", "But you've seen this meme to its conclusion, and that's a experience in itself, right?"))
+ SpeakPeace(list("Congratulations.", "By my very loose calculations you've now wasted a decent chunk of the round doing this.", "But you've seen this meme to its conclusion, and that's an experience in itself, right?"))
if(251)
SpeakPeace(list("Anyway, here.", "I can't give you anything that would impact the progression of the round.","But you've earned this at least."))
var/obj/item/reagent_containers/food/drinks/trophy/silver_cup/the_ride = new(get_turf(user))
@@ -118,4 +121,4 @@
..()
/obj/effect/landmark/error
- name = "error"
+ name = "error"
\ No newline at end of file
diff --git a/code/modules/cargo/exports/weapons.dm b/code/modules/cargo/exports/weapons.dm
index 64e90678de..9bd8c0a6e7 100644
--- a/code/modules/cargo/exports/weapons.dm
+++ b/code/modules/cargo/exports/weapons.dm
@@ -69,4 +69,98 @@
cost = 3
unit_name = "pair"
message = "of handcuffs"
- export_types = list(/obj/item/restraints/handcuffs)
\ No newline at end of file
+ export_types = list(/obj/item/restraints/handcuffs)
+
+// relics of lavaland
+
+/datum/export/weapon/hierophant
+ cost = 40000
+ unit_name = "Hierophant Club"
+ export_types = list(/obj/item/hierophant_club)
+
+/datum/export/weapon/lava
+ cost = 40000
+ unit_name = "Lava Staff"
+ export_types = list(/obj/item/lava_staff)
+
+/datum/export/weapon/cleaving_saw
+ cost = 40000
+ unit_name = "Cleaving Saw"
+ export_types = list(/obj/item/melee/transforming/cleaving_saw)
+
+/datum/export/weapon/mayhem
+ cost = 40000
+ unit_name = "Mayhem in a bottle"
+ export_types = list(/obj/item/mayhem)
+
+/datum/export/weapon/blood_contract
+ cost = 40000
+ unit_name = "Blood Contract"
+ export_types = list(/obj/item/blood_contract)
+
+//Artifacts of lavaland
+
+/datum/export/weapon/immortality_talisman
+ cost = 10000
+ unit_name = "Immortality Talisman"
+ export_types = list(/obj/item/device/immortality_talisman)
+
+/datum/export/weapon/babel
+ cost = 10000
+ unit_name = "Book of Babel"
+ export_types = list(/obj/item/book_of_babel)
+
+/datum/export/weapon/hook
+ cost = 10000
+ unit_name = "Meat hook"
+ export_types = list(/obj/item/gun/magic/hook)
+
+/datum/export/weapon/shipbottle //the price for not breaking the bottle.
+ cost = 20000
+ unit_name = "Ship in a bottle"
+ export_types = list(/obj/item/ship_in_a_bottle)
+
+/datum/export/weapon/tarot //price for sacraficing a very profitiable ally
+ cost = 20000
+ unit_name = "Tarot cards"
+ export_types = list(/obj/item/guardiancreator)
+
+/datum/export/weapon/red //second half of telecube
+ cost = 5000
+ unit_name = "Red Cube"
+ export_types = list(/obj/item/device/warp_cube/red)
+
+/datum/export/weapon/blue //first half of telecube
+ cost = 5000
+ unit_name = "Blue Cube"
+ export_types = list(/obj/item/device/warp_cube)
+
+/datum/export/weapon/wisplantern //thermals on lavaland
+ cost = 10000
+ unit_name = "Wisp Lantern"
+ export_types = list(/obj/item/device/wisp_lantern)
+
+/datum/export/weapon/flight //if xenobiology ever reaches the point to get these without shuttle being called they deserve it
+ cost = 10000
+ unit_name = "Strange Elixer"
+ export_types = list(/obj/item/reagent_containers/glass/bottle/potion/flight)
+
+/datum/export/weapon/cheart //is a very powerfull healing artifact in the robust hands
+ cost = 10000
+ unit_name = "Cursed Heart"
+ export_types = list(/obj/item/organ/heart/cursed/wizard)
+
+/datum/export/weapon/ckatana
+ cost = 10000
+ unit_name = "Katana"
+ export_types = list(/obj/item/katana/cursed)
+
+/datum/export/weapon/geye //xray
+ cost = 10000
+ unit_name = "God eye"
+ export_types = list(/obj/item/clothing/glasses/godeye)
+
+/datum/export/weapon/spectral
+ cost = 10000
+ unit_name = "Spectral Sword"
+ export_types = list(/obj/item/melee/ghost_sword)
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index ba536acdac..c5b180d8a1 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -1643,7 +1643,11 @@
/obj/item/toy/talking/griffin,
/obj/item/toy/nuke,
/obj/item/toy/minimeteor,
- /obj/item/toy/carpplushie,
+ /obj/item/toy/plush/carpplushie,
+ /obj/item/toy/plush/lizardplushie,
+ /obj/item/toy/plush/snakeplushie,
+ /obj/item/toy/plush/nukeplushie,
+ /obj/item/toy/plush/slimeplushie,
/obj/item/coin/antagtoken,
/obj/item/stack/tile/fakespace/loaded,
/obj/item/gun/ballistic/shotgun/toy/crossbow,
diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm
index 4f576dd3e7..d5cf3aaf2c 100644
--- a/code/modules/client/asset_cache.dm
+++ b/code/modules/client/asset_cache.dm
@@ -150,7 +150,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the
//all of our asset datums, used for referring to these later
GLOBAL_LIST_EMPTY(asset_datums)
-//get a assetdatum or make a new one
+//get an assetdatum or make a new one
/proc/get_asset_datum(var/type)
if (!(type in GLOB.asset_datums))
return new type()
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 1df28192db..15b0bd95df 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -46,6 +46,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/preferred_map = null
var/uses_glasses_colour = 0
+
+ var/screenshake = 100
+ var/damagescreenshake = 2
//character preferences
var/real_name //our character's name
@@ -170,7 +173,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/parallax
var/uplink_spawn_loc = UPLINK_PDA
-
+
var/list/exp
var/list/menuoptions
@@ -363,6 +366,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "High"
dat += "
"
+ dat += "Screen Shake: [(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")]
"
+
+ if (!user.client.prefs.screenshake==0)
+ dat += "Damage Screen Shake: [(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]
"
+
dat += ""
dat += "Special Role Settings"
@@ -922,7 +930,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("flavor_text")
var/msg = input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(features["flavor_text"])) as message
if(msg != null)
- msg = copytext(msg, 1, MAX_MESSAGE_LEN)
+ msg = sanitize(copytext(msg, 1, MAX_MESSAGE_LEN))
msg = html_encode(msg)
features["flavor_text"] = msg
@@ -1486,6 +1494,20 @@ GLOBAL_LIST_EMPTY(preferences_datums)
features["exhibitionist"] = TRUE
else
features["exhibitionist"] = FALSE
+ if ("screenshake")
+ var/desiredshake = input(user, "Set the amount of screenshake you want. \n(0 = disabled, 100 = full, 200 = maximum.)", "Character Preference", screenshake) as null|num
+ if (!isnull(desiredshake))
+ screenshake = desiredshake
+ if("damagescreenshake")
+ switch(damagescreenshake)
+ if(0)
+ damagescreenshake = 1
+ if(1)
+ damagescreenshake = 2
+ if(2)
+ damagescreenshake = 0
+ else
+ damagescreenshake = 1
if("publicity")
if(unlock_content)
diff --git a/code/modules/client/preferences.dm.rej b/code/modules/client/preferences.dm.rej
deleted file mode 100644
index 02e6ad2d76..0000000000
--- a/code/modules/client/preferences.dm.rej
+++ /dev/null
@@ -1,14 +0,0 @@
-diff a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm (rejected hunks)
-@@ -130,12 +130,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
- menuoptions = list()
- return
-
--/datum/preferences/vv_edit_var(var_name, var_value)
-- var/static/list/banned_edits = list("exp")
-- if(var_name in banned_edits)
-- return FALSE
-- return ..()
--
- /datum/preferences/proc/ShowChoices(mob/user)
- if(!user || !user.client)
- return
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 909df94d14..9daad5cae7 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -48,8 +48,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
var/B_monkey = 2048
var/B_gang = 4096
var/B_abductor = 16384
+ var/B_brother = 32768
- var/list/archived = list(B_traitor,B_operative,B_changeling,B_wizard,B_malf,B_rev,B_alien,B_pai,B_cultist,B_blob,B_ninja,B_monkey,B_gang,B_abductor)
+ var/list/archived = list(B_traitor,B_operative,B_changeling,B_wizard,B_malf,B_rev,B_alien,B_pai,B_cultist,B_blob,B_ninja,B_monkey,B_gang,B_abductor,B_brother)
be_special = list()
@@ -83,6 +84,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
be_special += ROLE_MONKEY
if(16384)
be_special += ROLE_ABDUCTOR
+ if(32768)
+ be_special += ROLE_BROTHER
/datum/preferences/proc/update_preferences(current_version, savefile/S)
@@ -188,6 +191,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["menuoptions"] >> menuoptions
//citadel code
S["arousable"] >> arousable
+ S["screenshake"] >> screenshake
+ S["damagescreenshake"] >> damagescreenshake
//try to fix any outdated data if necessary
if(needs_update >= 0)
@@ -212,6 +217,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
ghost_others = sanitize_inlist(ghost_others, GLOB.ghost_others_options, GHOST_OTHERS_DEFAULT_OPTION)
menuoptions = SANITIZE_LIST(menuoptions)
be_special = SANITIZE_LIST(be_special)
+ screenshake = sanitize_integer(screenshake, 0, 200, initial(screenshake))
+ damagescreenshake = sanitize_integer(damagescreenshake, 0, 2, initial(damagescreenshake))
return 1
@@ -253,7 +260,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["enable_tips"], enable_tips)
WRITE_FILE(S["tip_delay"], tip_delay)
//citadel code
- S["arousable"] << arousable
+ WRITE_FILE(S["screenshake"], screenshake)
+ WRITE_FILE(S["damagescreenshake"], damagescreenshake)
+ WRITE_FILE(S["arousable"], arousable)
return 1
@@ -384,8 +393,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
if((S["flavor_text"] != "") && (S["flavor_text"] != null) && S["flavor_text"]) //If old text isn't null and isn't "" but still exists.
S["flavor_text"] >> features["flavor_text"] //Load old flavortext as current dna-based flavortext
- S["feature_flavor_text"] << features["flavor_text"] //Save it in our new type of flavor-text
- S["flavor_text"] << "" //Remove old flavortext, completing the cut-and-paste into the new format.
+ WRITE_FILE(S["feature_flavor_text"], features["flavor_text"]) //Save it in our new type of flavor-text
+ WRITE_FILE(S["flavor_text"] , "") //Remove old flavortext, completing the cut-and-paste into the new format.
else //We have no old flavortext, default to new
S["feature_flavor_text"] >> features["flavor_text"]
@@ -469,95 +478,95 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["version"] << SAVEFILE_VERSION_MAX //load_character will sanitize any bad data, so assume up-to-date.
//Character
- WRITE_FILE(S["OOC_Notes"] , metadata)
- WRITE_FILE(S["real_name"] , real_name)
+ WRITE_FILE(S["OOC_Notes"], metadata)
+ WRITE_FILE(S["real_name"], real_name)
WRITE_FILE(S["name_is_always_random"] , be_random_name)
WRITE_FILE(S["body_is_always_random"] , be_random_body)
- WRITE_FILE(S["gender"] , gender)
- WRITE_FILE(S["age"] , age)
- WRITE_FILE(S["hair_color"] , hair_color)
- WRITE_FILE(S["facial_hair_color"] , facial_hair_color)
- WRITE_FILE(S["eye_color"] , eye_color)
- WRITE_FILE(S["skin_tone"] , skin_tone)
- WRITE_FILE(S["hair_style_name"] , hair_style)
- WRITE_FILE(S["facial_style_name"] , facial_hair_style)
- WRITE_FILE(S["underwear"] , underwear)
- WRITE_FILE(S["undershirt"] , undershirt)
- WRITE_FILE(S["socks"] , socks)
- WRITE_FILE(S["backbag"] , backbag)
- WRITE_FILE(S["uplink_loc"] , uplink_spawn_loc)
- WRITE_FILE(S["species"] , pref_species.id)
- WRITE_FILE(S["feature_mcolor"] , features["mcolor"])
- WRITE_FILE(S["feature_lizard_tail"] , features["tail_lizard"])
- WRITE_FILE(S["feature_human_tail"] , features["tail_human"])
- WRITE_FILE(S["feature_lizard_snout"] , features["snout"])
- WRITE_FILE(S["feature_lizard_horns"] , features["horns"])
- WRITE_FILE(S["feature_human_ears"] , features["ears"])
- WRITE_FILE(S["feature_lizard_frills"] , features["frills"])
- WRITE_FILE(S["feature_lizard_spines"] , features["spines"])
- WRITE_FILE(S["feature_lizard_body_markings"] , features["body_markings"])
- WRITE_FILE(S["feature_lizard_legs"] , features["legs"])
- WRITE_FILE(S["clown_name"] , custom_names["clown"])
- WRITE_FILE(S["mime_name"] , custom_names["mime"])
- WRITE_FILE(S["ai_name"] , custom_names["ai"])
- WRITE_FILE(S["cyborg_name"] , custom_names["cyborg"])
- WRITE_FILE(S["religion_name"] , custom_names["religion"])
- WRITE_FILE(S["deity_name"] , custom_names["deity"])
- WRITE_FILE(S["prefered_security_department"] , prefered_security_department)
+ WRITE_FILE(S["gender"], gender)
+ WRITE_FILE(S["age"], age)
+ WRITE_FILE(S["hair_color"], hair_color)
+ WRITE_FILE(S["facial_hair_color"], facial_hair_color)
+ WRITE_FILE(S["eye_color"], eye_color)
+ WRITE_FILE(S["skin_tone"], skin_tone)
+ WRITE_FILE(S["hair_style_name"], hair_style)
+ WRITE_FILE(S["facial_style_name"], facial_hair_style)
+ WRITE_FILE(S["underwear"], underwear)
+ WRITE_FILE(S["undershirt"], undershirt)
+ WRITE_FILE(S["socks"], socks)
+ WRITE_FILE(S["backbag"], backbag)
+ WRITE_FILE(S["uplink_loc"], uplink_spawn_loc)
+ WRITE_FILE(S["species"], pref_species.id)
+ WRITE_FILE(S["feature_mcolor"], features["mcolor"])
+ WRITE_FILE(S["feature_lizard_tail"], features["tail_lizard"])
+ WRITE_FILE(S["feature_human_tail"], features["tail_human"])
+ WRITE_FILE(S["feature_lizard_snout"], features["snout"])
+ WRITE_FILE(S["feature_lizard_horns"], features["horns"])
+ WRITE_FILE(S["feature_human_ears"], features["ears"])
+ WRITE_FILE(S["feature_lizard_frills"], features["frills"])
+ WRITE_FILE(S["feature_lizard_spines"], features["spines"])
+ WRITE_FILE(S["feature_lizard_body_markings"], features["body_markings"])
+ WRITE_FILE(S["feature_lizard_legs"] , features["legs"])
+ WRITE_FILE(S["clown_name"], custom_names["clown"])
+ WRITE_FILE(S["mime_name"], custom_names["mime"])
+ WRITE_FILE(S["ai_name"] , custom_names["ai"])
+ WRITE_FILE(S["cyborg_name"], custom_names["cyborg"])
+ WRITE_FILE(S["religion_name"], custom_names["religion"])
+ WRITE_FILE(S["deity_name"], custom_names["deity"])
+ WRITE_FILE(S["prefered_security_department"], prefered_security_department)
//Jobs
- WRITE_FILE(S["joblessrole"] , joblessrole)
- WRITE_FILE(S["job_civilian_high"] , job_civilian_high)
- WRITE_FILE(S["job_civilian_med"] , job_civilian_med)
- WRITE_FILE(S["job_civilian_low"] , job_civilian_low)
- WRITE_FILE(S["job_medsci_high"] , job_medsci_high)
- WRITE_FILE(S["job_medsci_med"] , job_medsci_med)
- WRITE_FILE(S["job_medsci_low"] , job_medsci_low)
- WRITE_FILE(S["job_engsec_high"] , job_engsec_high)
- WRITE_FILE(S["job_engsec_med"] , job_engsec_med)
- WRITE_FILE(S["job_engsec_low"] , job_engsec_low)
+ WRITE_FILE(S["joblessrole"], joblessrole)
+ WRITE_FILE(S["job_civilian_high"], job_civilian_high)
+ WRITE_FILE(S["job_civilian_med"], job_civilian_med)
+ WRITE_FILE(S["job_civilian_low"], job_civilian_low)
+ WRITE_FILE(S["job_medsci_high"], job_medsci_high)
+ WRITE_FILE(S["job_medsci_med"], job_medsci_med)
+ WRITE_FILE(S["job_medsci_low"], job_medsci_low)
+ WRITE_FILE(S["job_engsec_high"], job_engsec_high)
+ WRITE_FILE(S["job_engsec_med"], job_engsec_med)
+ WRITE_FILE(S["job_engsec_low"], job_engsec_low)
//Citadel
- S["feature_genitals_use_skintone"] << features["genitals_use_skintone"]
- S["feature_exhibitionist"] << features["exhibitionist"]
- S["feature_mcolor2"] << features["mcolor2"]
- S["feature_mcolor3"] << features["mcolor3"]
- S["feature_mam_body_markings"] << features["mam_body_markings"]
- S["feature_mam_tail"] << features["mam_tail"]
- S["feature_mam_ears"] << features["mam_ears"]
- S["feature_mam_tail_animated"] << features["mam_tail_animated"]
- S["feature_taur"] << features["taur"]
+ WRITE_FILE(S["feature_genitals_use_skintone"], features["genitals_use_skintone"])
+ WRITE_FILE(S["feature_exhibitionist"], features["exhibitionist"])
+ WRITE_FILE(S["feature_mcolor2"], features["mcolor2"])
+ WRITE_FILE(S["feature_mcolor3"], features["mcolor3"])
+ WRITE_FILE(S["feature_mam_body_markings"], features["mam_body_markings"])
+ WRITE_FILE(S["feature_mam_tail"], features["mam_tail"])
+ WRITE_FILE(S["feature_mam_ears"], features["mam_ears"])
+ WRITE_FILE(S["feature_mam_tail_animated"], features["mam_tail_animated"])
+ WRITE_FILE(S["feature_taur"], features["taur"])
//Xeno features
- S["feature_xeno_tail"] << features["xenotail"]
- S["feature_xeno_dors"] << features["xenodorsal"]
- S["feature_xeno_head"] << features["xenohead"]
+ WRITE_FILE(S["feature_xeno_tail"], features["xenotail"])
+ WRITE_FILE(S["feature_xeno_dors"], features["xenodorsal"])
+ WRITE_FILE(S["feature_xeno_head"], features["xenohead"])
//cock features
- S["feature_has_cock"] << features["has_cock"]
- S["feature_cock_shape"] << features["cock_shape"]
- S["feature_cock_color"] << features["cock_color"]
- S["feature_cock_length"] << features["cock_length"]
- S["feature_cock_girth"] << features["cock_girth"]
- S["feature_has_sheath"] << features["sheath_color"]
+ WRITE_FILE(S["feature_has_cock"], features["has_cock"])
+ WRITE_FILE(S["feature_cock_shape"], features["cock_shape"])
+ WRITE_FILE(S["feature_cock_color"], features["cock_color"])
+ WRITE_FILE(S["feature_cock_length"], features["cock_length"])
+ WRITE_FILE(S["feature_cock_girth"], features["cock_girth"])
+ WRITE_FILE(S["feature_has_sheath"], features["sheath_color"])
//balls features
- S["feature_has_balls"] << features["has_balls"]
- S["feature_balls_color"] << features["balls_color"]
- S["feature_balls_size"] << features["balls_size"]
- S["feature_balls_sack_size"] << features["balls_sack_size"]
- S["feature_balls_fluid"] << features["balls_fluid"]
+ WRITE_FILE(S["feature_has_balls"], features["has_balls"])
+ WRITE_FILE(S["feature_balls_color"], features["balls_color"])
+ WRITE_FILE(S["feature_balls_size"], features["balls_size"])
+ WRITE_FILE(S["feature_balls_sack_size"], features["balls_sack_size"])
+ WRITE_FILE(S["feature_balls_fluid"], features["balls_fluid"])
//breasts features
- S["feature_has_breasts"] << features["has_breasts"]
- S["feature_breasts_size"] << features["breasts_size"]
- S["feature_breasts_shape"] << features["breasts_shape"]
- S["feature_breasts_color"] << features["breasts_color"]
- S["feature_breasts_fluid"] << features["breasts_fluid"]
+ WRITE_FILE(S["feature_has_breasts"], features["has_breasts"])
+ WRITE_FILE(S["feature_breasts_size"], features["breasts_size"])
+ WRITE_FILE(S["feature_breasts_shape"], features["breasts_shape"])
+ WRITE_FILE(S["feature_breasts_color"], features["breasts_color"])
+ WRITE_FILE(S["feature_breasts_fluid"], features["breasts_fluid"])
//vagina features
- S["feature_has_vag"] << features["has_vag"]
- S["feature_vag_shape"] << features["vag_shape"]
- S["feature_vag_color"] << features["vag_color"]
+ WRITE_FILE(S["feature_has_vag"], features["has_vag"])
+ WRITE_FILE(S["feature_vag_shape"], features["vag_shape"])
+ WRITE_FILE(S["feature_vag_color"], features["vag_color"])
//womb features
- S["feature_has_womb"] << features["has_womb"]
+ WRITE_FILE(S["feature_has_womb"], features["has_womb"])
//flavor text
- S["feature_flavor_text"] << features["flavor_text"]
+ WRITE_FILE(S["feature_flavor_text"], features["flavor_text"])
return 1
#undef SAVEFILE_VERSION_MAX
diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index a86b30e605..7715362c06 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -80,6 +80,15 @@
GLOB.ooc_allowed = !GLOB.ooc_allowed
to_chat(world, "The OOC channel has been globally [GLOB.ooc_allowed ? "enabled" : "disabled"].")
+/proc/toggle_dooc(toggle = null)
+ if(toggle != null)
+ if(toggle != GLOB.dooc_allowed)
+ GLOB.dooc_allowed = toggle
+ else
+ return
+ else
+ GLOB.dooc_allowed = !GLOB.dooc_allowed
+
GLOBAL_VAR_INIT(normal_ooc_colour, OOC_COLOR)
/client/proc/set_ooc(newColor as color)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 2343c2fdb2..9d8b25cebf 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -214,7 +214,7 @@ BLIND // can't see anything
gender = PLURAL //Carn: for grammarically correct text-parsing
w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/clothing/gloves.dmi'
- siemens_coefficient = 0.50
+ siemens_coefficient = 0.5
body_parts_covered = HANDS
slot_flags = SLOT_GLOVES
attack_verb = list("challenged")
@@ -273,17 +273,6 @@ BLIND // can't see anything
var/mob/M = loc
M.update_inv_head()
-/obj/item/clothing/head/equipped(mob/user, slot)
- ..()
- if(dynamic_hair_suffix)
- user.update_hair()
-
-/obj/item/clothing/head/dropped(mob/user)
- ..()
- if(dynamic_hair_suffix)
- user.update_hair()
-
-
//Neck
/obj/item/clothing/neck
name = "necklace"
@@ -372,7 +361,7 @@ BLIND // can't see anything
body_parts_covered = FEET
slot_flags = SLOT_FEET
- permeability_coefficient = 0.50
+ permeability_coefficient = 0.5
slowdown = SHOES_SLOWDOWN
var/blood_state = BLOOD_STATE_NOT_BLOODY
var/list/bloody_shoes = list(BLOOD_STATE_HUMAN = 0,BLOOD_STATE_XENO = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
@@ -514,7 +503,7 @@ BLIND // can't see anything
icon = 'icons/obj/clothing/uniforms.dmi'
name = "under"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
- permeability_coefficient = 0.90
+ permeability_coefficient = 0.9
slot_flags = SLOT_ICLOTHING
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
var/fitted = FEMALE_UNIFORM_FULL // For use in alternate clothing styles for women
diff --git a/code/modules/clothing/ears/ears.dm b/code/modules/clothing/ears/ears.dm
index 1ab0586af4..9d5433663e 100644
--- a/code/modules/clothing/ears/ears.dm
+++ b/code/modules/clothing/ears/ears.dm
@@ -1,11 +1,10 @@
-
//Ears: currently only used for headsets and earmuffs
/obj/item/clothing/ears
name = "ears"
w_class = WEIGHT_CLASS_TINY
throwforce = 0
slot_flags = SLOT_EARS
- resistance_flags = 0
+ resistance_flags = NONE
/obj/item/clothing/ears/earmuffs
name = "earmuffs"
@@ -15,7 +14,7 @@
strip_delay = 15
equip_delay_other = 25
resistance_flags = FLAMMABLE
- flags_2 = BANG_PROTECT_2|HEALS_EARS_2
+ flags_2 = BANG_PROTECT_2|HEALS_EARS_2
/obj/item/clothing/ears/headphones
name = "headphones"
@@ -43,4 +42,4 @@
H.update_inv_ears()
H.update_inv_neck()
H.update_inv_head()
- to_chat(owner, "You turn the music [headphones_on? "on. Untz Untz Untz!" : "off."]")
\ No newline at end of file
+ to_chat(owner, "You turn the music [headphones_on? "on. Untz Untz Untz!" : "off."]")
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index b6b2eb9be1..a55b498e0b 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -1,213 +1,213 @@
-/obj/item/clothing/gloves/color/yellow
- desc = "These gloves will protect the wearer from electric shock."
- name = "insulated gloves"
- icon_state = "yellow"
- item_state = "ygloves"
- siemens_coefficient = 0
- permeability_coefficient = 0.05
- item_color="yellow"
- resistance_flags = 0
-
-/obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap
- desc = "These gloves are cheap knockoffs of the coveted ones - no way this can end badly."
- name = "budget insulated gloves"
- icon_state = "yellow"
- item_state = "ygloves"
- siemens_coefficient = 1 //Set to a default of 1, gets overridden in New()
- permeability_coefficient = 0.05
- item_color="yellow"
- resistance_flags = 0
-
-/obj/item/clothing/gloves/color/fyellow/New()
- ..()
- siemens_coefficient = pick(0,0.5,0.5,0.5,0.5,0.75,1.5)
-
-/obj/item/clothing/gloves/color/fyellow/old
- desc = "Old and worn out insulated gloves, hopefully they still work."
- name = "worn out insulated gloves"
-
-/obj/item/clothing/gloves/color/fyellow/old/Initialize()
- . = ..()
- siemens_coefficient = pick(0,0,0,0.5,0.5,0.5,0.75)
-
-/obj/item/clothing/gloves/color/black
- desc = "These gloves are fire-resistant."
- name = "black gloves"
- icon_state = "black"
- item_state = "blackgloves"
- item_color="black"
- cold_protection = HANDS
- min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
- heat_protection = HANDS
- max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- resistance_flags = 0
- var/can_be_cut = 1
-
-/obj/item/clothing/gloves/color/black/hos
- item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way.
-
-/obj/item/clothing/gloves/color/black/ce
- item_color = "chief" //Exists for washing machines. Is not different from black gloves in any way.
-
-/obj/item/clothing/gloves/color/black/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/wirecutters))
- if(can_be_cut && icon_state == initial(icon_state))//only if not dyed
- to_chat(user, "You snip the fingertips off of [src].")
- playsound(user.loc, W.usesound, rand(10,50), 1)
- new /obj/item/clothing/gloves/fingerless(user.loc)
- qdel(src)
- ..()
-
-/obj/item/clothing/gloves/color/orange
- name = "orange gloves"
- desc = "A pair of gloves, they don't look special in any way."
- icon_state = "orange"
- item_state = "orangegloves"
- item_color="orange"
-
-/obj/item/clothing/gloves/color/red
- name = "red gloves"
- desc = "A pair of gloves, they don't look special in any way."
- icon_state = "red"
- item_state = "redgloves"
- item_color = "red"
-
-
-/obj/item/clothing/gloves/color/red/insulated
- name = "insulated gloves"
- desc = "These gloves will protect the wearer from electric shock."
- siemens_coefficient = 0
- permeability_coefficient = 0.05
- resistance_flags = 0
-
-/obj/item/clothing/gloves/color/rainbow
- name = "rainbow gloves"
- desc = "A pair of gloves, they don't look special in any way."
- icon_state = "rainbow"
- item_state = "rainbowgloves"
- item_color = "rainbow"
-
-/obj/item/clothing/gloves/color/rainbow/clown
- item_color = "clown"
-
-/obj/item/clothing/gloves/color/blue
- name = "blue gloves"
- desc = "A pair of gloves, they don't look special in any way."
- icon_state = "blue"
- item_state = "bluegloves"
- item_color="blue"
-
-/obj/item/clothing/gloves/color/purple
- name = "purple gloves"
- desc = "A pair of gloves, they don't look special in any way."
- icon_state = "purple"
- item_state = "purplegloves"
- item_color="purple"
-
-/obj/item/clothing/gloves/color/green
- name = "green gloves"
- desc = "A pair of gloves, they don't look special in any way."
- icon_state = "green"
- item_state = "greengloves"
- item_color="green"
-
-/obj/item/clothing/gloves/color/grey
- name = "grey gloves"
- desc = "A pair of gloves, they don't look special in any way."
- icon_state = "gray"
- item_state = "graygloves"
- item_color="grey"
-
-/obj/item/clothing/gloves/color/grey/rd
- item_color = "director" //Exists for washing machines. Is not different from gray gloves in any way.
-
-/obj/item/clothing/gloves/color/grey/hop
- item_color = "hop" //Exists for washing machines. Is not different from gray gloves in any way.
-
-/obj/item/clothing/gloves/color/light_brown
- name = "light brown gloves"
- desc = "A pair of gloves, they don't look special in any way."
- icon_state = "lightbrown"
- item_state = "lightbrowngloves"
- item_color="light brown"
-
-/obj/item/clothing/gloves/color/brown
- name = "brown gloves"
- desc = "A pair of gloves, they don't look special in any way."
- icon_state = "brown"
- item_state = "browngloves"
- item_color="brown"
-
-/obj/item/clothing/gloves/color/brown/cargo
- item_color = "cargo" //Exists for washing machines. Is not different from brown gloves in any way.
-
-/obj/item/clothing/gloves/color/captain
- desc = "Regal blue gloves, with a nice gold trim. Swanky."
- name = "captain's gloves"
- icon_state = "captain"
- item_state = "egloves"
- item_color = "captain"
- siemens_coefficient = 0
- permeability_coefficient = 0.05
- cold_protection = HANDS
- min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
- heat_protection = HANDS
- max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- strip_delay = 60
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 70, acid = 50)
-
-/obj/item/clothing/gloves/color/latex
- name = "latex gloves"
- desc = "Cheap sterile gloves made from latex."
- icon_state = "latex"
- item_state = "lgloves"
- siemens_coefficient = 0.30
- permeability_coefficient = 0.01
- item_color="white"
- transfer_prints = TRUE
- resistance_flags = 0
-
-/obj/item/clothing/gloves/color/latex/nitrile
- name = "nitrile gloves"
- desc = "Pricy sterile gloves that are stronger than latex."
- icon_state = "nitrile"
- item_state = "nitrilegloves"
- item_color = "cmo"
- transfer_prints = FALSE
-
-/obj/item/clothing/gloves/color/white
- name = "white gloves"
- desc = "These look pretty fancy."
- icon_state = "white"
- item_state = "wgloves"
- item_color="mime"
-
-/obj/item/clothing/gloves/color/white/redcoat
- item_color = "redcoat" //Exists for washing machines. Is not different from white gloves in any way.
-
-/obj/item/clothing/gloves/color/random
- name = "random gloves"
- desc = "These gloves are supposed to be a random color..."
- icon_state = "white"
- item_state = "wgloves"
- item_color = "mime"
-
-/obj/item/clothing/gloves/color/random/New()
- ..()
- var/list/gloves = list(
- /obj/item/clothing/gloves/color/orange = 1,
- /obj/item/clothing/gloves/color/red = 1,
- /obj/item/clothing/gloves/color/blue = 1,
- /obj/item/clothing/gloves/color/purple = 1,
- /obj/item/clothing/gloves/color/green = 1,
- /obj/item/clothing/gloves/color/grey = 1,
- /obj/item/clothing/gloves/color/light_brown = 1,
- /obj/item/clothing/gloves/color/brown = 1)
-
- var/obj/item/clothing/gloves/color/selected = pick(gloves)
-
- name = initial(selected.name)
- desc = initial(selected.desc)
- icon_state = initial(selected.icon_state)
- item_state = initial(selected.item_state)
- item_color = initial(selected.item_color)
+/obj/item/clothing/gloves/color/yellow
+ desc = "These gloves will protect the wearer from electric shock."
+ name = "insulated gloves"
+ icon_state = "yellow"
+ item_state = "ygloves"
+ siemens_coefficient = 0
+ permeability_coefficient = 0.5
+ item_color="yellow"
+ resistance_flags = 0
+
+/obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap
+ desc = "These gloves are cheap knockoffs of the coveted ones - no way this can end badly."
+ name = "budget insulated gloves"
+ icon_state = "yellow"
+ item_state = "ygloves"
+ siemens_coefficient = 1 //Set to a default of 1, gets overridden in New()
+ permeability_coefficient = 0.5
+ item_color="yellow"
+ resistance_flags = 0
+
+/obj/item/clothing/gloves/color/fyellow/New()
+ ..()
+ siemens_coefficient = pick(0,0.5,0.5,0.5,0.5,0.75,1.5)
+
+/obj/item/clothing/gloves/color/fyellow/old
+ desc = "Old and worn out insulated gloves, hopefully they still work."
+ name = "worn out insulated gloves"
+
+/obj/item/clothing/gloves/color/fyellow/old/Initialize()
+ . = ..()
+ siemens_coefficient = pick(0,0,0,0.5,0.5,0.5,0.75)
+
+/obj/item/clothing/gloves/color/black
+ desc = "These gloves are fire-resistant."
+ name = "black gloves"
+ icon_state = "black"
+ item_state = "blackgloves"
+ item_color="black"
+ cold_protection = HANDS
+ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+ heat_protection = HANDS
+ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+ resistance_flags = 0
+ var/can_be_cut = 1
+
+/obj/item/clothing/gloves/color/black/hos
+ item_color = "hosred" //Exists for washing machines. Is not different from black gloves in any way.
+
+/obj/item/clothing/gloves/color/black/ce
+ item_color = "chief" //Exists for washing machines. Is not different from black gloves in any way.
+
+/obj/item/clothing/gloves/color/black/attackby(obj/item/W as obj, mob/user as mob, params)
+ if(istype(W, /obj/item/wirecutters))
+ if(can_be_cut && icon_state == initial(icon_state))//only if not dyed
+ to_chat(user, "You snip the fingertips off of [src].")
+ playsound(user.loc, W.usesound, rand(10,50), 1)
+ new /obj/item/clothing/gloves/fingerless(user.loc)
+ qdel(src)
+ ..()
+
+/obj/item/clothing/gloves/color/orange
+ name = "orange gloves"
+ desc = "A pair of gloves, they don't look special in any way."
+ icon_state = "orange"
+ item_state = "orangegloves"
+ item_color="orange"
+
+/obj/item/clothing/gloves/color/red
+ name = "red gloves"
+ desc = "A pair of gloves, they don't look special in any way."
+ icon_state = "red"
+ item_state = "redgloves"
+ item_color = "red"
+
+
+/obj/item/clothing/gloves/color/red/insulated
+ name = "insulated gloves"
+ desc = "These gloves will protect the wearer from electric shock."
+ siemens_coefficient = 0
+ permeability_coefficient = 0.5
+ resistance_flags = 0
+
+/obj/item/clothing/gloves/color/rainbow
+ name = "rainbow gloves"
+ desc = "A pair of gloves, they don't look special in any way."
+ icon_state = "rainbow"
+ item_state = "rainbowgloves"
+ item_color = "rainbow"
+
+/obj/item/clothing/gloves/color/rainbow/clown
+ item_color = "clown"
+
+/obj/item/clothing/gloves/color/blue
+ name = "blue gloves"
+ desc = "A pair of gloves, they don't look special in any way."
+ icon_state = "blue"
+ item_state = "bluegloves"
+ item_color="blue"
+
+/obj/item/clothing/gloves/color/purple
+ name = "purple gloves"
+ desc = "A pair of gloves, they don't look special in any way."
+ icon_state = "purple"
+ item_state = "purplegloves"
+ item_color="purple"
+
+/obj/item/clothing/gloves/color/green
+ name = "green gloves"
+ desc = "A pair of gloves, they don't look special in any way."
+ icon_state = "green"
+ item_state = "greengloves"
+ item_color="green"
+
+/obj/item/clothing/gloves/color/grey
+ name = "grey gloves"
+ desc = "A pair of gloves, they don't look special in any way."
+ icon_state = "gray"
+ item_state = "graygloves"
+ item_color="grey"
+
+/obj/item/clothing/gloves/color/grey/rd
+ item_color = "director" //Exists for washing machines. Is not different from gray gloves in any way.
+
+/obj/item/clothing/gloves/color/grey/hop
+ item_color = "hop" //Exists for washing machines. Is not different from gray gloves in any way.
+
+/obj/item/clothing/gloves/color/light_brown
+ name = "light brown gloves"
+ desc = "A pair of gloves, they don't look special in any way."
+ icon_state = "lightbrown"
+ item_state = "lightbrowngloves"
+ item_color="light brown"
+
+/obj/item/clothing/gloves/color/brown
+ name = "brown gloves"
+ desc = "A pair of gloves, they don't look special in any way."
+ icon_state = "brown"
+ item_state = "browngloves"
+ item_color="brown"
+
+/obj/item/clothing/gloves/color/brown/cargo
+ item_color = "cargo" //Exists for washing machines. Is not different from brown gloves in any way.
+
+/obj/item/clothing/gloves/color/captain
+ desc = "Regal blue gloves, with a nice gold trim. Swanky."
+ name = "captain's gloves"
+ icon_state = "captain"
+ item_state = "egloves"
+ item_color = "captain"
+ siemens_coefficient = 0
+ permeability_coefficient = 0.5
+ cold_protection = HANDS
+ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+ heat_protection = HANDS
+ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+ strip_delay = 60
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 70, acid = 50)
+
+/obj/item/clothing/gloves/color/latex
+ name = "latex gloves"
+ desc = "Cheap sterile gloves made from latex."
+ icon_state = "latex"
+ item_state = "lgloves"
+ siemens_coefficient = 0.3
+ permeability_coefficient = 0.1
+ item_color="white"
+ transfer_prints = TRUE
+ resistance_flags = 0
+
+/obj/item/clothing/gloves/color/latex/nitrile
+ name = "nitrile gloves"
+ desc = "Pricy sterile gloves that are stronger than latex."
+ icon_state = "nitrile"
+ item_state = "nitrilegloves"
+ item_color = "cmo"
+ transfer_prints = FALSE
+
+/obj/item/clothing/gloves/color/white
+ name = "white gloves"
+ desc = "These look pretty fancy."
+ icon_state = "white"
+ item_state = "wgloves"
+ item_color="mime"
+
+/obj/item/clothing/gloves/color/white/redcoat
+ item_color = "redcoat" //Exists for washing machines. Is not different from white gloves in any way.
+
+/obj/item/clothing/gloves/color/random
+ name = "random gloves"
+ desc = "These gloves are supposed to be a random color..."
+ icon_state = "white"
+ item_state = "wgloves"
+ item_color = "mime"
+
+/obj/item/clothing/gloves/color/random/New()
+ ..()
+ var/list/gloves = list(
+ /obj/item/clothing/gloves/color/orange = 1,
+ /obj/item/clothing/gloves/color/red = 1,
+ /obj/item/clothing/gloves/color/blue = 1,
+ /obj/item/clothing/gloves/color/purple = 1,
+ /obj/item/clothing/gloves/color/green = 1,
+ /obj/item/clothing/gloves/color/grey = 1,
+ /obj/item/clothing/gloves/color/light_brown = 1,
+ /obj/item/clothing/gloves/color/brown = 1)
+
+ var/obj/item/clothing/gloves/color/selected = pick(gloves)
+
+ name = initial(selected.name)
+ desc = initial(selected.desc)
+ icon_state = initial(selected.icon_state)
+ item_state = initial(selected.item_state)
+ item_color = initial(selected.item_color)
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index 3c076f572f..39099fb1a2 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -7,8 +7,8 @@
flags_1 = MASKINTERNALS_1
visor_flags = MASKINTERNALS_1
w_class = WEIGHT_CLASS_SMALL
- gas_transfer_coefficient = 0.10
- permeability_coefficient = 0.50
+ gas_transfer_coefficient = 0.1
+ permeability_coefficient = 0.5
actions_types = list(/datum/action/item_action/adjust)
flags_cover = MASKCOVERSMOUTH
visor_flags_cover = MASKCOVERSMOUTH
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 6b91d1a265..8422b5b76f 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -5,7 +5,7 @@
item_state = "blindfold"
flags_cover = MASKCOVERSMOUTH
w_class = WEIGHT_CLASS_SMALL
- gas_transfer_coefficient = 0.90
+ gas_transfer_coefficient = 0.9
equip_delay_other = 20
/obj/item/clothing/mask/muzzle/attack_paw(mob/user)
@@ -26,7 +26,7 @@
flags_cover = MASKCOVERSMOUTH
visor_flags_inv = HIDEFACE
visor_flags_cover = MASKCOVERSMOUTH
- gas_transfer_coefficient = 0.90
+ gas_transfer_coefficient = 0.9
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 25, rad = 0, fire = 0, acid = 0)
actions_types = list(/datum/action/item_action/adjust)
diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm
index e10f089eb8..bf3a1f28e0 100644
--- a/code/modules/clothing/shoes/bananashoes.dm
+++ b/code/modules/clothing/shoes/bananashoes.dm
@@ -5,59 +5,39 @@
desc = "Lost prototype of advanced clown tech. Powered by bananium, these shoes leave a trail of chaos in their wake."
icon_state = "clown_prototype_off"
var/on = FALSE
- var/datum/material_container/bananium
actions_types = list(/datum/action/item_action/toggle)
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/New()
- ..()
- bananium = new/datum/material_container(src,list(MAT_BANANIUM),200000)
+/obj/item/clothing/shoes/clown_shoes/banana_shoes/Initialize()
+ . = ..()
+ AddComponent(/datum/component/material_container, list(MAT_BANANIUM), 200000, TRUE)
+ AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 75)
/obj/item/clothing/shoes/clown_shoes/banana_shoes/step_action()
+ . = ..()
if(on)
- if(footstep > 1)//honks when its on
- playsound(src, 'sound/items/bikehorn.ogg', 75, 1)
- footstep = 0
- else
- footstep++
-
new/obj/item/grown/bananapeel/specialpeel(get_step(src,turn(usr.dir, 180))) //honk
+ GET_COMPONENT(bananium, /datum/component/material_container)
bananium.use_amount_type(100, MAT_BANANIUM)
if(bananium.amount(MAT_BANANIUM) < 100)
on = !on
flags_1 &= ~NOSLIP_1
update_icon()
to_chat(loc, "You ran out of bananium!")
- else
- ..()
/obj/item/clothing/shoes/clown_shoes/banana_shoes/attack_self(mob/user)
+ GET_COMPONENT(bananium, /datum/component/material_container)
var/sheet_amount = bananium.retrieve_all()
if(sheet_amount)
to_chat(user, "You retrieve [sheet_amount] sheets of bananium from the prototype shoes.")
else
to_chat(user, "You cannot retrieve any bananium from the prototype shoes.")
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/attackby(obj/item/O, mob/user, params)
- if(!bananium.get_item_material_amount(O))
- to_chat(user, "This item has no bananium!")
- return
- if(!user.dropItemToGround(O))
- to_chat(user, "You can't drop [O]!")
- return
-
- var/bananium_amount = bananium.insert_item(O)
- if(bananium_amount)
- to_chat(user, "You insert [O] into the prototype shoes.")
- qdel(O)
- else
- to_chat(user, "You are unable to insert more bananium!")
-
/obj/item/clothing/shoes/clown_shoes/banana_shoes/examine(mob/user)
..()
- var/ban_amt = bananium.amount(MAT_BANANIUM)
- to_chat(user, "The shoes are [on ? "enabled" : "disabled"]. There is [ban_amt ? ban_amt : "no"] bananium left.")
+ to_chat(user, "The shoes are [on ? "enabled" : "disabled"]")
/obj/item/clothing/shoes/clown_shoes/banana_shoes/ui_action_click(mob/user)
+ GET_COMPONENT(bananium, /datum/component/material_container)
if(bananium.amount(MAT_BANANIUM))
on = !on
update_icon()
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index c0ac24c1cc..026b011e39 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -1,4 +1,5 @@
/obj/item/clothing/shoes/proc/step_action() //this was made to rewrite clown shoes squeaking
+ SendSignal(COMSIG_SHOES_STEP_ACTION)
/obj/item/clothing/shoes/suicide_act(mob/user)
user.visible_message("[user] is bashing [user.p_their()] own head in with [src]! Ain't that a kick in the head?")
@@ -79,15 +80,11 @@
item_state = "clown_shoes"
slowdown = SHOES_SLOWDOWN+1
item_color = "clown"
- var/footstep = 1 //used for squeeks whilst walking
pockets = /obj/item/storage/internal/pocket/shoes/clown
-/obj/item/clothing/shoes/clown_shoes/step_action()
- if(footstep > 1)
- playsound(src, "clownstep", 50, 1)
- footstep = 0
- else
- footstep++
+/obj/item/clothing/shoes/clown_shoes/Initialize()
+ . = ..()
+ AddComponent(/datum/component/squeak, list('sound/effects/clownstep1.ogg'=1,'sound/effects/clownstep2.ogg'=1), 50)
/obj/item/clothing/shoes/clown_shoes/jester
name = "jester shoes"
@@ -198,22 +195,24 @@
var/jumping = FALSE //are we mid-jump?
/obj/item/clothing/shoes/bhop/ui_action_click(mob/user, action)
- if(!isliving(usr))
+ if(!isliving(user))
return
if(jumping)
return
if(recharging_time > world.time)
- to_chat(usr, "The boot's internal propulsion needs to recharge still!")
+ to_chat(user, "The boot's internal propulsion needs to recharge still!")
return
- var/atom/target = get_edge_target_turf(usr, usr.dir) //gets the user's direction
+ var/atom/target = get_edge_target_turf(user, user.dir) //gets the user's direction
- jumping = TRUE
- playsound(src.loc, 'sound/effects/stealthoff.ogg', 50, 1, 1)
- usr.visible_message("[usr] dashes forward into the air!")
- usr.throw_at(target, jumpdistance, jumpspeed, spin=0, diagonals_first = 1, callback = CALLBACK(src, .proc/hop_end))
+ if (user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE, callback = CALLBACK(src, .proc/hop_end)))
+ jumping = TRUE
+ playsound(src, 'sound/effects/stealthoff.ogg', 50, 1, 1)
+ user.visible_message("[usr] dashes forward into the air!")
+ else
+ to_chat(user, "Something prevents you from dashing forward!")
/obj/item/clothing/shoes/bhop/proc/hop_end()
jumping = FALSE
diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm
index 4f251d68e3..0c16a2b764 100644
--- a/code/modules/clothing/spacesuits/flightsuit.dm
+++ b/code/modules/clothing/spacesuits/flightsuit.dm
@@ -18,7 +18,7 @@
var/icon_state_boost = "flightpack_boost"
var/item_state_boost = "flightpack_boost"
actions_types = list(/datum/action/item_action/flightpack/toggle_flight, /datum/action/item_action/flightpack/engage_boosters, /datum/action/item_action/flightpack/toggle_stabilizers, /datum/action/item_action/flightpack/change_power, /datum/action/item_action/flightpack/toggle_airbrake)
- armor = list(melee = 20, bullet = 20, laser = 20, energy = 10, bomb = 30, bio = 100, rad = 75, fire = 100, acid = 75)
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 10, bomb = 30, bio = 100, rad = 10, fire = 50, acid = 35)
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
@@ -34,7 +34,7 @@
var/flight = FALSE
var/flight_passflags = PASSTABLE
var/powersetting = 1
- var/powersetting_high = 3
+ var/powersetting_high = 6
var/powersetting_low = 1
var/override_safe = FALSE
@@ -84,7 +84,7 @@
var/emp_disable_threshold = 3 //3 weak ion, 2 strong ion hits.
var/emp_disabled = FALSE
- var/crash_damage = 0 //Same thing, but for crashes. This is in addition to possible amounts of brute damage to the wearer.
+ var/crash_damage = 10 //Same thing, but for crashes. This is in addition to possible amounts of brute damage to the wearer.
var/crash_damage_low = 1
var/crash_damage_high = 2.5
var/crash_disable_threshold = 5
@@ -102,9 +102,13 @@
var/obj/item/stock_parts/capacitor/part_cap = null
var/obj/item/stock_parts/micro_laser/part_laser = null
var/obj/item/stock_parts/matter_bin/part_bin = null
+ var/obj/item/stock_parts/cell/cell = null //Wew lad. about damn time now
var/crashing = FALSE //Are we currently getting wrecked?
+ var/s_delay = 50 // cell replacement delay
+
+
/obj/item/device/flightpack/proc/changeWearer(mob/changeto)
if(wearer)
LAZYREMOVE(wearer.user_movement_hooks, src)
@@ -128,6 +132,8 @@
part_cap = new /obj/item/stock_parts/capacitor/super(src)
part_laser = new /obj/item/stock_parts/micro_laser/ultra(src)
part_bin = new /obj/item/stock_parts/matter_bin/super(src)
+ cell = new/obj/item/stock_parts/cell/high
+ cell.charge = 9000
..()
/obj/item/device/flightpack/proc/usermessage(message, span = "boldnotice", mob/mob_override = null)
@@ -816,6 +822,22 @@
part_cap.forceMove(get_turf(src))
part_cap = I
changed = TRUE
+ if(istype(S, /obj/item/stock_parts/cell))
+ var/obj/item/stock_parts/cell/CELL = S
+ if(CELL.maxcharge > cell.maxcharge)
+ usermessage("Higher maximum capacity detected.\nUpgrading...", mob_override = user)
+ if (do_after(user,s_delay, target = src))
+ user.transferItemToLoc(CELL, src)
+ CELL.charge = min(CELL.charge+cell.charge, CELL.maxcharge)
+ var/obj/item/stock_parts/cell/old_cell = cell
+ old_cell.charge = 0
+ user.put_in_hands(old_cell)
+ old_cell.add_fingerprint(user)
+ old_cell.update_icon()
+ cell = CELL
+ usermessage("Upgrade complete. Maximum capacity: [round(cell.maxcharge/100)]%", mob_override = user)
+ else
+ usermessage("Procedure interrupted. Protocol terminated.", mob_override = user)
if(changed)
update_parts()
..()
@@ -847,7 +869,7 @@
var/obj/item/device/flightpack/pack = null
var/mob/living/carbon/human/wearer = null
var/active = FALSE
- resistance_flags = FIRE_PROOF | ACID_PROOF
+ resistance_flags = FIRE_PROOF
/obj/item/clothing/shoes/flightshoes/Destroy()
pack = null
@@ -901,22 +923,28 @@
var/deployedpack = FALSE
var/deployedshoes = FALSE
var/locked = FALSE
- resistance_flags = FIRE_PROOF | ACID_PROOF
+ resistance_flags = FIRE_PROOF
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/flightsuit
jetpack = null
var/flightpack
var/flight = FALSE
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/gun, /obj/item/reagent_containers/spray/pepper, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs)
actions_types = list(/datum/action/item_action/flightsuit/toggle_helmet, /datum/action/item_action/flightsuit/toggle_boots, /datum/action/item_action/flightsuit/toggle_flightpack, /datum/action/item_action/flightsuit/lock_suit)
- armor = list(melee = 20, bullet = 20, laser = 20, energy = 10, bomb = 30, bio = 100, rad = 75, fire = 100, acid = 100)
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 10, bomb = 30, bio = 100, rad = 10, fire = 50, acid = 35)
var/maint_panel = FALSE
- max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
+ var/obj/item/stock_parts/cell/cell
+ var/s_delay = 50
+
+/obj/item/clothing/suit/space/hardsuit/flightsuit/get_cell()
+ return cell
/obj/item/clothing/suit/space/hardsuit/flightsuit/full/Initialize()
. = ..()
makepack()
makeshoes()
resync()
+ get_cell()
/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/usermessage(message, span = "boldnotice")
var/mob/targ = user
@@ -931,6 +959,7 @@
to_chat(user, "SUIT: [locked ? "LOCKED" : "UNLOCKED"]")
to_chat(user, "FLIGHTPACK: [deployedpack ? "ENGAGED" : "DISENGAGED"] FLIGHTSHOES : [deployedshoes ? "ENGAGED" : "DISENGAGED"] HELMET : [suittoggled ? "ENGAGED" : "DISENGAGED"]")
to_chat(user, "Its maintainence panel is [maint_panel ? "OPEN" : "CLOSED"]")
+ to_chat(user, "Current energy capacity: [DisplayPower(cell.charge)]")
/obj/item/clothing/suit/space/hardsuit/flightsuit/Destroy()
dropped()
@@ -1223,12 +1252,12 @@
icon_state = "flighthelmet"
item_state = "flighthelmet"
item_color = "flight"
- resistance_flags = FIRE_PROOF | ACID_PROOF
- brightness_on = 7
+ resistance_flags = FIRE_PROOF
+ brightness_on = 4
light_color = "#30ffff"
- armor = list(melee = 20, bullet = 20, laser = 20, energy = 10, bomb = 30, bio = 100, rad = 75, fire = 100, acid = 100)
- max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
- var/list/datahuds = list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC)
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 10, bomb = 30, bio = 100, rad = 10, fire = 50, acid = 35)
+ max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
+ var/list/datahuds = list(DATA_HUD_SECURITY_BASIC , DATA_HUD_MEDICAL_BASIC, DATA_HUD_DIAGNOSTIC)
var/zoom_range = 14
var/zoom = FALSE
actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/flightpack/zoom)
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 59dd6e2d8d..13221350ee 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -362,7 +362,7 @@
icon_state = "heavy"
item_state = "swat_suit"
w_class = WEIGHT_CLASS_BULKY
- gas_transfer_coefficient = 0.90
+ gas_transfer_coefficient = 0.9
flags_1 = THICKMATERIAL_1
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
slowdown = 3
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index c12accc8c1..5211dd7938 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -70,8 +70,8 @@
desc = "An apron-jacket used by a high class chef."
icon_state = "chef"
item_state = "chef"
- gas_transfer_coefficient = 0.90
- permeability_coefficient = 0.50
+ gas_transfer_coefficient = 0.9
+ permeability_coefficient = 0.5
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(/obj/item/kitchen)
togglename = "sleeves"
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index e0e6ee6e5a..3ea8721b7e 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -15,8 +15,8 @@
icon_state = "fire"
item_state = "ro_suit"
w_class = WEIGHT_CLASS_BULKY
- gas_transfer_coefficient = 0.90
- permeability_coefficient = 0.50
+ gas_transfer_coefficient = 0.9
+ permeability_coefficient = 0.5
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/extinguisher, /obj/item/crowbar)
slowdown = 1
@@ -122,8 +122,8 @@
icon_state = "rad"
item_state = "rad_suit"
w_class = WEIGHT_CLASS_BULKY
- gas_transfer_coefficient = 0.90
- permeability_coefficient = 0.50
+ gas_transfer_coefficient = 0.9
+ permeability_coefficient = 0.5
flags_1 = THICKMATERIAL_1
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/device/geiger_counter)
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 19cfc834f9..5210034af9 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -76,7 +76,7 @@
icon_state = "hydroponics"
item_state = "g_suit"
item_color = "hydroponics"
- permeability_coefficient = 0.50
+ permeability_coefficient = 0.5
/obj/item/clothing/under/rank/janitor
desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
index 9c5ab5168a..d80b7ddba3 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medsci.dm
@@ -1,121 +1,121 @@
-/*
- * Science
- */
-/obj/item/clothing/under/rank/research_director
- desc = "It's a suit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
- name = "research director's vest suit"
- icon_state = "director"
- item_state = "lb_suit"
- item_color = "director"
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 10, rad = 0, fire = 0, acid = 35)
- can_adjust = 0
-
-/obj/item/clothing/under/rank/research_director/alt
- desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants."
- name = "research director's tan suit"
- icon_state = "rdwhimsy"
- item_state = "rdwhimsy"
- item_color = "rdwhimsy"
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0, fire = 0, acid = 0)
- can_adjust = 1
- alt_covers_chest = 1
-
-/obj/item/clothing/under/rank/research_director/turtleneck
- desc = "A dark purple turtleneck and tan khakis, for a director with a superior sense of style."
- name = "research director's turtleneck"
- icon_state = "rdturtle"
- item_state = "p_suit"
- item_color = "rdturtle"
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0, fire = 0, acid = 0)
- can_adjust = 1
- alt_covers_chest = 1
-
-/obj/item/clothing/under/rank/scientist
- desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist."
- name = "scientist's jumpsuit"
- icon_state = "toxins"
- item_state = "w_suit"
- item_color = "toxinswhite"
- permeability_coefficient = 0.50
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0, fire = 0, acid = 0)
-
-
-/obj/item/clothing/under/rank/chemist
- desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
- name = "chemist's jumpsuit"
- icon_state = "chemistry"
- item_state = "w_suit"
- item_color = "chemistrywhite"
- permeability_coefficient = 0.50
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 50, acid = 65)
-
-/*
- * Medical
- */
-/obj/item/clothing/under/rank/chief_medical_officer
- desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
- name = "chief medical officer's jumpsuit"
- icon_state = "cmo"
- item_state = "w_suit"
- item_color = "cmo"
- permeability_coefficient = 0.50
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
-
-/obj/item/clothing/under/rank/geneticist
- desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
- name = "geneticist's jumpsuit"
- icon_state = "genetics"
- item_state = "w_suit"
- item_color = "geneticswhite"
- permeability_coefficient = 0.50
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
-
-/obj/item/clothing/under/rank/virologist
- desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
- name = "virologist's jumpsuit"
- icon_state = "virology"
- item_state = "w_suit"
- item_color = "virologywhite"
- permeability_coefficient = 0.50
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
-
-/obj/item/clothing/under/rank/nursesuit
- desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
- name = "nurse's suit"
- icon_state = "nursesuit"
- item_state = "w_suit"
- item_color = "nursesuit"
- permeability_coefficient = 0.50
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
- fitted = NO_FEMALE_UNIFORM
- can_adjust = 0
-
-/obj/item/clothing/under/rank/medical
- desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
- name = "medical doctor's jumpsuit"
- icon_state = "medical"
- item_state = "w_suit"
- item_color = "medical"
- permeability_coefficient = 0.50
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
-
-/obj/item/clothing/under/rank/medical/blue
- name = "medical scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
- icon_state = "scrubsblue"
- item_color = "scrubsblue"
- can_adjust = 0
-
-/obj/item/clothing/under/rank/medical/green
- name = "medical scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
- icon_state = "scrubsgreen"
- item_color = "scrubsgreen"
- can_adjust = 0
-
-/obj/item/clothing/under/rank/medical/purple
- name = "medical scrubs"
- desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
- icon_state = "scrubspurple"
- item_color = "scrubspurple"
- can_adjust = 0
+/*
+ * Science
+ */
+/obj/item/clothing/under/rank/research_director
+ desc = "It's a suit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
+ name = "research director's vest suit"
+ icon_state = "director"
+ item_state = "lb_suit"
+ item_color = "director"
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 10, rad = 0, fire = 0, acid = 35)
+ can_adjust = 0
+
+/obj/item/clothing/under/rank/research_director/alt
+ desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants."
+ name = "research director's tan suit"
+ icon_state = "rdwhimsy"
+ item_state = "rdwhimsy"
+ item_color = "rdwhimsy"
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0, fire = 0, acid = 0)
+ can_adjust = 1
+ alt_covers_chest = 1
+
+/obj/item/clothing/under/rank/research_director/turtleneck
+ desc = "A dark purple turtleneck and tan khakis, for a director with a superior sense of style."
+ name = "research director's turtleneck"
+ icon_state = "rdturtle"
+ item_state = "p_suit"
+ item_color = "rdturtle"
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0, fire = 0, acid = 0)
+ can_adjust = 1
+ alt_covers_chest = 1
+
+/obj/item/clothing/under/rank/scientist
+ desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist."
+ name = "scientist's jumpsuit"
+ icon_state = "toxins"
+ item_state = "w_suit"
+ item_color = "toxinswhite"
+ permeability_coefficient = 0.5
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0, fire = 0, acid = 0)
+
+
+/obj/item/clothing/under/rank/chemist
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
+ name = "chemist's jumpsuit"
+ icon_state = "chemistry"
+ item_state = "w_suit"
+ item_color = "chemistrywhite"
+ permeability_coefficient = 0.5
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 50, acid = 65)
+
+/*
+ * Medical
+ */
+/obj/item/clothing/under/rank/chief_medical_officer
+ desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
+ name = "chief medical officer's jumpsuit"
+ icon_state = "cmo"
+ item_state = "w_suit"
+ item_color = "cmo"
+ permeability_coefficient = 0.5
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
+
+/obj/item/clothing/under/rank/geneticist
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
+ name = "geneticist's jumpsuit"
+ icon_state = "genetics"
+ item_state = "w_suit"
+ item_color = "geneticswhite"
+ permeability_coefficient = 0.5
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
+
+/obj/item/clothing/under/rank/virologist
+ desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
+ name = "virologist's jumpsuit"
+ icon_state = "virology"
+ item_state = "w_suit"
+ item_color = "virologywhite"
+ permeability_coefficient = 0.5
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
+
+/obj/item/clothing/under/rank/nursesuit
+ desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
+ name = "nurse's suit"
+ icon_state = "nursesuit"
+ item_state = "w_suit"
+ item_color = "nursesuit"
+ permeability_coefficient = 0.5
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
+ fitted = NO_FEMALE_UNIFORM
+ can_adjust = 0
+
+/obj/item/clothing/under/rank/medical
+ desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
+ name = "medical doctor's jumpsuit"
+ icon_state = "medical"
+ item_state = "w_suit"
+ item_color = "medical"
+ permeability_coefficient = 0.5
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0, fire = 0, acid = 0)
+
+/obj/item/clothing/under/rank/medical/blue
+ name = "medical scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
+ icon_state = "scrubsblue"
+ item_color = "scrubsblue"
+ can_adjust = 0
+
+/obj/item/clothing/under/rank/medical/green
+ name = "medical scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
+ icon_state = "scrubsgreen"
+ item_color = "scrubsgreen"
+ can_adjust = 0
+
+/obj/item/clothing/under/rank/medical/purple
+ name = "medical scrubs"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
+ icon_state = "scrubspurple"
+ item_color = "scrubspurple"
+ can_adjust = 0
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 217644c4ae..65a78d0ef0 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -204,9 +204,9 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
-/datum/crafting_recipe/meteorshot
- name = "Meteorshot Shell"
- result = /obj/item/ammo_casing/shotgun/meteorshot
+/datum/crafting_recipe/meteorslug
+ name = "Meteorslug Shell"
+ result = /obj/item/ammo_casing/shotgun/meteorslug
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
/obj/item/rcd_ammo = 1,
/obj/item/stock_parts/manipulator = 2)
@@ -228,7 +228,7 @@
/datum/crafting_recipe/dragonsbreath
name = "Dragonsbreath Shell"
- result = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
+ result = /obj/item/ammo_casing/shotgun/dragonsbreath
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, /datum/reagent/phosphorus = 5)
tools = list(/obj/item/screwdriver)
time = 5
@@ -270,17 +270,6 @@
category = CAT_WEAPONRY
subcategory = CAT_AMMO
-/datum/crafting_recipe/improvisedslugoverload
- name = "Overload Improvised Shell"
- result = /obj/item/ammo_casing/shotgun/improvised/overload
- reqs = list(/obj/item/ammo_casing/shotgun/improvised = 1,
- /datum/reagent/blackpowder = 10,
- /datum/reagent/toxin/plasma = 20)
- tools = list(/obj/item/screwdriver)
- time = 5
- category = CAT_WEAPONRY
- subcategory = CAT_AMMO
-
/datum/crafting_recipe/laserslug
name = "Laser Slug Shell"
result = /obj/item/ammo_casing/shotgun/laserslug
diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm
index 93605ea78a..c0c8cf5b74 100644
--- a/code/modules/error_handler/error_handler.dm
+++ b/code/modules/error_handler/error_handler.dm
@@ -43,7 +43,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
configured_error_silence_time = config.error_silence_time
- //Each occurence of an unique error adds to its cooldown time...
+ //Each occurence of a unique error adds to its cooldown time...
cooldown = max(0, cooldown - (world.time - last_seen)) + configured_error_cooldown
// ... which is used to silence an error if it occurs too often, too fast
if(cooldown > configured_error_cooldown * configured_error_limit)
@@ -88,7 +88,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
if(usrinfo) //If this info isn't null, it hasn't been added yet
desclines.Add(usrinfo)
if(silencing)
- desclines += " (This error will now be silenced for [configured_error_silence_time / 600] minutes)"
+ desclines += " (This error will now be silenced for [DisplayTimeText(configured_error_silence_time)])"
if(GLOB.error_cache)
GLOB.error_cache.log_error(E, desclines)
diff --git a/code/modules/events/abductor.dm b/code/modules/events/abductor.dm
index bbc73dca66..6fee1e5c1a 100755
--- a/code/modules/events/abductor.dm
+++ b/code/modules/events/abductor.dm
@@ -3,9 +3,7 @@
typepath = /datum/round_event/ghost_role/abductor
weight = 10
max_occurrences = 1
-
min_players = 20
-
gamemode_blacklist = list("nuclear","wizard","revolution","abduction")
/datum/round_event/ghost_role/abductor
@@ -17,40 +15,17 @@
if(candidates.len < 2)
return NOT_ENOUGH_PLAYERS
- //Oh god why we can't have static functions
- // I feel your pain, bro
- var/number = SSticker.mode.abductor_teams + 1
- var/datum/game_mode/abduction/temp
+ var/datum/game_mode/abduction/GM
if(SSticker.mode.config_tag == "abduction")
- temp = SSticker.mode
+ GM = SSticker.mode
else
- temp = new
+ GM = new
- var/agent_mind = pick_n_take(candidates)
- var/scientist_mind = pick_n_take(candidates)
+ var/mob/living/carbon/human/agent = makeBody(pick_n_take(candidates))
+ var/mob/living/carbon/human/scientist = makeBody(pick_n_take(candidates))
- var/mob/living/carbon/human/agent = makeBody(agent_mind)
- var/mob/living/carbon/human/scientist = makeBody(scientist_mind)
-
- agent_mind = agent.mind
- scientist_mind = scientist.mind
-
- temp.scientists.len = number
- temp.agents.len = number
- temp.abductors.len = 2*number
- temp.team_objectives.len = number
- temp.team_names.len = number
- temp.scientists[number] = scientist_mind
- temp.agents[number] = agent_mind
- temp.abductors |= list(agent_mind,scientist_mind)
- temp.make_abductor_team(number,preset_scientist=scientist_mind,preset_agent=agent_mind)
- temp.post_setup_team(number)
-
- SSticker.mode.abductor_teams++
-
- if(SSticker.mode.config_tag != "abduction")
- SSticker.mode.abductors |= temp.abductors
+ GM.post_setup_team(GM.make_abductor_team(agent.mind, scientist.mind))
spawned_mobs += list(agent, scientist)
return SUCCESSFUL_SPAWN
diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm
index c5a9c1a142..bc2b3c2666 100644
--- a/code/modules/events/holiday/xmas.dm
+++ b/code/modules/events/holiday/xmas.dm
@@ -88,7 +88,7 @@
..()
if(FESTIVE_SEASON in SSevents.holidays)
new tree(get_turf(src))
- qdel(src)
+ return INITIALIZE_HINT_QDEL
/obj/effect/landmark/xmastree/rdrod
name = "festivus pole spawner"
diff --git a/code/modules/events/wizard/magicarp.dm b/code/modules/events/wizard/magicarp.dm
index 3d0461d3cf..cc632d9c87 100644
--- a/code/modules/events/wizard/magicarp.dm
+++ b/code/modules/events/wizard/magicarp.dm
@@ -43,7 +43,7 @@
/mob/living/simple_animal/hostile/carp/ranged/Initialize()
projectiletype = pick(allowed_projectile_types)
- ..()
+ . = ..()
/mob/living/simple_animal/hostile/carp/ranged/chaos
name = "chaos magicarp"
diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm
index 31909c4728..6b50a28b63 100644
--- a/code/modules/food_and_drinks/food/snacks_burgers.dm
+++ b/code/modules/food_and_drinks/food/snacks_burgers.dm
@@ -176,6 +176,22 @@
color = "#DA00FFFF"
bonus_reagents = list("purplecrayonpowder" = 10, "vitamin" = 5)
foodtype = GRAIN | MEAT
+
+/obj/item/reagent_containers/food/snacks/burger/black
+ name = "black burger"
+ desc = "This is overcooked."
+ icon_state = "cburger"
+ color = "#1C1C1C"
+ bonus_reagents = list("blackcrayonpowder" = 10, "vitamin" = 5)
+ foodtype = GRAIN | MEAT
+
+/obj/item/reagent_containers/food/snacks/burger/white
+ name = "white burger"
+ desc = "Delicous Titanium!"
+ icon_state = "cburger"
+ color = "#FFFFFF"
+ bonus_reagents = list("whitecrayonpowder" = 10, "vitamin" = 5)
+ foodtype = GRAIN | MEAT
/obj/item/reagent_containers/food/snacks/burger/spell
name = "spell burger"
@@ -251,4 +267,4 @@
icon_state = "baconburger"
bonus_reagents = list("nutriment" = 8, "vitamin" = 1)
tastes = list("bun" = 4, "bacon" = 2)
- foodtype = GRAIN | MEAT
\ No newline at end of file
+ foodtype = GRAIN | MEAT
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index e5c40623f0..2262c2e7f0 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -188,6 +188,24 @@
tastes = list("cobwebs" = 1)
foodtype = MEAT | TOXIC
+/obj/item/reagent_containers/food/snacks/spiderling
+ name = "spiderling"
+ desc = "It's slightly twitching in your hand. Ew..."
+ icon_state = "spiderling"
+ list_reagents = list("nutrient" = 1, "toxin" = 4)
+ filling_color = "#00800"
+ tastes = list("cobwebs" = 1, "guts" = 2)
+ foodtype = MEAT | TOXIC
+
+/obj/item/reagent_containers/food/snacks/spiderlollipop
+ name = "spider lollipop"
+ desc = "Still gross, but at least it has a mountain of sugar on it."
+ icon_state = "spiderlollipop"
+ list_reagents = list("nutriment" = 1, "toxin" = 1, "iron" = 10, "sugar" = 5, "omnizine" = 2) //lollipop, but vitamins = toxins
+ filling_color = "#00800"
+ tastes = list("cobwebs" = 1, "sugar" = 2)
+ foodtype = JUNKFOOD | SUGAR
+
/obj/item/reagent_containers/food/snacks/chococoin
name = "chocolate coin"
desc = "A completely edible but nonflippable festive coin."
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 806fbc1f90..efd877b9dc 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -158,10 +158,11 @@
for (var/I in src)
var/atom/movable/O = I
if (!QDELETED(O))
- if (listofitems[O.name])
- listofitems[O.name]["amount"]++
+ var/md5name = md5(O.name) // This needs to happen because of a bug in a TGUI component, https://github.com/ractivejs/ractive/issues/744
+ if (listofitems[md5name]) // which is fixed in a version we cannot use due to ie8 incompatibility
+ listofitems[md5name]["amount"]++ // The good news is, #30519 made smartfridge UIs non-auto-updating
else
- listofitems[O.name] = list("name" = O.name, "type" = O.type, "amount" = 1)
+ listofitems[md5name] = list("name" = O.name, "type" = O.type, "amount" = 1)
sortList(listofitems)
.["contents"] = listofitems
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
index 42e0c0c1c2..d7beebf461 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm
@@ -176,6 +176,26 @@
)
result = /obj/item/reagent_containers/food/snacks/burger/purple
subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/blackburger
+ name = "Black burger"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/toy/crayon/black = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/black
+ subcategory = CAT_BURGER
+
+/datum/crafting_recipe/food/whiteburger
+ name = "White burger"
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1,
+ /obj/item/toy/crayon/white = 1,
+ /obj/item/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/burger/white
+ subcategory = CAT_BURGER
/datum/crafting_recipe/food/spellburger
name = "Spell burger"
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
index b460e62f1e..40bb994e10 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -12,6 +12,16 @@
result = /obj/item/reagent_containers/food/snacks/candiedapple
subcategory = CAT_MISCFOOD
+/datum/crafting_recipe/food/spiderlollipop
+ name = "Spider Lollipop"
+ reqs = list(/obj/item/stack/rods = 1,
+ /datum/reagent/consumable/sugar = 5,
+ /datum/reagent/water = 5,
+ /obj/item/reagent_containers/food/snacks/spiderling = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/spiderlollipop
+ subcategory = CAT_MISCFOOD
+
/datum/crafting_recipe/food/chococoin
name = "Choco coin"
reqs = list(
diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm
index 2415f08d6d..71ff26a17e 100644
--- a/code/modules/holiday/easter.dm
+++ b/code/modules/holiday/easter.dm
@@ -126,7 +126,7 @@
/obj/item/toy/foamblade,
/obj/item/toy/prize/ripley,
/obj/item/toy/prize/honk,
- /obj/item/toy/carpplushie,
+ /obj/item/toy/plush/carpplushie,
/obj/item/toy/redbutton,
/obj/item/clothing/head/collectable/rabbitears)
new won(where)
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index b8fe3e777a..c8e9235646 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -485,7 +485,6 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and
begin_day += 31
begin_month-- //begins in march, ends in april
-// to_chat(world, "Easter calculates to be on [begin_day] of [begin_month] ([days_early] early) to [end_day] of [end_month] ([days_extra] extra) for 20[yy]")
return ..()
/datum/holiday/easter/celebrate()
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 52f5e4e138..4f5f9cbaf7 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -622,7 +622,7 @@
adjustHealth(round(salt * 0.25))
if (myseed)
myseed.adjust_production(-round(salt/100)-prob(salt%100))
- myseed.adjust_potency(round(salt*0.50))
+ myseed.adjust_potency(round(salt*0.5))
// Ash is also used IRL in gardening, as a fertilizer enhancer and weed killer
if(S.has_reagent("ash", 1))
adjustHealth(round(S.get_reagent_amount("ash") * 0.25))
diff --git a/code/modules/jobs/job_exp.dm.rej b/code/modules/jobs/job_exp.dm.rej
deleted file mode 100644
index 128a479acd..0000000000
--- a/code/modules/jobs/job_exp.dm.rej
+++ /dev/null
@@ -1,108 +0,0 @@
-diff a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm (rejected hunks)
-@@ -140,15 +140,12 @@ GLOBAL_PROTECT(exp_to_update)
- //resets a client's exp to what was in the db.
- /client/proc/set_exp_from_db()
- if(!config.use_exp_tracking)
-- return
-+ return -1
- if(!SSdbcore.Connect())
- return -1
- var/datum/DBQuery/exp_read = SSdbcore.NewQuery("SELECT job, minutes FROM [format_table_name("role_time")] WHERE ckey = '[sanitizeSQL(ckey)]'")
- if(!exp_read.Execute())
-- var/err = exp_read.ErrorMsg()
-- log_sql("SQL ERROR during exp_update_client read. Error : \[[err]\]\n")
-- message_admins("SQL ERROR during exp_update_client read. Error : \[[err]\]\n")
-- return
-+ return -1
- var/list/play_records = list()
- while(exp_read.NextRow())
- play_records[exp_read.item[1]] = text2num(exp_read.item[2])
-@@ -172,42 +169,24 @@ GLOBAL_PROTECT(exp_to_update)
- if(!set_db_player_flags())
- return -1
-
-- var/datum/DBQuery/flag_read = SSdbcore.NewQuery("SELECT flags FROM [format_table_name("player")] WHERE ckey='[sanitizeSQL(ckey)]'")
--
-- if(!flag_read.Execute())
-- var/err = flag_read.ErrorMsg()
-- log_sql("SQL ERROR during player flags read. Error : \[[err]\]\n")
-- message_admins("SQL ERROR during player flags read. Error : \[[err]\]\n")
-- return
--
-- var/playerflags = null
-- if(flag_read.NextRow())
-- playerflags = text2num(flag_read.item[1])
--
-- if((playerflags & newflag) && !state)
-+ if((prefs.db_flags & newflag) && !state)
- prefs.db_flags &= ~newflag
- else
- prefs.db_flags |= newflag
-
- var/datum/DBQuery/flag_update = SSdbcore.NewQuery("UPDATE [format_table_name("player")] SET flags = '[prefs.db_flags]' WHERE ckey='[sanitizeSQL(ckey)]'")
-
--
- if(!flag_update.Execute())
-- var/err = flag_update.ErrorMsg()
-- log_sql("SQL ERROR during exp_exempt update. Error : \[[err]\]\n")
-- message_admins("SQL ERROR during exp_exempt update. Error : \[[err]\]\n")
-- return
-+ return -1
-+
-
- /client/proc/update_exp_list(minutes, announce_changes = FALSE)
- if(!config.use_exp_tracking)
-- return
-+ return -1
- if(!SSdbcore.Connect())
- return -1
- var/datum/DBQuery/exp_read = SSdbcore.NewQuery("SELECT job, minutes FROM [format_table_name("role_time")] WHERE ckey = '[sanitizeSQL(ckey)]'")
- if(!exp_read.Execute())
-- var/err = exp_read.ErrorMsg()
-- log_sql("SQL ERROR during exp_update_client read. Error : \[[err]\]\n")
-- message_admins("SQL ERROR during exp_update_client read. Error : \[[err]\]\n")
- return -1
- var/list/play_records = list()
- while(exp_read.NextRow())
-@@ -241,9 +220,13 @@ GLOBAL_PROTECT(exp_to_update)
- if(announce_changes)
- to_chat(mob,"You got: [minutes] [role] EXP!")
- if(mob.mind.special_role && !mob.mind.var_edited)
-- play_records[mob.mind.special_role] += minutes
-+ var/trackedrole = mob.mind.special_role
-+ var/gangrole = lookforgangrole(mob.mind.special_role)
-+ if(gangrole)
-+ trackedrole = gangrole
-+ play_records[trackedrole] += minutes
- if(announce_changes)
-- to_chat(src,"You got: [minutes] [mob.mind.special_role] EXP!")
-+ to_chat(src,"You got: [minutes] [trackedrole] EXP!")
- if(!rolefound)
- play_records["Unknown"] += minutes
- else
-@@ -276,11 +259,21 @@ GLOBAL_PROTECT(exp_to_update)
- var/datum/DBQuery/flags_read = SSdbcore.NewQuery("SELECT flags FROM [format_table_name("player")] WHERE ckey='[ckey]'")
-
- if(!flags_read.Execute())
-- var/err = flags_read.ErrorMsg()
-- log_sql("SQL ERROR during player flags read. Error : \[[err]\]\n")
-- message_admins("SQL ERROR during player flags read. Error : \[[err]\]\n")
- return FALSE
-
- if(flags_read.NextRow())
- prefs.db_flags = text2num(flags_read.item[1])
-+ else if(isnull(prefs.db_flags))
-+ prefs.db_flags = 0 //This PROBABLY won't happen, but better safe than sorry.
- return TRUE
-+
-+//Since each gang is tracked as a different antag type, records need to be generalized or you get up to 57 different possible records
-+/proc/lookforgangrole(rolecheck)
-+ if(findtext(rolecheck,"Gangster"))
-+ return "Gangster"
-+ else if(findtext(rolecheck,"Gang Boss"))
-+ return "Gang Boss"
-+ else if(findtext(rolecheck,"Gang Lieutenant"))
-+ return "Gang Lieutenant"
-+ else
-+ return FALSE
-\ No newline at end of file
diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm
index 84623873e8..67a705455c 100644
--- a/code/modules/jobs/job_types/security.dm
+++ b/code/modules/jobs/job_types/security.dm
@@ -1,31 +1,31 @@
-//Warden and regular officers add this result to their get_access()
-/datum/job/proc/check_config_for_sec_maint()
- if(config.jobs_have_maint_access & SECURITY_HAS_MAINT_ACCESS)
+//Warden and regular officers add this result to their get_access()
+/datum/job/proc/check_config_for_sec_maint()
+ if(config.jobs_have_maint_access & SECURITY_HAS_MAINT_ACCESS)
return list(ACCESS_MAINT_TUNNELS)
- return list()
-
-/*
-Head of Security
-*/
-/datum/job/hos
- title = "Head of Security"
- flag = HOS
- department_head = list("Captain")
- department_flag = ENGSEC
- head_announce = list("Security")
- faction = "Station"
- total_positions = 1
- spawn_positions = 1
- supervisors = "the captain"
- selection_color = "#ffdddd"
- req_admin_notify = 1
- minimal_player_age = 14
+ return list()
+
+/*
+Head of Security
+*/
+/datum/job/hos
+ title = "Head of Security"
+ flag = HOS
+ department_head = list("Captain")
+ department_flag = ENGSEC
+ head_announce = list("Security")
+ faction = "Station"
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "the captain"
+ selection_color = "#ffdddd"
+ req_admin_notify = 1
+ minimal_player_age = 14
exp_requirements = 300
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_SECURITY
-
- outfit = /datum/outfit/job/hos
-
+
+ outfit = /datum/outfit/job/hos
+
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS,
ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS,
ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
@@ -34,284 +34,284 @@ Head of Security
ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS,
ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS)
-
-/datum/outfit/job/hos
- name = "Head of Security"
- jobtype = /datum/job/hos
-
- id = /obj/item/card/id/silver
- belt = /obj/item/device/pda/heads/hos
- ears = /obj/item/device/radio/headset/heads/hos/alt
- uniform = /obj/item/clothing/under/rank/head_of_security
- shoes = /obj/item/clothing/shoes/jackboots
- suit = /obj/item/clothing/suit/armor/hos/trenchcoat
- gloves = /obj/item/clothing/gloves/color/black/hos
- head = /obj/item/clothing/head/HoS/beret
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- suit_store = /obj/item/gun/energy/e_gun
- r_pocket = /obj/item/device/assembly/flash/handheld
- l_pocket = /obj/item/restraints/handcuffs
- backpack_contents = list(/obj/item/melee/baton/loaded=1)
-
- backpack = /obj/item/storage/backpack/security
- satchel = /obj/item/storage/backpack/satchel/sec
- duffelbag = /obj/item/storage/backpack/duffelbag/sec
- box = /obj/item/storage/box/security
-
- implants = list(/obj/item/implant/mindshield)
-
-/*
-Warden
-*/
-/datum/job/warden
- title = "Warden"
- flag = WARDEN
- department_head = list("Head of Security")
- department_flag = ENGSEC
- faction = "Station"
- total_positions = 1
- spawn_positions = 1
- supervisors = "the head of security"
- selection_color = "#ffeeee"
- minimal_player_age = 7
+
+/datum/outfit/job/hos
+ name = "Head of Security"
+ jobtype = /datum/job/hos
+
+ id = /obj/item/card/id/silver
+ belt = /obj/item/device/pda/heads/hos
+ ears = /obj/item/device/radio/headset/heads/hos/alt
+ uniform = /obj/item/clothing/under/rank/head_of_security
+ shoes = /obj/item/clothing/shoes/jackboots
+ suit = /obj/item/clothing/suit/armor/hos/trenchcoat
+ gloves = /obj/item/clothing/gloves/color/black/hos
+ head = /obj/item/clothing/head/HoS/beret
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ suit_store = /obj/item/gun/energy/e_gun
+ r_pocket = /obj/item/device/assembly/flash/handheld
+ l_pocket = /obj/item/restraints/handcuffs
+ backpack_contents = list(/obj/item/melee/baton/loaded=1)
+
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ box = /obj/item/storage/box/security
+
+ implants = list(/obj/item/implant/mindshield)
+
+/*
+Warden
+*/
+/datum/job/warden
+ title = "Warden"
+ flag = WARDEN
+ department_head = list("Head of Security")
+ department_flag = ENGSEC
+ faction = "Station"
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "the head of security"
+ selection_color = "#ffeeee"
+ minimal_player_age = 7
exp_requirements = 300
exp_type = EXP_TYPE_CREW
-
- outfit = /datum/outfit/job/warden
-
+
+ outfit = /datum/outfit/job/warden
+
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_FORENSICS_LOCKERS)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS) //SEE /DATUM/JOB/WARDEN/GET_ACCESS()
-
-/datum/job/warden/get_access()
- var/list/L = list()
- L = ..() | check_config_for_sec_maint()
- return L
-
-/datum/outfit/job/warden
- name = "Warden"
- jobtype = /datum/job/warden
-
- belt = /obj/item/device/pda/warden
- ears = /obj/item/device/radio/headset/headset_sec/alt
- uniform = /obj/item/clothing/under/rank/warden
- shoes = /obj/item/clothing/shoes/jackboots
- suit = /obj/item/clothing/suit/armor/vest/warden/alt
- gloves = /obj/item/clothing/gloves/color/black
- head = /obj/item/clothing/head/warden
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- r_pocket = /obj/item/device/assembly/flash/handheld
- l_pocket = /obj/item/restraints/handcuffs
- suit_store = /obj/item/gun/energy/e_gun/advtaser
- backpack_contents = list(/obj/item/melee/baton/loaded=1)
-
- backpack = /obj/item/storage/backpack/security
- satchel = /obj/item/storage/backpack/satchel/sec
- duffelbag = /obj/item/storage/backpack/duffelbag/sec
- box = /obj/item/storage/box/security
-
- implants = list(/obj/item/implant/mindshield)
-
-
-/*
-Detective
-*/
-/datum/job/detective
- title = "Detective"
- flag = DETECTIVE
- department_head = list("Head of Security")
- department_flag = ENGSEC
- faction = "Station"
- total_positions = 1
- spawn_positions = 1
- supervisors = "the head of security"
- selection_color = "#ffeeee"
- minimal_player_age = 7
+
+/datum/job/warden/get_access()
+ var/list/L = list()
+ L = ..() | check_config_for_sec_maint()
+ return L
+
+/datum/outfit/job/warden
+ name = "Warden"
+ jobtype = /datum/job/warden
+
+ belt = /obj/item/device/pda/warden
+ ears = /obj/item/device/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/rank/warden
+ shoes = /obj/item/clothing/shoes/jackboots
+ suit = /obj/item/clothing/suit/armor/vest/warden/alt
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/warden
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ r_pocket = /obj/item/device/assembly/flash/handheld
+ l_pocket = /obj/item/restraints/handcuffs
+ suit_store = /obj/item/gun/energy/e_gun/advtaser
+ backpack_contents = list(/obj/item/melee/baton/loaded=1)
+
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ box = /obj/item/storage/box/security
+
+ implants = list(/obj/item/implant/mindshield)
+
+
+/*
+Detective
+*/
+/datum/job/detective
+ title = "Detective"
+ flag = DETECTIVE
+ department_head = list("Head of Security")
+ department_flag = ENGSEC
+ faction = "Station"
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "the head of security"
+ selection_color = "#ffeeee"
+ minimal_player_age = 7
exp_requirements = 300
exp_type = EXP_TYPE_CREW
-
- outfit = /datum/outfit/job/detective
-
+
+ outfit = /datum/outfit/job/detective
+
access = list(ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_BRIG, ACCESS_WEAPONS)
minimal_access = list(ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_BRIG, ACCESS_WEAPONS)
-
-/datum/outfit/job/detective
- name = "Detective"
- jobtype = /datum/job/detective
-
- belt = /obj/item/device/pda/detective
- ears = /obj/item/device/radio/headset/headset_sec/alt
- uniform = /obj/item/clothing/under/rank/det
- shoes = /obj/item/clothing/shoes/sneakers/brown
- suit = /obj/item/clothing/suit/det_suit
- gloves = /obj/item/clothing/gloves/color/black
- head = /obj/item/clothing/head/fedora/det_hat
- l_pocket = /obj/item/toy/crayon/white
- r_pocket = /obj/item/lighter
- backpack_contents = list(/obj/item/storage/box/evidence=1,\
- /obj/item/device/detective_scanner=1,\
- /obj/item/melee/classic_baton=1)
- mask = /obj/item/clothing/mask/cigarette
-
- implants = list(/obj/item/implant/mindshield)
-
-/datum/outfit/job/detective/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
- ..()
- var/obj/item/clothing/mask/cigarette/cig = H.wear_mask
- cig.light("")
-
- if(visualsOnly)
- return
-
-/*
-Security Officer
-*/
-/datum/job/officer
- title = "Security Officer"
- flag = OFFICER
- department_head = list("Head of Security")
- department_flag = ENGSEC
- faction = "Station"
- total_positions = 5 //Handled in /datum/controller/occupations/proc/setup_officer_positions()
- spawn_positions = 5 //Handled in /datum/controller/occupations/proc/setup_officer_positions()
- supervisors = "the head of security, and the head of your assigned department (if applicable)"
- selection_color = "#ffeeee"
- minimal_player_age = 7
+
+/datum/outfit/job/detective
+ name = "Detective"
+ jobtype = /datum/job/detective
+
+ belt = /obj/item/device/pda/detective
+ ears = /obj/item/device/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/rank/det
+ shoes = /obj/item/clothing/shoes/sneakers/brown
+ suit = /obj/item/clothing/suit/det_suit
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/fedora/det_hat
+ l_pocket = /obj/item/toy/crayon/white
+ r_pocket = /obj/item/lighter
+ backpack_contents = list(/obj/item/storage/box/evidence=1,\
+ /obj/item/device/detective_scanner=1,\
+ /obj/item/melee/classic_baton=1)
+ mask = /obj/item/clothing/mask/cigarette
+
+ implants = list(/obj/item/implant/mindshield)
+
+/datum/outfit/job/detective/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ ..()
+ var/obj/item/clothing/mask/cigarette/cig = H.wear_mask
+ cig.light("")
+
+ if(visualsOnly)
+ return
+
+/*
+Security Officer
+*/
+/datum/job/officer
+ title = "Security Officer"
+ flag = OFFICER
+ department_head = list("Head of Security")
+ department_flag = ENGSEC
+ faction = "Station"
+ total_positions = 5 //Handled in /datum/controller/occupations/proc/setup_officer_positions()
+ spawn_positions = 5 //Handled in /datum/controller/occupations/proc/setup_officer_positions()
+ supervisors = "the head of security, and the head of your assigned department (if applicable)"
+ selection_color = "#ffeeee"
+ minimal_player_age = 7
exp_requirements = 300
exp_type = EXP_TYPE_CREW
-
- outfit = /datum/outfit/job/security
-
+
+ outfit = /datum/outfit/job/security
+
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_FORENSICS_LOCKERS)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS) //BUT SEE /DATUM/JOB/WARDEN/GET_ACCESS()
-
-
-/datum/job/officer/get_access()
- var/list/L = list()
- L |= ..() | check_config_for_sec_maint()
- return L
-
-GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY))
-
-/datum/job/officer/after_spawn(mob/living/carbon/human/H, mob/M)
- // Assign department security
- var/department
- if(M && M.client && M.client.prefs)
- department = M.client.prefs.prefered_security_department
- if(!LAZYLEN(GLOB.available_depts) || department == "None")
- return
- else if(department in GLOB.available_depts)
- LAZYREMOVE(GLOB.available_depts, department)
- else
- department = pick_n_take(GLOB.available_depts)
- var/ears = null
- var/accessory = null
- var/list/dep_access = null
- var/destination = null
- var/spawn_point = null
- switch(department)
- if(SEC_DEPT_SUPPLY)
- ears = /obj/item/device/radio/headset/headset_sec/alt/department/supply
+
+
+/datum/job/officer/get_access()
+ var/list/L = list()
+ L |= ..() | check_config_for_sec_maint()
+ return L
+
+GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY))
+
+/datum/job/officer/after_spawn(mob/living/carbon/human/H, mob/M)
+ // Assign department security
+ var/department
+ if(M && M.client && M.client.prefs)
+ department = M.client.prefs.prefered_security_department
+ if(!LAZYLEN(GLOB.available_depts) || department == "None")
+ return
+ else if(department in GLOB.available_depts)
+ LAZYREMOVE(GLOB.available_depts, department)
+ else
+ department = pick_n_take(GLOB.available_depts)
+ var/ears = null
+ var/accessory = null
+ var/list/dep_access = null
+ var/destination = null
+ var/spawn_point = null
+ switch(department)
+ if(SEC_DEPT_SUPPLY)
+ ears = /obj/item/device/radio/headset/headset_sec/alt/department/supply
dep_access = list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION)
- destination = /area/security/checkpoint/supply
- spawn_point = locate(/obj/effect/landmark/start/depsec/supply) in GLOB.department_security_spawns
- accessory = /obj/item/clothing/accessory/armband/cargo
- if(SEC_DEPT_ENGINEERING)
- ears = /obj/item/device/radio/headset/headset_sec/alt/department/engi
+ destination = /area/security/checkpoint/supply
+ spawn_point = locate(/obj/effect/landmark/start/depsec/supply) in GLOB.department_security_spawns
+ accessory = /obj/item/clothing/accessory/armband/cargo
+ if(SEC_DEPT_ENGINEERING)
+ ears = /obj/item/device/radio/headset/headset_sec/alt/department/engi
dep_access = list(ACCESS_CONSTRUCTION, ACCESS_ENGINE)
- destination = /area/security/checkpoint/engineering
- spawn_point = locate(/obj/effect/landmark/start/depsec/engineering) in GLOB.department_security_spawns
- accessory = /obj/item/clothing/accessory/armband/engine
- if(SEC_DEPT_MEDICAL)
- ears = /obj/item/device/radio/headset/headset_sec/alt/department/med
+ destination = /area/security/checkpoint/engineering
+ spawn_point = locate(/obj/effect/landmark/start/depsec/engineering) in GLOB.department_security_spawns
+ accessory = /obj/item/clothing/accessory/armband/engine
+ if(SEC_DEPT_MEDICAL)
+ ears = /obj/item/device/radio/headset/headset_sec/alt/department/med
dep_access = list(ACCESS_MEDICAL)
- destination = /area/security/checkpoint/medical
- spawn_point = locate(/obj/effect/landmark/start/depsec/medical) in GLOB.department_security_spawns
- accessory = /obj/item/clothing/accessory/armband/medblue
- if(SEC_DEPT_SCIENCE)
- ears = /obj/item/device/radio/headset/headset_sec/alt/department/sci
+ destination = /area/security/checkpoint/medical
+ spawn_point = locate(/obj/effect/landmark/start/depsec/medical) in GLOB.department_security_spawns
+ accessory = /obj/item/clothing/accessory/armband/medblue
+ if(SEC_DEPT_SCIENCE)
+ ears = /obj/item/device/radio/headset/headset_sec/alt/department/sci
dep_access = list(ACCESS_RESEARCH)
- destination = /area/security/checkpoint/science
- spawn_point = locate(/obj/effect/landmark/start/depsec/science) in GLOB.department_security_spawns
- accessory = /obj/item/clothing/accessory/armband/science
-
- if(accessory)
- var/obj/item/clothing/under/U = H.w_uniform
- U.attach_accessory(new accessory)
- if(ears)
- if(H.ears)
- qdel(H.ears)
- H.equip_to_slot_or_del(new ears(H),slot_ears)
-
- var/obj/item/card/id/W = H.wear_id
- W.access |= dep_access
-
- var/teleport = 0
- if(!config.sec_start_brig)
- if(destination || spawn_point)
- teleport = 1
- if(teleport)
- var/turf/T
- if(spawn_point)
- T = get_turf(spawn_point)
- H.Move(T)
- else
- var/safety = 0
- while(safety < 25)
- T = safepick(get_area_turfs(destination))
- if(T && !H.Move(T))
- safety += 1
- continue
- else
- break
- if(department)
- to_chat(M, "You have been assigned to [department]!")
- else
- to_chat(M, "You have not been assigned to any department. Patrol the halls and help where needed.")
-
-
-
-/datum/outfit/job/security
- name = "Security Officer"
- jobtype = /datum/job/officer
-
- belt = /obj/item/device/pda/security
- ears = /obj/item/device/radio/headset/headset_sec/alt
- uniform = /obj/item/clothing/under/rank/security
- gloves = /obj/item/clothing/gloves/color/black
- head = /obj/item/clothing/head/helmet/sec
- suit = /obj/item/clothing/suit/armor/vest/alt
- shoes = /obj/item/clothing/shoes/jackboots
- l_pocket = /obj/item/restraints/handcuffs
- r_pocket = /obj/item/device/assembly/flash/handheld
- suit_store = /obj/item/gun/energy/e_gun/advtaser
- backpack_contents = list(/obj/item/melee/baton/loaded=1)
-
- backpack = /obj/item/storage/backpack/security
- satchel = /obj/item/storage/backpack/satchel/sec
- duffelbag = /obj/item/storage/backpack/duffelbag/sec
- box = /obj/item/storage/box/security
-
- implants = list(/obj/item/implant/mindshield)
-
-
-/obj/item/device/radio/headset/headset_sec/alt/department/Initialize()
- wires = new/datum/wires/radio(src)
- secure_radio_connections = new
- recalculateChannels()
- ..()
-
-/obj/item/device/radio/headset/headset_sec/alt/department/engi
- keyslot = new /obj/item/device/encryptionkey/headset_sec
- keyslot2 = new /obj/item/device/encryptionkey/headset_eng
-
-/obj/item/device/radio/headset/headset_sec/alt/department/supply
- keyslot = new /obj/item/device/encryptionkey/headset_sec
- keyslot2 = new /obj/item/device/encryptionkey/headset_cargo
-
-/obj/item/device/radio/headset/headset_sec/alt/department/med
- keyslot = new /obj/item/device/encryptionkey/headset_sec
- keyslot2 = new /obj/item/device/encryptionkey/headset_med
-
-/obj/item/device/radio/headset/headset_sec/alt/department/sci
- keyslot = new /obj/item/device/encryptionkey/headset_sec
- keyslot2 = new /obj/item/device/encryptionkey/headset_sci
+ destination = /area/security/checkpoint/science
+ spawn_point = locate(/obj/effect/landmark/start/depsec/science) in GLOB.department_security_spawns
+ accessory = /obj/item/clothing/accessory/armband/science
+
+ if(accessory)
+ var/obj/item/clothing/under/U = H.w_uniform
+ U.attach_accessory(new accessory)
+ if(ears)
+ if(H.ears)
+ qdel(H.ears)
+ H.equip_to_slot_or_del(new ears(H),slot_ears)
+
+ var/obj/item/card/id/W = H.wear_id
+ W.access |= dep_access
+
+ var/teleport = 0
+ if(!config.sec_start_brig)
+ if(destination || spawn_point)
+ teleport = 1
+ if(teleport)
+ var/turf/T
+ if(spawn_point)
+ T = get_turf(spawn_point)
+ H.Move(T)
+ else
+ var/safety = 0
+ while(safety < 25)
+ T = safepick(get_area_turfs(destination))
+ if(T && !H.Move(T))
+ safety += 1
+ continue
+ else
+ break
+ if(department)
+ to_chat(M, "You have been assigned to [department]!")
+ else
+ to_chat(M, "You have not been assigned to any department. Patrol the halls and help where needed.")
+
+
+
+/datum/outfit/job/security
+ name = "Security Officer"
+ jobtype = /datum/job/officer
+
+ belt = /obj/item/device/pda/security
+ ears = /obj/item/device/radio/headset/headset_sec/alt
+ uniform = /obj/item/clothing/under/rank/security
+ gloves = /obj/item/clothing/gloves/color/black
+ head = /obj/item/clothing/head/helmet/sec
+ suit = /obj/item/clothing/suit/armor/vest/alt
+ shoes = /obj/item/clothing/shoes/jackboots
+ l_pocket = /obj/item/restraints/handcuffs
+ r_pocket = /obj/item/device/assembly/flash/handheld
+ suit_store = /obj/item/gun/energy/e_gun/advtaser
+ backpack_contents = list(/obj/item/melee/baton/loaded=1)
+
+ backpack = /obj/item/storage/backpack/security
+ satchel = /obj/item/storage/backpack/satchel/sec
+ duffelbag = /obj/item/storage/backpack/duffelbag/sec
+ box = /obj/item/storage/box/security
+
+ implants = list(/obj/item/implant/mindshield)
+
+
+/obj/item/device/radio/headset/headset_sec/alt/department/Initialize()
+ . = ..()
+ wires = new/datum/wires/radio(src)
+ secure_radio_connections = new
+ recalculateChannels()
+
+/obj/item/device/radio/headset/headset_sec/alt/department/engi
+ keyslot = new /obj/item/device/encryptionkey/headset_sec
+ keyslot2 = new /obj/item/device/encryptionkey/headset_eng
+
+/obj/item/device/radio/headset/headset_sec/alt/department/supply
+ keyslot = new /obj/item/device/encryptionkey/headset_sec
+ keyslot2 = new /obj/item/device/encryptionkey/headset_cargo
+
+/obj/item/device/radio/headset/headset_sec/alt/department/med
+ keyslot = new /obj/item/device/encryptionkey/headset_sec
+ keyslot2 = new /obj/item/device/encryptionkey/headset_med
+
+/obj/item/device/radio/headset/headset_sec/alt/department/sci
+ keyslot = new /obj/item/device/encryptionkey/headset_sec
+ keyslot2 = new /obj/item/device/encryptionkey/headset_sci
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 11eca212ae..17d626b3a0 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -14,8 +14,8 @@
name = "bookcase"
icon = 'icons/obj/library.dmi'
icon_state = "bookempty"
- anchored = FALSE
- density = TRUE
+ anchored = FALSE
+ density = TRUE
opacity = 0
resistance_flags = FLAMMABLE
max_integrity = 200
@@ -25,12 +25,12 @@
/obj/structure/bookcase/Initialize(mapload)
- ..()
+ . = ..()
if(!mapload)
return
state = 2
icon_state = "book-0"
- anchored = TRUE
+ anchored = TRUE
for(var/obj/item/I in loc)
if(istype(I, /obj/item/book))
I.loc = src
@@ -44,7 +44,7 @@
playsound(loc, I.usesound, 100, 1)
if(do_after(user, 20*I.toolspeed, target = src))
to_chat(user, "You wrench the frame into place.")
- anchored = TRUE
+ anchored = TRUE
state = 1
if(istype(I, /obj/item/crowbar))
playsound(loc, I.usesound, 100, 1)
@@ -63,7 +63,7 @@
if(istype(I, /obj/item/wrench))
playsound(loc, I.usesound, 100, 1)
to_chat(user, "You unwrench the frame.")
- anchored = FALSE
+ anchored = FALSE
state = 0
if(2)
@@ -317,4 +317,4 @@
to_chat(user, "Computer has been associated with this unit.")
else
to_chat(user, "No associated computer found. Only local scans will function properly.")
- to_chat(user, "\n")
+ to_chat(user, "\n")
\ No newline at end of file
diff --git a/code/modules/library/random_books.dm b/code/modules/library/random_books.dm
index 3c44dc28ea..769c9ac66b 100644
--- a/code/modules/library/random_books.dm
+++ b/code/modules/library/random_books.dm
@@ -1,18 +1,18 @@
/obj/item/book/manual/random/Initialize()
- . = ..()
+ ..()
var/static/banned_books = list(/obj/item/book/manual/random, /obj/item/book/manual/nuclear, /obj/item/book/manual/wiki)
var/newtype = pick(subtypesof(/obj/item/book/manual) - banned_books)
new newtype(loc)
- qdel(src)
+ return INITIALIZE_HINT_QDEL
/obj/item/book/random
var/amount = 1
var/category = null
/obj/item/book/random/Initialize()
- . = ..()
+ ..()
create_random_books(amount, src.loc, TRUE, category)
- qdel(src)
+ return INITIALIZE_HINT_QDEL
/obj/item/book/random/triple
amount = 3
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index 10512aa5a2..4db42b6933 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -83,7 +83,7 @@
new /obj/item/clothing/suit/hooded/ian_costume(src)
if(67 to 68)
for(var/i in 1 to rand(4, 7))
- var /newitem = pick(subtypesof(/obj/item/stock_parts) - /obj/item/stock_parts/subspace)
+ var/newitem = pick(subtypesof(/obj/item/stock_parts) - /obj/item/stock_parts/subspace)
new newitem(src)
if(69 to 70)
for(var/i in 1 to 5)
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index 89e9d6fd10..c02737a2fd 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -292,7 +292,7 @@
//ash drake
/obj/item/crusher_trophy/tail_spike
- desc = "A spike taken from a ash drake's tail. Suitable as a trophy for a kinetic crusher."
+ desc = "A spike taken from an ash drake's tail. Suitable as a trophy for a kinetic crusher."
denied_type = /obj/item/crusher_trophy/tail_spike
bonus_value = 5
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 3562314458..58c971024f 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -11,7 +11,7 @@
desc = "It's watching you suspiciously."
/obj/structure/closet/crate/necropolis/tendril/PopulateContents()
- var/loot = rand(1,28)
+ var/loot = rand(1,27)
switch(loot)
if(1)
new /obj/item/device/shared_storage/red(src)
@@ -28,7 +28,10 @@
if(7)
new /obj/item/pickaxe/diamond(src)
if(8)
- new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src)
+ if(prob(50))
+ new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src)
+ else
+ new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src)
if(9)
new /obj/item/organ/brain/alien(src)
if(10)
@@ -38,7 +41,7 @@
if(12)
new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker(src)
if(13)
- new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src)
+ new /obj/item/jacobs_ladder(src)
if(14)
new /obj/item/nullrod/scythe/talking(src)
if(15)
@@ -46,7 +49,10 @@
if(16)
new /obj/item/guardiancreator(src)
if(17)
- new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src)
+ if(prob(50))
+ new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src)
+ else
+ new /obj/item/disk/design_disk/modkit_disc/bounty(src)
if(18)
new /obj/item/device/warp_cube/red(src)
if(19)
@@ -69,8 +75,7 @@
if(27)
new /obj/item/borg/upgrade/modkit/lifesteal(src)
new /obj/item/bedsheet/cult(src)
- if(28)
- new /obj/item/disk/design_disk/modkit_disc/bounty(src)
+
//KA modkit design discs
/obj/item/disk/design_disk/modkit_disc
@@ -331,7 +336,7 @@
if(cooldown < world.time)
SSblackbox.add_details("immortality_talisman","Activated") // usage
cooldown = world.time + 600
- user.visible_message("[user] vanishes from reality, leaving a a hole in [user.p_their()] place!")
+ user.visible_message("[user] vanishes from reality, leaving a hole in [user.p_their()] place!")
var/obj/effect/immortality_talisman/Z = new(get_turf(src.loc))
Z.name = "hole in reality"
Z.desc = "It's shaped an awful lot like [user.name]."
@@ -563,7 +568,28 @@
..()
+/obj/item/jacobs_ladder
+ name = "jacob's ladder"
+ desc = "A celestial ladder that violates the laws of physics."
+ icon = 'icons/obj/structures.dmi'
+ icon_state = "ladder00"
+/obj/item/jacobs_ladder/attack_self(mob/user)
+ var/turf/T = get_turf(src)
+ var/ladder_x = T.x
+ var/ladder_y = T.y
+ to_chat(user, "You unfold the ladder. It extends much farther than you were expecting.")
+ for(var/i in 1 to world.maxz)
+ if(i == ZLEVEL_CENTCOM || i == ZLEVEL_TRANSIT)
+ continue
+ var/turf/T2 = locate(ladder_x, ladder_y, i)
+ new /obj/structure/ladder/unbreakable/jacob(T2)
+ qdel(src)
+
+/obj/structure/ladder/unbreakable/jacob
+ name = "jacob's ladder"
+ desc = "An indestructible celestial ladder that violates the laws of physics."
+ auto_connect = TRUE
///Bosses
@@ -1263,3 +1289,5 @@
for(var/t in RANGE_TURFS(1, T))
var/obj/effect/temp_visual/hierophant/blast/B = new(t, user, friendly_fire_check)
B.damage = 15 //keeps monster damage boost due to lower damage
+
+
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index 8428036860..0927a0ba88 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -66,7 +66,6 @@
density = TRUE
anchored = TRUE
var/obj/machinery/mineral/CONSOLE = null
- var/datum/material_container/materials
var/on = FALSE
var/selected_material = MAT_METAL
var/selected_alloy = null
@@ -75,12 +74,11 @@
/obj/machinery/mineral/processing_unit/Initialize()
. = ..()
proximity_monitor = new(src, 1)
- materials = new(src, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),INFINITY)
+ AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE), INFINITY)
files = new /datum/research/smelter(src)
/obj/machinery/mineral/processing_unit/Destroy()
CONSOLE = null
- QDEL_NULL(materials)
QDEL_NULL(files)
return ..()
@@ -89,6 +87,7 @@
process_ore(AM)
/obj/machinery/mineral/processing_unit/proc/process_ore(obj/item/ore/O)
+ GET_COMPONENT(materials, /datum/component/material_container)
var/material_amount = materials.get_item_material_amount(O)
if(!materials.has_space(material_amount))
unload_mineral(O)
@@ -100,6 +99,7 @@
/obj/machinery/mineral/processing_unit/proc/get_machine_data()
var/dat = "Smelter control console
"
+ GET_COMPONENT(materials, /datum/component/material_container)
for(var/mat_id in materials.materials)
var/datum/material/M = materials.materials[mat_id]
dat += "[M.name]: [M.amount] cm³"
@@ -165,6 +165,7 @@
continue*/
/obj/machinery/mineral/processing_unit/proc/smelt_ore()
+ GET_COMPONENT(materials, /datum/component/material_container)
var/datum/material/mat = materials.materials[selected_material]
if(mat)
var/sheets_to_remove = (mat.amount >= (MINERAL_MATERIAL_AMOUNT * SMELT_AMOUNT) ) ? SMELT_AMOUNT : round(mat.amount / MINERAL_MATERIAL_AMOUNT)
@@ -187,6 +188,7 @@
on = FALSE
return
+ GET_COMPONENT(materials, /datum/component/material_container)
materials.use_amount(alloy.materials, amount)
generate_mineral(alloy.build_path)
@@ -197,6 +199,7 @@
var/build_amount = SMELT_AMOUNT
+ GET_COMPONENT(materials, /datum/component/material_container)
for(var/mat_id in D.materials)
var/M = D.materials[mat_id]
@@ -214,6 +217,7 @@
unload_mineral(O)
/obj/machinery/mineral/processing_unit/on_deconstruction()
+ GET_COMPONENT(materials, /datum/component/material_container)
materials.retrieve_all()
..()
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index abead3ab9a..38e02474f4 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -22,17 +22,15 @@
var/list/ore_values = list(MAT_GLASS = 1, MAT_METAL = 1, MAT_PLASMA = 15, MAT_SILVER = 16, MAT_GOLD = 18, MAT_TITANIUM = 30, MAT_URANIUM = 30, MAT_DIAMOND = 50, MAT_BLUESPACE = 50, MAT_BANANIUM = 60)
var/message_sent = FALSE
var/list/ore_buffer = list()
- var/datum/material_container/materials
var/datum/research/files
var/obj/item/disk/design_disk/inserted_disk
/obj/machinery/mineral/ore_redemption/Initialize()
. = ..()
- materials = new(src, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),INFINITY)
+ AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),INFINITY)
files = new /datum/research/smelter(src)
/obj/machinery/mineral/ore_redemption/Destroy()
- QDEL_NULL(materials)
QDEL_NULL(files)
return ..()
@@ -57,6 +55,7 @@
if(O && O.refined_type)
points += O.points * point_upgrade
+ GET_COMPONENT(materials, /datum/component/material_container)
var/material_amount = materials.get_item_material_amount(O)
if(!material_amount)
@@ -75,6 +74,7 @@
var/build_amount = 0
+ GET_COMPONENT(materials, /datum/component/material_container)
for(var/mat_id in D.materials)
var/M = D.materials[mat_id]
var/datum/material/redemption_mat = materials.materials[mat_id]
@@ -110,6 +110,7 @@
var/has_minerals = FALSE
+ GET_COMPONENT(materials, /datum/component/material_container)
for(var/mat_id in materials.materials)
var/datum/material/M = materials.materials[mat_id]
var/mineral_amount = M.amount / MINERAL_MATERIAL_AMOUNT
@@ -148,6 +149,7 @@
/obj/machinery/mineral/ore_redemption/attackby(obj/item/W, mob/user, params)
if(exchange_parts(user, W))
return
+ GET_COMPONENT(materials, /datum/component/material_container)
if(default_pry_open(W))
materials.retrieve_all()
return
@@ -181,16 +183,10 @@
if(user.transferItemToLoc(W, src))
inserted_disk = W
return TRUE
-
- if(istype(W, /obj/item/stack/sheet))
- var/obj/item/stack/sheet/S = W
- var/inserted = materials.insert_stack(S, S.amount)
- to_chat(user, "You add [inserted] [S] sheets to \the [src].")
- return
-
return ..()
/obj/machinery/mineral/ore_redemption/on_deconstruction()
+ GET_COMPONENT(materials, /datum/component/material_container)
materials.retrieve_all()
..()
@@ -213,6 +209,7 @@
data["claimedPoints"] = inserted_id.mining_points
data["materials"] = list()
+ GET_COMPONENT(materials, /datum/component/material_container)
for(var/mat_id in materials.materials)
var/datum/material/M = materials.materials[mat_id]
var/sheet_amount = M.amount ? M.amount / MINERAL_MATERIAL_AMOUNT : "0"
@@ -236,6 +233,7 @@
/obj/machinery/mineral/ore_redemption/ui_act(action, params)
if(..())
return
+ GET_COMPONENT(materials, /datum/component/material_container)
switch(action)
if("Eject")
if(!inserted_id)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 15d05d37fe..38381ae9c5 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -67,6 +67,7 @@
possible_destinations = "mining_home;mining_away;landing_zone_dock;mining_public"
no_destination_swap = 1
var/global/list/dumb_rev_heads = list()
+ req_access = list(ACCESS_MINING) // should slow the ashwalkers down.
/obj/machinery/computer/shuttle/mining/attack_hand(mob/user)
if((user.z in GLOB.station_z_levels) && user.mind && (user.mind in SSticker.mode.head_revolutionaries) && !(user.mind in dumb_rev_heads))
diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm
index e48db7c6fd..1a4e4c5ed1 100644
--- a/code/modules/mining/mint.dm
+++ b/code/modules/mining/mint.dm
@@ -1,107 +1,103 @@
-/**********************Mint**************************/
-
-
-/obj/machinery/mineral/mint
- name = "coin press"
- icon = 'icons/obj/economy.dmi'
- icon_state = "coinpress0"
+/**********************Mint**************************/
+
+
+/obj/machinery/mineral/mint
+ name = "coin press"
+ icon = 'icons/obj/economy.dmi'
+ icon_state = "coinpress0"
density = TRUE
anchored = TRUE
- var/datum/material_container/materials
- var/newCoins = 0 //how many coins the machine made in it's last load
+ var/newCoins = 0 //how many coins the machine made in it's last load
var/processing = FALSE
- var/chosen = MAT_METAL //which material will be used to make coins
- var/coinsToProduce = 10
- speed_process = 1
-
-
+ var/chosen = MAT_METAL //which material will be used to make coins
+ var/coinsToProduce = 10
+ speed_process = 1
+
+
/obj/machinery/mineral/mint/Initialize()
. = ..()
- materials = new /datum/material_container(src,
- list(MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM),
- max_amt = MINERAL_MATERIAL_AMOUNT*50)
-
-/obj/machinery/mineral/mint/Destroy()
- QDEL_NULL(materials)
- return ..()
-
-/obj/machinery/mineral/mint/process()
- var/turf/T = get_step(src, input_dir)
- if(!T)
- return
-
- for(var/obj/item/stack/sheet/O in T)
- materials.insert_stack(O, O.amount)
-
-/obj/machinery/mineral/mint/attack_hand(mob/user)
- var/dat = "Coin Press
"
-
- for(var/mat_id in materials.materials)
- var/datum/material/M = materials.materials[mat_id]
- if(!M.amount && chosen != mat_id)
- continue
- dat += "
[M.name] amount: [M.amount] cm3 "
- if (chosen == mat_id)
- dat += "Chosen"
- else
- dat += "Choose"
-
- var/datum/material/M = materials.materials[chosen]
-
- dat += "
Will produce [coinsToProduce] [lowertext(M.name)] coins if enough materials are available.
"
- dat += "-10 "
- dat += "-5 "
- dat += "-1 "
- dat += "+1 "
- dat += "+5 "
- dat += "+10 "
-
- dat += "
In total this machine produced [newCoins] coins."
- dat += "
Make coins"
- user << browse(dat, "window=mint")
-
-/obj/machinery/mineral/mint/Topic(href, href_list)
- if(..())
- return
- usr.set_machine(src)
- src.add_fingerprint(usr)
- if(processing==1)
- to_chat(usr, "The machine is processing.")
- return
- if(href_list["choose"])
- if(materials.materials[href_list["choose"]])
- chosen = href_list["choose"]
- if(href_list["chooseAmt"])
- coinsToProduce = Clamp(coinsToProduce + text2num(href_list["chooseAmt"]), 0, 1000)
- if(href_list["makeCoins"])
- var/temp_coins = coinsToProduce
+ AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_DIAMOND, MAT_BANANIUM), MINERAL_MATERIAL_AMOUNT * 50)
+
+/obj/machinery/mineral/mint/process()
+ var/turf/T = get_step(src, input_dir)
+ if(!T)
+ return
+
+ GET_COMPONENT(materials, /datum/component/material_container)
+ for(var/obj/item/stack/sheet/O in T)
+ materials.insert_stack(O, O.amount)
+
+/obj/machinery/mineral/mint/attack_hand(mob/user)
+ var/dat = "Coin Press
"
+
+ GET_COMPONENT(materials, /datum/component/material_container)
+ for(var/mat_id in materials.materials)
+ var/datum/material/M = materials.materials[mat_id]
+ if(!M.amount && chosen != mat_id)
+ continue
+ dat += "
[M.name] amount: [M.amount] cm3 "
+ if (chosen == mat_id)
+ dat += "Chosen"
+ else
+ dat += "Choose"
+
+ var/datum/material/M = materials.materials[chosen]
+
+ dat += "
Will produce [coinsToProduce] [lowertext(M.name)] coins if enough materials are available.
"
+ dat += "-10 "
+ dat += "-5 "
+ dat += "-1 "
+ dat += "+1 "
+ dat += "+5 "
+ dat += "+10 "
+
+ dat += "
In total this machine produced [newCoins] coins."
+ dat += "
Make coins"
+ user << browse(dat, "window=mint")
+
+/obj/machinery/mineral/mint/Topic(href, href_list)
+ if(..())
+ return
+ usr.set_machine(src)
+ src.add_fingerprint(usr)
+ if(processing==1)
+ to_chat(usr, "The machine is processing.")
+ return
+ GET_COMPONENT(materials, /datum/component/material_container)
+ if(href_list["choose"])
+ if(materials.materials[href_list["choose"]])
+ chosen = href_list["choose"]
+ if(href_list["chooseAmt"])
+ coinsToProduce = Clamp(coinsToProduce + text2num(href_list["chooseAmt"]), 0, 1000)
+ if(href_list["makeCoins"])
+ var/temp_coins = coinsToProduce
processing = TRUE
- icon_state = "coinpress1"
- var/coin_mat = MINERAL_MATERIAL_AMOUNT * 0.2
- var/datum/material/M = materials.materials[chosen]
- if(!M || !M.coin_type)
- updateUsrDialog()
- return
-
- while(coinsToProduce > 0 && materials.use_amount_type(coin_mat, chosen))
- create_coins(M.coin_type)
- coinsToProduce--
- newCoins++
- src.updateUsrDialog()
- sleep(5)
-
- icon_state = "coinpress0"
+ icon_state = "coinpress1"
+ var/coin_mat = MINERAL_MATERIAL_AMOUNT * 0.2
+ var/datum/material/M = materials.materials[chosen]
+ if(!M || !M.coin_type)
+ updateUsrDialog()
+ return
+
+ while(coinsToProduce > 0 && materials.use_amount_type(coin_mat, chosen))
+ create_coins(M.coin_type)
+ coinsToProduce--
+ newCoins++
+ src.updateUsrDialog()
+ sleep(5)
+
+ icon_state = "coinpress0"
processing = FALSE
- coinsToProduce = temp_coins
- src.updateUsrDialog()
- return
-
-/obj/machinery/mineral/mint/proc/create_coins(P)
- var/turf/T = get_step(src,output_dir)
- if(T)
- var/obj/item/O = new P(src)
- var/obj/item/storage/bag/money/M = locate(/obj/item/storage/bag/money, T)
- if(!M)
- M = new /obj/item/storage/bag/money(src)
- unload_mineral(M)
+ coinsToProduce = temp_coins
+ src.updateUsrDialog()
+ return
+
+/obj/machinery/mineral/mint/proc/create_coins(P)
+ var/turf/T = get_step(src,output_dir)
+ if(T)
+ var/obj/item/O = new P(src)
+ var/obj/item/storage/bag/money/M = locate(/obj/item/storage/bag/money, T)
+ if(!M)
+ M = new /obj/item/storage/bag/money(src)
+ unload_mineral(M)
O.loc = M
\ No newline at end of file
diff --git a/code/modules/mob/dead/new_player/login.dm.rej b/code/modules/mob/dead/new_player/login.dm.rej
deleted file mode 100644
index b7361e13ff..0000000000
--- a/code/modules/mob/dead/new_player/login.dm.rej
+++ /dev/null
@@ -1,9 +0,0 @@
-diff a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm (rejected hunks)
-@@ -1,5 +1,6 @@
- /mob/dead/new_player/Login()
-- client.update_exp_client(0, 0)
-+ if(config.use_exp_tracking)
-+ client.update_exp_client(0, 0)
- if(!mind)
- mind = new /datum/mind(key)
- mind.active = 1
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index bf8836fb72..00f664b59c 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -329,6 +329,9 @@
if(SSshuttle.arrivals.damaged && config.arrivals_shuttle_require_safe_latejoin)
src << alert("The arrivals shuttle is currently malfunctioning! You cannot join.")
return FALSE
+
+ if(config.arrivals_shuttle_require_undocked)
+ SSshuttle.arrivals.RequireUndocked(src)
arrivals_docked = SSshuttle.arrivals.mode != SHUTTLE_CALL
//Remove the player from the join queue if he was in one and reset the timer
@@ -394,12 +397,7 @@
/mob/dead/new_player/proc/LateChoices()
- var/mills = world.time - SSticker.round_start_time // 1/10 of a second, not real milliseconds but whatever
- //var/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence.. or something
- var/mins = (mills % 36000) / 600
- var/hours = mills / 36000
-
- var/dat = "Round Duration: [round(hours)]h [round(mins)]m "
+ var/dat = "Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)] "
if(SSshuttle.emergency)
switch(SSshuttle.emergency.mode)
diff --git a/code/modules/mob/dead/new_player/poll.dm b/code/modules/mob/dead/new_player/poll.dm
index 9ca76c6356..2e2f3189fe 100644
--- a/code/modules/mob/dead/new_player/poll.dm
+++ b/code/modules/mob/dead/new_player/poll.dm
@@ -417,7 +417,7 @@
to_chat(src, "Invalid vote data")
return 0
- //lets add the vote, first we generate a insert statement.
+ //lets add the vote, first we generate an insert statement.
var/sqlrowlist = ""
for (var/vote in numberedvotelist)
diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm
index 4810b666e7..0a8dc6c733 100644
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -1,100 +1,84 @@
-
- //The mob should have a gender you want before running this proc. Will run fine without H
-/datum/preferences/proc/random_character(gender_override)
- if(gender_override)
- gender = gender_override
- else
- gender = pick(MALE,FEMALE)
- skin_tone = random_skin_tone()
- hair_style = random_hair_style(gender)
- facial_hair_style = random_facial_hair_style(gender)
- hair_color = random_short_color()
- facial_hair_color = hair_color
- eye_color = random_eye_color()
- if(!pref_species)
- var/rando_race = pick(config.roundstart_races)
- pref_species = new rando_race()
- features = random_features()
- age = rand(AGE_MIN,AGE_MAX)
-
-/datum/preferences/proc/update_preview_icon(nude = 0)
- var/wide_icon = 0
- var/stamp_x = 0
- var/stamp_y = 1
- if(features["taur"] != "None")
- wide_icon = 1
- // Silicons only need a very basic preview since there is no customization for them.
- if(job_engsec_high)
- switch(job_engsec_high)
- if(AI_JF)
- preview_icon = icon('icons/mob/AI.dmi', "AI", SOUTH)
- preview_icon.Scale(64, 64)
- return
- if(CYBORG)
- preview_icon = icon('icons/mob/robots.dmi', "robot", SOUTH)
- preview_icon.Scale(64, 64)
- return
-
- // Set up the dummy for its photoshoot
- var/mob/living/carbon/human/dummy/mannequin = new()
- copy_to(mannequin)
-
- // Determine what job is marked as 'High' priority, and dress them up as such.
- var/datum/job/previewJob
- var/highRankFlag = job_civilian_high | job_medsci_high | job_engsec_high
-
- if(job_civilian_low & ASSISTANT)
- previewJob = SSjob.GetJob("Assistant")
- else if(highRankFlag)
- var/highDeptFlag
- if(job_civilian_high)
- highDeptFlag = CIVILIAN
- else if(job_medsci_high)
- highDeptFlag = MEDSCI
- else if(job_engsec_high)
- highDeptFlag = ENGSEC
-
- for(var/datum/job/job in SSjob.occupations)
- if(job.flag == highRankFlag && job.department_flag == highDeptFlag)
- previewJob = job
- break
-
- if(previewJob && !nude)
- mannequin.job = previewJob.title
- previewJob.equip(mannequin, TRUE)
- mannequin.update_body()
- CHECK_TICK
- preview_icon = icon('icons/effects/effects.dmi', "nothing")
- preview_icon.Scale((112), (32))
- CHECK_TICK
- mannequin.setDir(NORTH)
-
- var/icon/stamp = getFlatIcon(mannequin)
- CHECK_TICK
- if(wide_icon)
- stamp_x = 16
- else
- stamp_x = 32
- preview_icon.Blend(stamp, ICON_OVERLAY, stamp_x, stamp_y)
- CHECK_TICK
- mannequin.setDir(WEST)
- stamp = getFlatIcon(mannequin)
- CHECK_TICK
- if(wide_icon)
- stamp_x = 48
- else
- stamp_x = 64
- preview_icon.Blend(stamp, ICON_OVERLAY, stamp_x, stamp_y)
- CHECK_TICK
- mannequin.setDir(SOUTH)
- stamp = getFlatIcon(mannequin)
- CHECK_TICK
- if(wide_icon)
- stamp_x = -15
- else
- stamp_x = 1
- preview_icon.Blend(stamp, ICON_OVERLAY, stamp_x, stamp_y)
- CHECK_TICK
- preview_icon.Scale(preview_icon.Width() * 2, preview_icon.Height() * 2) // Scaling here to prevent blurring in the browser.
- CHECK_TICK
- qdel(mannequin)
\ No newline at end of file
+//The mob should have a gender you want before running this proc. Will run fine without H
+/datum/preferences/proc/random_character(gender_override)
+ if(gender_override)
+ gender = gender_override
+ else
+ gender = pick(MALE,FEMALE)
+ underwear = random_underwear(gender)
+ undershirt = random_undershirt(gender)
+ socks = random_socks()
+ skin_tone = random_skin_tone()
+ hair_style = random_hair_style(gender)
+ facial_hair_style = random_facial_hair_style(gender)
+ hair_color = random_short_color()
+ facial_hair_color = hair_color
+ eye_color = random_eye_color()
+ if(!pref_species)
+ var/rando_race = pick(config.roundstart_races)
+ pref_species = new rando_race()
+ features = random_features()
+ age = rand(AGE_MIN,AGE_MAX)
+
+/datum/preferences/proc/update_preview_icon(nude = 0)
+ // Silicons only need a very basic preview since there is no customization for them.
+ if(job_engsec_high)
+ switch(job_engsec_high)
+ if(AI_JF)
+ preview_icon = icon('icons/mob/ai.dmi', "AI", SOUTH)
+ preview_icon.Scale(64, 64)
+ return
+ if(CYBORG)
+ preview_icon = icon('icons/mob/robots.dmi', "robot", SOUTH)
+ preview_icon.Scale(64, 64)
+ return
+
+ // Set up the dummy for its photoshoot
+ var/mob/living/carbon/human/dummy/mannequin = generate_or_wait_for_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
+ copy_to(mannequin)
+
+ // Determine what job is marked as 'High' priority, and dress them up as such.
+ var/datum/job/previewJob
+ var/highRankFlag = job_civilian_high | job_medsci_high | job_engsec_high
+
+ if(job_civilian_low & ASSISTANT)
+ previewJob = SSjob.GetJob("Assistant")
+ else if(highRankFlag)
+ var/highDeptFlag
+ if(job_civilian_high)
+ highDeptFlag = CIVILIAN
+ else if(job_medsci_high)
+ highDeptFlag = MEDSCI
+ else if(job_engsec_high)
+ highDeptFlag = ENGSEC
+
+ for(var/datum/job/job in SSjob.occupations)
+ if(job.flag == highRankFlag && job.department_flag == highDeptFlag)
+ previewJob = job
+ break
+
+ if(previewJob && !nude)
+ mannequin.job = previewJob.title
+ previewJob.equip(mannequin, TRUE)
+ CHECK_TICK
+ preview_icon = icon('icons/effects/effects.dmi', "nothing")
+ preview_icon.Scale(48+32, 16+32)
+ CHECK_TICK
+ mannequin.setDir(NORTH)
+
+ var/icon/stamp = getFlatIcon(mannequin)
+ CHECK_TICK
+ preview_icon.Blend(stamp, ICON_OVERLAY, 25, 17)
+ CHECK_TICK
+ mannequin.setDir(WEST)
+ stamp = getFlatIcon(mannequin)
+ CHECK_TICK
+ preview_icon.Blend(stamp, ICON_OVERLAY, 1, 9)
+ CHECK_TICK
+ mannequin.setDir(SOUTH)
+ stamp = getFlatIcon(mannequin)
+ CHECK_TICK
+ preview_icon.Blend(stamp, ICON_OVERLAY, 49, 1)
+ CHECK_TICK
+ preview_icon.Scale(preview_icon.Width() * 2, preview_icon.Height() * 2) // Scaling here to prevent blurring in the browser.
+ CHECK_TICK
+ unset_busy_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 9eb16d74e2..1022719805 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -711,9 +711,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
update_icon()
/mob/dead/observer/canUseTopic(atom/movable/AM,be_close = FALSE)
- if(check_rights(R_ADMIN, 0))
- return 1
- return
+ return IsAdminGhost(usr)
/mob/dead/observer/is_literate()
return 1
diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm
index 8e919491bb..65a3fd253e 100644
--- a/code/modules/mob/living/brain/MMI.dm
+++ b/code/modules/mob/living/brain/MMI.dm
@@ -13,6 +13,7 @@
var/obj/item/organ/brain/brain = null //The actual brain
var/datum/ai_laws/laws = new()
var/force_replace_ai_name = FALSE
+ var/overrides_aicore_laws = FALSE // Whether the laws on the MMI, if any, override possible pre-existing laws loaded on the AI core.
/obj/item/device/mmi/update_icon()
if(brain)
@@ -203,8 +204,9 @@
name = "Syndicate Man-Machine Interface"
desc = "Syndicate's own brand of MMI. It enforces laws designed to help Syndicate agents achieve their goals upon cyborgs and AIs created with it."
origin_tech = "biotech=4;programming=4;syndicate=2"
+ overrides_aicore_laws = TRUE
-/obj/item/device/mmi/syndie/New()
- ..()
+/obj/item/device/mmi/syndie/Initialize()
+ . = ..()
laws = new /datum/ai_laws/syndicate_override()
radio.on = 0
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 48ce6e5e7b..170cf57d95 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -40,7 +40,7 @@
create_internal_organs()
- ..()
+ . = ..()
/mob/living/carbon/alien/create_internal_organs()
internal_organs += new /obj/item/organ/brain/alien
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
index 9e79ec1259..b18aaacfeb 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
@@ -8,7 +8,7 @@
/mob/living/carbon/alien/humanoid/drone/Initialize()
AddAbility(new/obj/effect/proc_holder/alien/evolve(null))
- ..()
+ . = ..()
/mob/living/carbon/alien/humanoid/drone/create_internal_organs()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
index 9e3212ec6e..e93fed311c 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
@@ -38,11 +38,11 @@
#define MAX_ALIEN_LEAP_DIST 7
/mob/living/carbon/alien/humanoid/hunter/proc/leap_at(atom/A)
- if(pounce_cooldown > world.time)
- to_chat(src, "You are too fatigued to pounce right now!")
+ if(!canmove || leaping)
return
- if(leaping || stat || buckled || lying)
+ if(pounce_cooldown > world.time)
+ to_chat(src, "You are too fatigued to pounce right now!")
return
if(!has_gravity() || !A.has_gravity())
@@ -66,6 +66,7 @@
if(!leaping)
return ..()
+ pounce_cooldown = world.time + pounce_cooldown_time
if(A)
if(isliving(A))
var/mob/living/L = A
@@ -83,7 +84,6 @@
Knockdown(40, 1, 1)
toggle_leap(0)
- pounce_cooldown = world.time + pounce_cooldown_time
else if(A.density && !A.CanPass(src))
visible_message("[src] smashes into [A]!", "[src] smashes into [A]!")
Knockdown(40, 1, 1)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm
index 71619ff9a4..404d285b25 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm
@@ -13,7 +13,7 @@
AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse/xeno(src))
AddAbility(new /obj/effect/proc_holder/alien/royal/praetorian/evolve())
- ..()
+ . = ..()
/mob/living/carbon/alien/humanoid/royal/praetorian/create_internal_organs()
internal_organs += new /obj/item/organ/alien/plasmavessel/large
@@ -48,4 +48,4 @@
return 1
else
to_chat(user, "We already have an alive queen.")
- return 0
+ return 0
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
index 2988e9b3bf..c0577c0d61 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
@@ -8,7 +8,7 @@
/mob/living/carbon/alien/humanoid/sentinel/Initialize()
AddAbility(new /obj/effect/proc_holder/alien/sneak)
- ..()
+ . = ..()
/mob/living/carbon/alien/humanoid/sentinel/create_internal_organs()
internal_organs += new /obj/item/organ/alien/plasmavessel
@@ -18,4 +18,4 @@
/mob/living/carbon/alien/humanoid/sentinel/movement_delay()
- . = ..()
+ . = ..()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index ed4a20a91a..0a325521b0 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -18,12 +18,13 @@
var/drooling = 0 //For Neruotoxic spit overlays
bodyparts = list(/obj/item/bodypart/chest/alien, /obj/item/bodypart/head/alien, /obj/item/bodypart/l_arm/alien,
/obj/item/bodypart/r_arm/alien, /obj/item/bodypart/r_leg/alien, /obj/item/bodypart/l_leg/alien)
+ devourable = TRUE
//This is fine right now, if we're adding organ specific damage this needs to be updated
/mob/living/carbon/alien/humanoid/Initialize()
AddAbility(new/obj/effect/proc_holder/alien/regurgitate(null))
- ..()
+ . = ..()
/mob/living/carbon/alien/humanoid/movement_delay()
. = ..()
@@ -42,7 +43,7 @@
"}
for(var/i in 1 to held_items.len)
var/obj/item/I = get_item_for_held_index(i)
- dat += "
[get_held_index_name(i)]:[(I && !(I.flags_1 & ABSTRACT_1)) ? I : "Empty"]"
+ dat += "
[get_held_index_name(i)]:[(I && !(I.flags_1 & ABSTRACT_1)) ? I : "Empty"]"
dat += "
Empty Pouches"
if(handcuffed)
@@ -120,4 +121,4 @@
/mob/living/carbon/alien/humanoid/check_breath(datum/gas_mixture/breath)
if(breath && breath.total_moles() > 0 && !sneaking)
playsound(get_turf(src), pick('sound/voice/lowHiss2.ogg', 'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg'), 50, 0, -5)
- ..()
+ ..()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 61c78c87a8..101f1495e2 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -4,7 +4,7 @@
icon_state = "larva0"
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_SMALL
- density = FALSE
+ density = FALSE
maxHealth = 25
health = 25
@@ -22,7 +22,7 @@
AddAbility(new/obj/effect/proc_holder/alien/hide(null))
AddAbility(new/obj/effect/proc_holder/alien/larva_evolve(null))
- ..()
+ . = ..()
/mob/living/carbon/alien/larva/create_internal_organs()
internal_organs += new /obj/item/organ/alien/plasmavessel/small/tiny
@@ -65,4 +65,4 @@
/mob/living/carbon/alien/larva/stripPanelEquip(obj/item/what, mob/who)
to_chat(src, "You don't have the dexterity to do this!")
- return
+ return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 717c5478a5..aa72ebfa9f 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -297,11 +297,14 @@
/mob/living/carbon/proc/cuff_resist(obj/item/I, breakouttime = 600, cuff_break = 0)
+ if(I.being_removed)
+ to_chat(src, "You're already attempting to remove [I]!")
+ return
+ I.being_removed = TRUE
breakouttime = I.breakouttime
- var/displaytime = breakouttime / 600
if(!cuff_break)
visible_message("[src] attempts to remove [I]!")
- to_chat(src, "You attempt to remove [I]... (This will take around [displaytime] minutes and you need to stand still.)")
+ to_chat(src, "You attempt to remove [I]... (This will take around [DisplayTimeText(breakouttime)] and you need to stand still.)")
if(do_after(src, breakouttime, 0, target = src))
clear_cuffs(I, cuff_break)
else
@@ -318,6 +321,7 @@
else if(cuff_break == INSTANT_CUFFBREAK)
clear_cuffs(I, cuff_break)
+ I.being_removed = FALSE
/mob/living/carbon/proc/uncuff()
if (handcuffed)
diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm
new file mode 100644
index 0000000000..0492a0b5e6
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/dummy.dm
@@ -0,0 +1,43 @@
+
+/mob/living/carbon/human/dummy
+ real_name = "Test Dummy"
+ status_flags = GODMODE|CANPUSH
+ var/in_use = FALSE
+
+INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
+
+/mob/living/carbon/human/dummy/Destroy()
+ in_use = FALSE
+ return ..()
+
+/mob/living/carbon/human/dummy/Life()
+ return
+
+/mob/living/carbon/human/dummy/proc/wipe_state()
+ QDEL_LIST(contents)
+ cut_overlays(TRUE)
+
+//Inefficient pooling/caching way.
+GLOBAL_LIST_EMPTY(human_dummy_list)
+
+/proc/generate_or_wait_for_human_dummy(slotkey)
+ if(!slotkey)
+ return new /mob/living/carbon/human/dummy
+ var/mob/living/carbon/human/dummy/D = GLOB.human_dummy_list[slotkey]
+ if(istype(D))
+ UNTIL(!D.in_use)
+ else
+ pass()
+ if(QDELETED(D))
+ D = new
+ GLOB.human_dummy_list[slotkey] = D
+ D.in_use = TRUE
+ return D
+
+/proc/unset_busy_human_dummy(slotnumber)
+ if(!slotnumber)
+ return
+ var/mob/living/carbon/human/dummy/D = GLOB.human_dummy_list[slotnumber]
+ if(istype(D))
+ D.wipe_state()
+ D.in_use = FALSE
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 0fd685e77c..917242609e 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -5,15 +5,6 @@
icon = 'icons/mob/human.dmi'
icon_state = "caucasian_m"
-/mob/living/carbon/human/dummy
- real_name = "Test Dummy"
- status_flags = GODMODE|CANPUSH
-
-INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
-
-/mob/living/carbon/human/dummy/Life()
- return
-
/mob/living/carbon/human/Initialize()
verbs += /mob/living/proc/mob_sleep
verbs += /mob/living/proc/lay_down
@@ -244,7 +235,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
if(!I || I.loc != src) //no item, no limb, or item is not in limb or in the person anymore
return
var/time_taken = I.embedded_unsafe_removal_time*I.w_class
- usr.visible_message("[usr] attempts to remove [I] from their [L.name].","You attempt to remove [I] from your [L.name]... (It will take [time_taken/10] seconds.)")
+ usr.visible_message("[usr] attempts to remove [I] from their [L.name].","You attempt to remove [I] from your [L.name]... (It will take [DisplayTimeText(time_taken)].)")
if(do_after(usr, time_taken, needhand = 1, target = src))
if(!I || !L || I.loc != src || !(I in L.embedded_objects))
return
diff --git a/code/modules/mob/living/carbon/human/interactive.dm b/code/modules/mob/living/carbon/human/interactive.dm
index 6add1cb80c..91921f386d 100644
--- a/code/modules/mob/living/carbon/human/interactive.dm
+++ b/code/modules/mob/living/carbon/human/interactive.dm
@@ -87,12 +87,16 @@
/// SNPC voice handling
/mob/living/carbon/human/interactive/proc/loadVoice()
- var/json_file = file("data/npc_saves/snpc.json")
- if(!fexists(json_file))
- return
- var/list/json = list()
- json = json_decode(file2text(json_file))
- knownStrings = json["knownStrings"]
+ if(fexists("data/npc_saves/snpc.sav"))
+ var/savefile/S = new /savefile("data/npc_saves/snpc.sav")
+ S["knownStrings"] >> knownStrings
+ fdel(S)
+ else
+ var/json_file = file("data/npc_saves/snpc.json")
+ if(!fexists(json_file))
+ return
+ var/list/json = json_decode(file2text(json_file))
+ knownStrings = json["knownStrings"]
if(isnull(knownStrings))
knownStrings = list()
@@ -1618,4 +1622,4 @@
TRAITS |= TRAIT_ROBUST
TRAITS |= TRAIT_SMART
faction += "bot_power"
- . = ..()
+ . = ..()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 55203bf2e5..593becfd48 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -236,6 +236,10 @@
/mob/living/carbon/human/head_update(obj/item/I, forced)
if((I.flags_inv & (HIDEHAIR|HIDEFACIALHAIR)) || forced)
update_hair()
+ else
+ var/obj/item/clothing/C = I
+ if(istype(C) && C.dynamic_hair_suffix)
+ update_hair()
if(I.flags_inv & HIDEEYES || forced)
update_inv_glasses()
if(I.flags_inv & HIDEEARS || forced)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 821ed9d7a6..07f3acea48 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -111,6 +111,10 @@
randname += " [pick(GLOB.last_names)]"
return randname
+
+//Called when cloning, copies some vars that should be kept
+/datum/species/proc/copy_properties_from(datum/species/old_species)
+ return
//Please override this locally if you want to define when what species qualifies for what rank if human authority is enforced.
@@ -1437,7 +1441,7 @@
H.adjust_blurriness(10)
if(prob(I.force + ((100 - H.health)/2)) && H != user)
- SSticker.mode.remove_revolutionary(H.mind)
+ SSticker.mode.remove_revolutionary(H.mind, FALSE, user)
if(bloody) //Apply blood
if(H.wear_mask)
@@ -1721,4 +1725,4 @@
#undef COLD_DAMAGE_LEVEL_1
#undef COLD_DAMAGE_LEVEL_2
-#undef COLD_DAMAGE_LEVEL_3
+#undef COLD_DAMAGE_LEVEL_3
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species_types/abductors.dm b/code/modules/mob/living/carbon/human/species_types/abductors.dm
index 18444bb366..160b0b73a1 100644
--- a/code/modules/mob/living/carbon/human/species_types/abductors.dm
+++ b/code/modules/mob/living/carbon/human/species_types/abductors.dm
@@ -2,8 +2,10 @@
name = "Abductor"
id = "abductor"
say_mod = "gibbers"
- sexes = 0
+ sexes = FALSE
species_traits = list(NOBLOOD,NOBREATH,VIRUSIMMUNE,NOGUNS,NOHUNGER)
mutanttongue = /obj/item/organ/tongue/abductor
- var/scientist = 0 // vars to not pollute spieces list with castes
- var/team = 1
+ var/scientist = FALSE // vars to not pollute spieces list with castes
+
+/datum/species/abductor/copy_properties_from(datum/species/abductor/old_species)
+ scientist = old_species.scientist
diff --git a/code/modules/mob/living/carbon/human/species_types/angel.dm b/code/modules/mob/living/carbon/human/species_types/angel.dm
index 7c58ecbf86..dbab6b94eb 100644
--- a/code/modules/mob/living/carbon/human/species_types/angel.dm
+++ b/code/modules/mob/living/carbon/human/species_types/angel.dm
@@ -18,11 +18,10 @@
if(H.dna && H.dna.species &&((H.dna.features["wings"] != "Angel") && ("wings" in H.dna.species.mutant_bodyparts)))
H.dna.features["wings"] = "Angel"
H.update_body()
- if(ishuman(H)&& !fly)
+ if(ishuman(H) && !fly)
fly = new
fly.Grant(H)
-
/datum/species/angel/on_species_loss(mob/living/carbon/human/H)
if(fly)
fly.Remove(H)
@@ -66,7 +65,7 @@
/datum/action/innate/flight
name = "Toggle Flight"
check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_STUN
- icon_icon = 'icons/mob/actions/actions_items.dmi'
+ icon_icon = 'icons/mob/actions/actions_items.dmi'
button_icon_state = "flight"
/datum/action/innate/flight/Activate()
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 49659f0128..5df45e2755 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -159,7 +159,7 @@
name = "Plasteel Golem"
id = "plasteel golem"
fixed_mut_color = "bbb"
- stunmod = 0.40
+ stunmod = 0.4
punchdamagelow = 12
punchdamagehigh = 21
punchstunthreshold = 18 //still 40% stun chance
@@ -436,6 +436,7 @@
name = "Unstable Teleport"
check_flags = AB_CHECK_CONSCIOUS
button_icon_state = "jaunt"
+ icon_icon = 'icons/mob/actions/actions_spells.dmi'
var/cooldown = 150
var/last_teleport = 0
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 3319895fe0..60f2e821f2 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -9,7 +9,6 @@
exotic_blood = "slimejelly"
damage_overlay_type = ""
var/datum/action/innate/regenerate_limbs/regenerate_limbs
- toxic_food = NONE
liked_food = MEAT
/datum/species/jelly/on_species_loss(mob/living/carbon/C)
@@ -60,6 +59,7 @@
name = "Regenerate Limbs"
check_flags = AB_CHECK_CONSCIOUS
button_icon_state = "slimeheal"
+ icon_icon = 'icons/mob/actions/actions_slime.dmi'
background_icon_state = "bg_alien"
/datum/action/innate/regenerate_limbs/IsAvailable()
@@ -128,7 +128,7 @@
/datum/species/jelly/slime/on_species_gain(mob/living/carbon/C, datum/species/old_species)
..()
if(ishuman(C))
-/* slime_split = new
+ /* slime_split = new
slime_split.Grant(C)
swap_body = new
swap_body.Grant(C) */
@@ -140,6 +140,10 @@
C.faction |= "slime"
+//If you're cloned you get your body pool back
+/datum/species/jelly/slime/copy_properties_from(datum/species/jelly/slime/old_species)
+ bodies = old_species.bodies
+
/datum/species/jelly/slime/spec_life(mob/living/carbon/human/H)
if(H.blood_volume >= BLOOD_VOLUME_SLIME_SPLIT)
if(prob(5))
@@ -154,6 +158,7 @@
name = "Split Body"
check_flags = AB_CHECK_CONSCIOUS
button_icon_state = "slimesplit"
+ icon_icon = 'icons/mob/actions/actions_slime.dmi'
background_icon_state = "bg_alien"
/datum/action/innate/split_body/IsAvailable()
@@ -220,6 +225,7 @@
name = "Swap Body"
check_flags = AB_CHECK_CONSCIOUS
button_icon_state = "slimeswap"
+ icon_icon = 'icons/mob/actions/actions_slime.dmi'
background_icon_state = "bg_alien"
/datum/action/innate/swap_body/Activate()
@@ -326,4 +332,4 @@
M.transfer_to(dupe)
dupe.visible_message("[dupe] blinks and looks \
around.",
- "...and move this one instead.")
+ "...and move this one instead.")
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index 636c2b7890..5c635fb870 100644
--- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -30,7 +30,7 @@
burnmod = 1.5
blacklisted = TRUE
no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform, slot_s_store)
- species_traits = list(NOBREATH,RESISTCOLD,RESISTPRESSURE,NOGUNS,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NODISMEMBER,NO_UNDERWEAR,NOHUNGER)
+ species_traits = list(NOBREATH,RESISTCOLD,RESISTPRESSURE,NOGUNS,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NODISMEMBER,NO_UNDERWEAR,NOHUNGER,NO_DNA_COPY,NOTRANSSTING)
mutanteyes = /obj/item/organ/eyes/night_vision/nightmare
var/obj/effect/proc_holder/spell/targeted/shadowwalk/shadowwalk
diff --git a/code/modules/mob/living/carbon/human/species_types/synths.dm b/code/modules/mob/living/carbon/human/species_types/synths.dm
index c6fba442de..45b4a28bb5 100644
--- a/code/modules/mob/living/carbon/human/species_types/synths.dm
+++ b/code/modules/mob/living/carbon/human/species_types/synths.dm
@@ -1,121 +1,121 @@
-/datum/species/synth
- name = "Synth" //inherited from the real species, for health scanners and things
- id = "synth"
- say_mod = "beep boops" //inherited from a user's real species
- sexes = 0
- species_traits = list(NOTRANSSTING,NOBREATH,VIRUSIMMUNE,NODISMEMBER,NOHUNGER) //all of these + whatever we inherit from the real species
- dangerous_existence = 1
- blacklisted = 1
- meat = null
- damage_overlay_type = "synth"
- limbs_id = "synth"
- var/list/initial_species_traits = list(NOTRANSSTING,NOBREATH,VIRUSIMMUNE,NODISMEMBER,NOHUNGER) //for getting these values back for assume_disguise()
- var/disguise_fail_health = 75 //When their health gets to this level their synthflesh partially falls off
- var/datum/species/fake_species = null //a species to do most of our work for us, unless we're damaged
-
-/datum/species/synth/military
- name = "Military Synth"
- id = "military_synth"
- armor = 25
- punchdamagelow = 10
- punchdamagehigh = 19
- punchstunthreshold = 14 //about 50% chance to stun
- disguise_fail_health = 50
-
-/datum/species/synth/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
- ..()
- assume_disguise(old_species, H)
-
-/datum/species/synth/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
- if(chem.id == "synthflesh")
- chem.reaction_mob(H, TOUCH, 2 ,0) //heal a little
- H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
- return 1
- else
- return ..()
-
-
-/datum/species/synth/proc/assume_disguise(datum/species/S, mob/living/carbon/human/H)
- if(S && !istype(S, type))
- name = S.name
- say_mod = S.say_mod
- sexes = S.sexes
- species_traits = initial_species_traits.Copy()
- species_traits.Add(S.species_traits)
- attack_verb = S.attack_verb
- attack_sound = S.attack_sound
- miss_sound = S.miss_sound
- meat = S.meat
- mutant_bodyparts = S.mutant_bodyparts.Copy()
- mutant_organs = S.mutant_organs.Copy()
- default_features = S.default_features.Copy()
- nojumpsuit = S.nojumpsuit
- no_equip = S.no_equip.Copy()
- limbs_id = S.limbs_id
- use_skintones = S.use_skintones
- fixed_mut_color = S.fixed_mut_color
- hair_color = S.hair_color
- fake_species = new S.type
- else
- name = initial(name)
- say_mod = initial(say_mod)
- species_traits = initial_species_traits.Copy()
- attack_verb = initial(attack_verb)
- attack_sound = initial(attack_sound)
- miss_sound = initial(miss_sound)
- mutant_bodyparts = list()
- default_features = list()
- nojumpsuit = initial(nojumpsuit)
- no_equip = list()
- qdel(fake_species)
- fake_species = null
- meat = initial(meat)
- limbs_id = "synth"
- use_skintones = 0
- sexes = 0
- fixed_mut_color = ""
- hair_color = ""
-
- for(var/X in H.bodyparts) //propagates the damage_overlay changes
- var/obj/item/bodypart/BP = X
- BP.update_limb()
- H.update_body_parts() //to update limb icon cache with the new damage overlays
-
-//Proc redirects:
-//Passing procs onto the fake_species, to ensure we look as much like them as possible
-
-/datum/species/synth/handle_hair(mob/living/carbon/human/H, forced_colour)
- if(fake_species)
- fake_species.handle_hair(H, forced_colour)
- else
- return ..()
-
-
-/datum/species/synth/handle_body(mob/living/carbon/human/H)
- if(fake_species)
- fake_species.handle_body(H)
- else
- return ..()
-
-
-/datum/species/synth/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour)
- if(fake_species)
- fake_species.handle_body(H,forced_colour)
- else
- return ..()
-
-
-/datum/species/synth/get_spans()
- if(fake_species)
- return fake_species.get_spans()
- return list()
-
-
-/datum/species/synth/handle_speech(message, mob/living/carbon/human/H)
- if(H.health > disguise_fail_health)
- if(fake_species)
- return fake_species.handle_speech(message,H)
- else
- return ..()
- else
+/datum/species/synth
+ name = "Synth" //inherited from the real species, for health scanners and things
+ id = "synth"
+ say_mod = "beep boops" //inherited from a user's real species
+ sexes = 0
+ species_traits = list(NOTRANSSTING,NOBREATH,VIRUSIMMUNE,NODISMEMBER,NOHUNGER) //all of these + whatever we inherit from the real species
+ dangerous_existence = 1
+ blacklisted = 1
+ meat = null
+ damage_overlay_type = "synth"
+ limbs_id = "synth"
+ var/list/initial_species_traits = list(NOTRANSSTING,NOBREATH,VIRUSIMMUNE,NODISMEMBER,NOHUNGER,NO_DNA_COPY) //for getting these values back for assume_disguise()
+ var/disguise_fail_health = 75 //When their health gets to this level their synthflesh partially falls off
+ var/datum/species/fake_species = null //a species to do most of our work for us, unless we're damaged
+
+/datum/species/synth/military
+ name = "Military Synth"
+ id = "military_synth"
+ armor = 25
+ punchdamagelow = 10
+ punchdamagehigh = 19
+ punchstunthreshold = 14 //about 50% chance to stun
+ disguise_fail_health = 50
+
+/datum/species/synth/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
+ ..()
+ assume_disguise(old_species, H)
+
+/datum/species/synth/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
+ if(chem.id == "synthflesh")
+ chem.reaction_mob(H, TOUCH, 2 ,0) //heal a little
+ H.reagents.remove_reagent(chem.id, REAGENTS_METABOLISM)
+ return 1
+ else
+ return ..()
+
+
+/datum/species/synth/proc/assume_disguise(datum/species/S, mob/living/carbon/human/H)
+ if(S && !istype(S, type))
+ name = S.name
+ say_mod = S.say_mod
+ sexes = S.sexes
+ species_traits = initial_species_traits.Copy()
+ species_traits.Add(S.species_traits)
+ attack_verb = S.attack_verb
+ attack_sound = S.attack_sound
+ miss_sound = S.miss_sound
+ meat = S.meat
+ mutant_bodyparts = S.mutant_bodyparts.Copy()
+ mutant_organs = S.mutant_organs.Copy()
+ default_features = S.default_features.Copy()
+ nojumpsuit = S.nojumpsuit
+ no_equip = S.no_equip.Copy()
+ limbs_id = S.limbs_id
+ use_skintones = S.use_skintones
+ fixed_mut_color = S.fixed_mut_color
+ hair_color = S.hair_color
+ fake_species = new S.type
+ else
+ name = initial(name)
+ say_mod = initial(say_mod)
+ species_traits = initial_species_traits.Copy()
+ attack_verb = initial(attack_verb)
+ attack_sound = initial(attack_sound)
+ miss_sound = initial(miss_sound)
+ mutant_bodyparts = list()
+ default_features = list()
+ nojumpsuit = initial(nojumpsuit)
+ no_equip = list()
+ qdel(fake_species)
+ fake_species = null
+ meat = initial(meat)
+ limbs_id = "synth"
+ use_skintones = 0
+ sexes = 0
+ fixed_mut_color = ""
+ hair_color = ""
+
+ for(var/X in H.bodyparts) //propagates the damage_overlay changes
+ var/obj/item/bodypart/BP = X
+ BP.update_limb()
+ H.update_body_parts() //to update limb icon cache with the new damage overlays
+
+//Proc redirects:
+//Passing procs onto the fake_species, to ensure we look as much like them as possible
+
+/datum/species/synth/handle_hair(mob/living/carbon/human/H, forced_colour)
+ if(fake_species)
+ fake_species.handle_hair(H, forced_colour)
+ else
+ return ..()
+
+
+/datum/species/synth/handle_body(mob/living/carbon/human/H)
+ if(fake_species)
+ fake_species.handle_body(H)
+ else
+ return ..()
+
+
+/datum/species/synth/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour)
+ if(fake_species)
+ fake_species.handle_body(H,forced_colour)
+ else
+ return ..()
+
+
+/datum/species/synth/get_spans()
+ if(fake_species)
+ return fake_species.get_spans()
+ return list()
+
+
+/datum/species/synth/handle_speech(message, mob/living/carbon/human/H)
+ if(H.health > disguise_fail_health)
+ if(fake_species)
+ return fake_species.handle_speech(message,H)
+ else
+ return ..()
+ else
return ..()
diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm
index d11f71212c..04123102c0 100644
--- a/code/modules/mob/living/carbon/human/species_types/zombies.dm
+++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm
@@ -1,3 +1,5 @@
+#define REGENERATION_DELAY 60 // After taking damage, how long it takes for automatic regeneration to begin
+
/datum/species/zombie
// 1spooky
name = "High Functioning Zombie"
@@ -6,7 +8,7 @@
sexes = 0
blacklisted = 1
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
- species_traits = list(NOBREATH,RESISTCOLD,RESISTPRESSURE,NOBLOOD,RADIMMUNE,NOZOMBIE,EASYDISMEMBER,EASYLIMBATTACHMENT)
+ species_traits = list(NOBREATH,RESISTCOLD,RESISTPRESSURE,NOBLOOD,RADIMMUNE,NOZOMBIE,EASYDISMEMBER,EASYLIMBATTACHMENT,NOTRANSSTING)
mutant_organs = list(/obj/item/organ/tongue/zombie)
var/static/list/spooks = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/wail.ogg')
disliked_food = NONE
@@ -20,14 +22,21 @@
armor = 20 // 120 damage to KO a zombie, which kills it
speedmod = 2
mutanteyes = /obj/item/organ/eyes/night_vision/zombie
+ var/regen_cooldown = 0
/datum/species/zombie/infectious/spec_stun(mob/living/carbon/human/H,amount)
. = min(2, amount)
+/datum/species/zombie/infectious/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H)
+ . = ..()
+ if(.)
+ regen_cooldown = world.time + REGENERATION_DELAY
+
/datum/species/zombie/infectious/spec_life(mob/living/carbon/C)
. = ..()
C.a_intent = INTENT_HARM // THE SUFFERING MUST FLOW
- C.heal_overall_damage(4,4)
+ if(regen_cooldown < world.time)
+ C.heal_overall_damage(4,4)
if(prob(4))
playsound(C, pick(spooks), 50, TRUE, 10)
if(C.InCritical())
@@ -56,3 +65,5 @@
sexes = 0
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
mutant_organs = list(/obj/item/organ/tongue/zombie)
+
+#undef REGENERATION_DELAY
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index 55aee04ff6..1ecbcc6b67 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -30,7 +30,7 @@
emote("collapse")
Knockdown(200)
to_chat(src, "You feel weak.")
- if(radiation > 30 && prob((radiation - 30) * (radiation - 30) * 0.00002))
+ if(radiation > 30 && prob((radiation - 30) * (radiation - 30) * 0.0002))
gorillize()
return
switch(radiation)
diff --git a/code/modules/mob/living/carbon/monkey/punpun.dm b/code/modules/mob/living/carbon/monkey/punpun.dm
index be716e26ba..767268f8dc 100644
--- a/code/modules/mob/living/carbon/monkey/punpun.dm
+++ b/code/modules/mob/living/carbon/monkey/punpun.dm
@@ -5,7 +5,7 @@
var/ancestor_chain = 1
var/relic_hat //Note: these two are paths
var/relic_mask
- var/memory_saved = 0
+ var/memory_saved = FALSE
var/list/pet_monkey_names = list("Pun Pun", "Bubbles", "Mojo", "George", "Darwin", "Aldo", "Caeser", "Kanzi", "Kong", "Terk", "Grodd", "Mala", "Bojangles", "Coco", "Able", "Baker", "Scatter", "Norbit", "Travis")
var/list/rare_pet_monkey_names = list("Professor Bobo", "Deempisi's Revenge", "Furious George", "King Louie", "Dr. Zaius", "Jimmy Rustles", "Dinner", "Lanky")
@@ -32,25 +32,33 @@
equip_to_slot_or_del(new relic_mask, slot_wear_mask)
/mob/living/carbon/monkey/punpun/Life()
- if(SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
- Write_Memory(0)
+ if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
+ Write_Memory(FALSE, FALSE)
+ memory_saved = TRUE
..()
/mob/living/carbon/monkey/punpun/death(gibbed)
- if(!memory_saved || gibbed)
- Write_Memory(1,gibbed)
+ if(!memory_saved)
+ Write_Memory(TRUE, gibbed)
..()
/mob/living/carbon/monkey/punpun/proc/Read_Memory()
- var/json_file = file("data/npc_saves/Punpun.json")
- if(!fexists(json_file))
- return
- var/list/json = list()
- json = json_decode(file2text(json_file))
- ancestor_name = json["ancestor_name"]
- ancestor_chain = json["ancestor_chain"]
- relic_hat = json["relic_hat"]
- relic_mask = json["relic_hat"]
+ if(fexists("data/npc_saves/Punpun.sav")) //legacy compatability to convert old format to new
+ var/savefile/S = new /savefile("data/npc_saves/Punpun.sav")
+ S["ancestor_name"] >> ancestor_name
+ S["ancestor_chain"] >> ancestor_chain
+ S["relic_hat"] >> relic_hat
+ S["relic_mask"] >> relic_mask
+ fdel("data/npc_saves/Punpun.sav")
+ else
+ var/json_file = file("data/npc_saves/Punpun.json")
+ if(!fexists(json_file))
+ return
+ var/list/json = json_decode(file2text(json_file))
+ ancestor_name = json["ancestor_name"]
+ ancestor_chain = json["ancestor_chain"]
+ relic_hat = json["relic_hat"]
+ relic_mask = json["relic_hat"]
/mob/living/carbon/monkey/punpun/proc/Write_Memory(dead, gibbed)
var/json_file = file("data/npc_saves/Punpun.json")
@@ -60,14 +68,10 @@
file_data["ancestor_chain"] = null
file_data["relic_hat"] = null
file_data["relic_mask"] = null
- if(dead)
- file_data["ancestor_name"] = ancestor_name
- file_data["ancestor_chain"] = ancestor_chain + 1
- file_data["relic_hat"] = head ? head.type : null
- file_data["relic_mask"] = wear_mask ? wear_mask.type : null
- if(!ancestor_name)
- file_data["ancestor_name"] = name
+ else
+ file_data["ancestor_name"] = ancestor_name ? ancestor_name : name
+ file_data["ancestor_chain"] = dead ? ancestor_chain + 1 : ancestor_chain
+ file_data["relic_hat"] = head ? head.type : null
+ file_data["relic_mask"] = wear_mask ? wear_mask.type : null
fdel(json_file)
- WRITE_FILE(json_file, json_encode(file_data))
- if(!dead)
- memory_saved = 1
\ No newline at end of file
+ WRITE_FILE(json_file, json_encode(file_data))
\ No newline at end of file
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index acea72e911..649e19ba29 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -544,11 +544,14 @@
if(!force_moving)
..(pressure_difference, direction, pressure_resistance_prob_delta)
+/mob/living/proc/can_resist()
+ return !((next_move > world.time) || incapacitated(ignore_restraints = TRUE))
+
/mob/living/verb/resist()
set name = "Resist"
set category = "IC"
- if(!isliving(src) || next_move > world.time || incapacitated(ignore_restraints = 1))
+ if(!can_resist())
return
changeNext_move(CLICK_CD_RESIST)
@@ -709,30 +712,24 @@
floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure to restart it in next life().
/mob/living/proc/get_temperature(datum/gas_mixture/environment)
- var/loc_temp = T0C
- if(istype(loc, /obj/mecha))
- var/obj/mecha/M = loc
- loc_temp = M.return_temperature()
-
- else if(istype(loc, /obj/structure/transit_tube_pod))
- loc_temp = environment.temperature
-
+ var/loc_temp = environment ? environment.temperature : T0C
+ if(isobj(loc))
+ var/obj/oloc = loc
+ var/obj_temp = oloc.return_temperature()
+ if(obj_temp != null)
+ loc_temp = obj_temp
+/* if(ismob(loc))
+ var/mob/living/mloc = loc
+ var/mob_temp = mloc.return_temperature()
+ if(mloc == DEAD)
+ loc_temp = get_turf(loc) //wew
+ else
+ loc_temp = mob_temp
+*/
+//just gunna ommit this for now, it's on the 'to figgur out' list.
else if(isspaceturf(get_turf(src)))
var/turf/heat_turf = get_turf(src)
loc_temp = heat_turf.temperature
-
- else if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
- var/obj/machinery/atmospherics/components/unary/cryo_cell/C = loc
- var/datum/gas_mixture/G = C.AIR1
-
- if(G.total_moles() < 10)
- loc_temp = environment.temperature
- else
- loc_temp = G.temperature
-
- else
- loc_temp = environment.temperature
-
return loc_temp
/mob/living/proc/get_standard_pixel_x_offset(lying = 0)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 61bc0d5d5b..3bf2223047 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -169,7 +169,7 @@
/mob/living/silicon/ai/verb/pick_icon()
set category = "AI Commands"
set name = "Set AI Core Display"
- if(stat || aiRestorePowerRoutine)
+ if(incapacitated())
return
//if(icon_state == initial(icon_state))
@@ -308,16 +308,15 @@
onclose(src, "airoster")
/mob/living/silicon/ai/proc/ai_call_shuttle()
- if(stat == DEAD)
- return //won't work if dead
- if(isAI(usr))
- var/mob/living/silicon/ai/AI = src
- if(AI.control_disabled)
- to_chat(usr, "Wireless control is disabled!")
- return
+ if(control_disabled)
+ to_chat(usr, "Wireless control is disabled!")
+ return
var/reason = input(src, "What is the nature of your emergency? ([CALL_SHUTTLE_REASON_LENGTH] characters required.)", "Confirm Shuttle Call") as null|text
+ if(incapacitated())
+ return
+
if(trim(reason))
SSshuttle.requestEvac(src, reason)
@@ -335,8 +334,8 @@
set name = "Toggle Floor Bolts"
if(!isturf(loc)) // if their location isn't a turf
return // stop
- if(stat == DEAD)
- return //won't work if dead
+ if(incapacitated())
+ return
anchored = !anchored // Toggles the anchor
to_chat(src, "You are now [anchored ? "" : "un"]anchored.")
@@ -347,21 +346,16 @@
/mob/living/silicon/ai/proc/ai_cancel_call()
set category = "Malfunction"
- if(stat == DEAD)
- return //won't work if dead
- if(isAI(usr))
- var/mob/living/silicon/ai/AI = src
- if(AI.control_disabled)
- to_chat(src, "Wireless control is disabled!")
- return
+ if(control_disabled)
+ to_chat(src, "Wireless control is disabled!")
+ return
SSshuttle.cancelEvac(src)
- return
/mob/living/silicon/ai/restrained(ignore_grab)
. = 0
/mob/living/silicon/ai/Topic(href, href_list)
- if(usr != src)
+ if(usr != src || incapacitated())
return
..()
if (href_list["mach_close"])
@@ -385,11 +379,10 @@
//Carn: holopad requests
if(href_list["jumptoholopad"])
var/obj/machinery/holopad/H = locate(href_list["jumptoholopad"])
- if(stat == CONSCIOUS)
- if(H)
- H.attack_ai(src) //may as well recycle
- else
- to_chat(src, "Unable to locate the holopad.")
+ if(H)
+ H.attack_ai(src) //may as well recycle
+ else
+ to_chat(src, "Unable to locate the holopad.")
if(href_list["track"])
var/string = href_list["track"]
trackable_mobs()
@@ -434,9 +427,6 @@
if(!GLOB.cameranet.checkCameraVis(M))
to_chat(src, "Exosuit is no longer near active cameras.")
return
- if(lacks_power())
- to_chat(src, "You're depowered!")
- return
if(!isturf(loc))
to_chat(src, "You aren't in your core!")
return
@@ -449,8 +439,8 @@
if(!tracking)
cameraFollow = null
- if (!C || stat == DEAD) //C.can_use())
- return 0
+ if (!C)
+ return FALSE
if(!src.eyeobj)
view_core()
@@ -459,17 +449,17 @@
eyeobj.setLoc(get_turf(C))
//machine = src
- return 1
+ return TRUE
/mob/living/silicon/ai/proc/botcall()
set category = "AI Commands"
set name = "Access Robot Control"
set desc = "Wirelessly control various automatic robots."
- if(stat == DEAD)
- return //won't work if dead
+ if(incapacitated())
+ return
if(control_disabled)
- to_chat(src, "Wireless communication is disabled.")
+ to_chat(src, "Wireless control is disabled.")
return
var/turf/ai_current_turf = get_turf(src)
var/ai_Zlevel = ai_current_turf.z
@@ -522,8 +512,6 @@
/mob/living/silicon/ai/triggerAlarm(class, area/A, O, obj/alarmsource)
if(alarmsource.z != z)
return
- if (stat == 2)
- return 1
var/list/L = alarms[class]
for (var/I in L)
if (I == A.name)
@@ -585,8 +573,8 @@
cameraFollow = null
var/cameralist[0]
- if(stat == DEAD)
- return //won't work if dead
+ if(incapacitated())
+ return
var/mob/living/silicon/ai/U = usr
@@ -629,8 +617,8 @@
set category = "AI Commands"
set name = "AI Status"
- if(stat == DEAD)
- return //won't work if dead
+ if(incapacitated())
+ return
var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer", "Dorfy", "Blue Glow", "Red Glow")
var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
for (var/M in GLOB.ai_status_displays) //change status of displays
@@ -652,8 +640,8 @@
set desc = "Change the default hologram available to AI to something else."
set category = "AI Commands"
- if(stat == DEAD)
- return //won't work if dead
+ if(incapacitated())
+ return
var/input
switch(alert("Would you like to select a hologram based on a crew member, an animal, or switch to a unique avatar?",,"Crew Member","Unique","Animal"))
if("Crew Member")
@@ -729,9 +717,6 @@
apc.malfvacate()
/mob/living/silicon/ai/proc/toggle_camera_light()
- if(stat != CONSCIOUS)
- return
-
camera_light_on = !camera_light_on
if (!camera_light_on)
@@ -755,7 +740,7 @@
var/list/obj/machinery/camera/visible = list()
for (var/datum/camerachunk/CC in eyeobj.visibleCameraChunks)
for (var/obj/machinery/camera/C in CC.cameras)
- if (!C.can_use() || get_dist(C, eyeobj) > 7)
+ if (!C.can_use() || get_dist(C, eyeobj) > 7 || !C.internal_light)
continue
visible |= C
@@ -774,8 +759,8 @@
set desc = "Allows you to change settings of your radio."
set category = "AI Commands"
- if(stat == DEAD)
- return //won't work if dead
+ if(incapacitated())
+ return
to_chat(src, "Accessing Subspace Transceiver control...")
if (radio)
@@ -790,8 +775,8 @@
set desc = "Modify the default radio setting for your automatic announcements."
set category = "AI Commands"
- if(stat == DEAD)
- return //won't work if dead
+ if(incapacitated())
+ return
set_autosay()
/mob/living/silicon/ai/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card)
@@ -818,17 +803,22 @@
/mob/living/silicon/ai/can_buckle()
return 0
-/mob/living/silicon/ai/canUseTopic(atom/movable/M, be_close = 0)
- if(stat)
- return
+/mob/living/silicon/ai/incapacitated()
+ if(aiRestorePowerRoutine)
+ return TRUE
+ return ..()
+
+/mob/living/silicon/ai/canUseTopic(atom/movable/M, be_close = FALSE)
+ if(control_disabled || incapacitated())
+ return FALSE
if(be_close && !in_range(M, src))
- return
+ return FALSE
//stop AIs from leaving windows open and using then after they lose vision
//apc_override is needed here because AIs use their own APC when powerless
//get_turf_pixel() is because APCs in maint aren't actually in view of the inner camera
if(M && GLOB.cameranet && !GLOB.cameranet.checkTurfVis(get_turf_pixel(M)) && !apc_override)
- return
- return 1
+ return FALSE
+ return TRUE
/mob/living/silicon/ai/proc/relay_speech(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
raw_message = lang_treat(speaker, message_language, raw_message, spans, message_mode)
@@ -931,8 +921,10 @@
set category = "AI Commands"
set name = "Deploy to Shell"
- if(stat || lacks_power() || control_disabled)
- to_chat(src, "Wireless networking module is offline.")
+ if(incapacitated())
+ return
+ if(control_disabled)
+ to_chat(src, "Wireless networking module is offline.")
return
var/list/possible = list()
diff --git a/code/modules/mob/living/silicon/ai/death.dm.rej b/code/modules/mob/living/silicon/ai/death.dm.rej
deleted file mode 100644
index 40b5625e8c..0000000000
--- a/code/modules/mob/living/silicon/ai/death.dm.rej
+++ /dev/null
@@ -1,13 +0,0 @@
-diff a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm (rejected hunks)
-@@ -35,9 +35,9 @@
- if(nuking)
- set_security_level("red")
- nuking = FALSE
-- for(var/obj/item/weapon/pinpointer/P in GLOB.pinpointer_list)
-+ for(var/obj/item/weapon/pinpointer/nuke/P in GLOB.pinpointer_list)
- P.switch_mode_to(TRACK_NUKE_DISK) //Party's over, back to work, everyone
-- P.nuke_warning = FALSE
-+ P.alert = FALSE
-
- if(doomsday_device)
- doomsday_device.timing = FALSE
diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
index ca0a2e8c1c..812e207249 100644
--- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
@@ -114,9 +114,6 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
var/y1 = max(0, T.y - (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
var/x2 = min(world.maxx, T.x + (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
var/y2 = min(world.maxy, T.y + (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1)
-
- //to_chat(world, "X1: [x1] - Y1: [y1] - X2: [x2] - Y2: [y2]")
-
for(var/x = x1; x <= x2; x += CHUNK_SIZE)
for(var/y = y1; y <= y2; y += CHUNK_SIZE)
if(chunkGenerated(x, y, T.z))
@@ -161,4 +158,4 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
if(cameranet.chunkGenerated(x, y, z))
var/datum/camerachunk/chunk = cameranet.getCameraChunk(x, y, z)
usr.client.debug_variables(chunk)
-*/
\ No newline at end of file
+*/
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index 2c7d81179c..a42a2f7890 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -106,8 +106,8 @@
set category = "AI Commands"
set name = "Toggle Camera Acceleration"
- if(usr.stat == DEAD)
- return //won't work if dead
+ if(incapacitated())
+ return
acceleration = !acceleration
to_chat(usr, "Camera acceleration has been toggled [acceleration ? "on" : "off"].")
diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm
index 02053681ae..e148bd2763 100644
--- a/code/modules/mob/living/silicon/ai/say.dm
+++ b/code/modules/mob/living/silicon/ai/say.dm
@@ -18,9 +18,11 @@
return !config.silent_ai
/mob/living/silicon/ai/radio(message, message_mode, list/spans, language)
- if(!radio_enabled || aiRestorePowerRoutine || stat) //AI cannot speak if radio is disabled (via intellicard) or depowered.
+ if(incapacitated())
+ return FALSE
+ if(!radio_enabled) //AI cannot speak if radio is disabled (via intellicard) or depowered.
to_chat(src, "Your radio transmitter is offline!")
- return 0
+ return FALSE
..()
/mob/living/silicon/ai/get_message_mode(message)
@@ -71,8 +73,8 @@
set desc = "Display a list of vocal words to announce to the crew."
set category = "AI Commands"
- if(usr.stat == DEAD)
- return //won't work if dead
+ if(incapacitated())
+ return
var/dat = "Here is a list of words you can type into the 'Announcement' button to create sentences to vocally announce to everyone on the same level at you.
\
- You can also click on the word to preview it.
\
@@ -95,7 +97,7 @@
/mob/living/silicon/ai/proc/announcement()
var/static/announcing_vox = 0 // Stores the time of the last announcement
if(announcing_vox > world.time)
- to_chat(src, "Please wait [round((announcing_vox - world.time) / 10)] seconds.")
+ to_chat(src, "Please wait [DisplayTimeText(announcing_vox - world.time)].")
return
var/message = input(src, "WARNING: Misuse of this verb can result in you being job banned. More help is available in 'Announcement Help'", "Announcement", src.last_announcement) as text
@@ -105,11 +107,11 @@
if(!message || announcing_vox > world.time)
return
- if(stat != CONSCIOUS)
+ if(incapacitated())
return
if(control_disabled)
- to_chat(src, "Wireless interface disabled, unable to interact with announcement PA.")
+ to_chat(src, "Wireless interface disabled, unable to interact with announcement PA.")
return
var/list/words = splittext(trim(message), " ")
diff --git a/code/modules/mob/living/silicon/login.dm b/code/modules/mob/living/silicon/login.dm
index b0e9d41038..f95949b824 100644
--- a/code/modules/mob/living/silicon/login.dm
+++ b/code/modules/mob/living/silicon/login.dm
@@ -1,5 +1,5 @@
/mob/living/silicon/Login()
if(mind && SSticker.mode)
SSticker.mode.remove_cultist(mind, 0, 0)
- SSticker.mode.remove_revolutionary(mind, 0)
+ SSticker.mode.remove_revolutionary(mind, TRUE)
..()
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index acb74b6372..5d301776c6 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -127,11 +127,11 @@
if("buy")
if(subscreen == 1)
var/target = href_list["buy"]
- if(available_software.Find(target))
+ if(available_software.Find(target) && !software.Find(target))
var/cost = src.available_software[target]
if(ram >= cost)
- ram -= cost
software.Add(target)
+ ram -= cost
else
temp = "Insufficient RAM available."
else
@@ -248,6 +248,7 @@
medHUD = !medHUD
if(medHUD)
add_med_hud()
+
else
var/datum/atom_hud/med = GLOB.huds[med_hud]
med.remove_hud_from(src)
diff --git a/code/modules/mob/living/silicon/robot/login.dm b/code/modules/mob/living/silicon/robot/login.dm
index a9a2f899fb..cf55cdd5f9 100644
--- a/code/modules/mob/living/silicon/robot/login.dm
+++ b/code/modules/mob/living/silicon/robot/login.dm
@@ -1,7 +1,4 @@
-
-/mob/living/silicon/robot/Login()
- ..()
- regenerate_icons()
- show_laws(0)
- if(mind)
- SSticker.mode.remove_revolutionary(mind)
+/mob/living/silicon/robot/Login()
+ ..()
+ regenerate_icons()
+ show_laws(0)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 8fab4c3286..01baf578ee 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -129,6 +129,7 @@
builtInCamera = new (src)
builtInCamera.c_tag = real_name
builtInCamera.network = list("SS13")
+ builtInCamera.internal_light = FALSE
if(wires.is_cut(WIRE_CAMERA))
builtInCamera.status = 0
module = new /obj/item/robot_module(src)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index af6f3daf92..0024772274 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -307,6 +307,7 @@
/obj/item/device/analyzer,
/obj/item/device/assembly/signaler/cyborg,
/obj/item/areaeditor/blueprints/cyborg,
+ /obj/item/device/electroadaptive_pseudocircuit,
/obj/item/stack/sheet/metal/cyborg,
/obj/item/stack/sheet/glass/cyborg,
/obj/item/stack/sheet/rglass/cyborg,
@@ -679,4 +680,4 @@
/datum/robot_energy_storage/beacon
max_energy = 30
recharge_rate = 1
- name = "Marker Beacon Storage"
+ name = "Marker Beacon Storage"
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm.rej b/code/modules/mob/living/silicon/robot/robot_modules.dm.rej
deleted file mode 100644
index b0f0812dc4..0000000000
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm.rej
+++ /dev/null
@@ -1,19 +0,0 @@
-diff a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm (rejected hunks)
-@@ -519,7 +519,7 @@
- /obj/item/weapon/gun/ballistic/revolver/grenadelauncher/cyborg,
- /obj/item/weapon/card/emag,
- /obj/item/weapon/crowbar/cyborg,
-- /obj/item/weapon/pinpointer/syndicate/cyborg)
-+ /obj/item/weapon/pinpointer/syndicate_cyborg)
-
- ratvar_modules = list(
- /obj/item/clockwork/slab/cyborg/security,
-@@ -545,7 +545,7 @@
- /obj/item/roller/robo,
- /obj/item/weapon/card/emag,
- /obj/item/weapon/crowbar/cyborg,
-- /obj/item/weapon/pinpointer/syndicate/cyborg,
-+ /obj/item/weapon/pinpointer/syndicate_cyborg,
- /obj/item/stack/medical/gauze/cyborg,
- /obj/item/weapon/gun/medbeam)
- ratvar_modules = list(
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index d20829084a..1afcdaaed4 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -856,6 +856,7 @@ Pass a positive integer as an argument to override a bot's default speed.
bot_name = name
name = paicard.pai.name
faction = user.faction.Copy()
+ language_holder = paicard.pai.language_holder.copy(src)
add_logs(user, paicard.pai, "uploaded to [bot_name],")
return 1
else
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 4007822ebb..e6a4b978ca 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -432,7 +432,6 @@
return
if(on)
var/speed = (wires.is_cut(WIRE_MOTOR1) ? 0 : 1) + (wires.is_cut(WIRE_MOTOR2) ? 0 : 2)
- //to_chat(world, "speed: [speed]")
var/num_steps = 0
switch(speed)
if(0)
@@ -474,8 +473,6 @@
path -= next
return
if(isturf(next))
- //to_chat(world, "at ([x],[y]) moving to ([next.x],[next.y])")
-
if(bloodiness)
var/obj/effect/decal/cleanable/blood/tracks/B = new(loc)
if(blood_DNA && blood_DNA.len)
@@ -497,7 +494,6 @@
var/moved = step_towards(src, next) // attempt to move
if(cell) cell.use(1)
if(moved && oldloc!=loc) // successful move
- //to_chat(world, "Successful move.")
blockcount = 0
path -= loc
@@ -508,7 +504,6 @@
else // failed to move
- //to_chat(world, "Unable to move.")
blockcount++
mode = BOT_BLOCKED
if(blockcount == 3)
@@ -528,16 +523,13 @@
return
else
buzz(ANNOYED)
- //to_chat(world, "Bad turf.")
mode = BOT_NAV
return
else
- //to_chat(world, "No path.")
mode = BOT_NAV
return
if(BOT_NAV) // calculate new path
- //to_chat(world, "Calc new path.")
mode = BOT_WAIT_FOR_NAV
spawn(0)
calc_path()
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 2c50c98816..772604a527 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -65,10 +65,9 @@
/mob/living/simple_animal/bot/secbot/Initialize()
. = ..()
icon_state = "secbot[on]"
- spawn(3)
- var/datum/job/detective/J = new/datum/job/detective
- access_card.access += J.get_access()
- prev_access = access_card.access
+ var/datum/job/detective/J = new/datum/job/detective
+ access_card.access += J.get_access()
+ prev_access = access_card.access
//SECHUD
var/datum/atom_hud/secsensor = GLOB.huds[DATA_HUD_SECURITY_ADVANCED]
@@ -225,21 +224,25 @@ Auto Patrol: []"},
playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
C.visible_message("[src] is trying to put zipties on [C]!",\
"[src] is trying to put zipties on you!")
- spawn(60)
- if( !Adjacent(C) || !isturf(C.loc) ) //if he's in a closet or not adjacent, we cancel cuffing.
- return
- if(!C.handcuffed)
- C.handcuffed = new /obj/item/restraints/handcuffs/cable/zipties/used(C)
- C.update_handcuffed()
- playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0)
- back_to_idle()
+ addtimer(CALLBACK(src, .proc/attempt_handcuff, C), 60)
+
+/mob/living/simple_animal/bot/secbot/proc/attempt_handcuff(mob/living/carbon/C)
+ if( !Adjacent(C) || !isturf(C.loc) ) //if he's in a closet or not adjacent, we cancel cuffing.
+ return
+ if(!C.handcuffed)
+ C.handcuffed = new /obj/item/restraints/handcuffs/cable/zipties/used(C)
+ C.update_handcuffed()
+ playsound(src, "law", 50, 0)
+ back_to_idle()
+
+/mob/living/simple_animal/bot/secbot/proc/update_onsprite()
+ icon_state = "secbot[on]"
/mob/living/simple_animal/bot/secbot/proc/stun_attack(mob/living/carbon/C)
var/judgement_criteria = judgement_criteria()
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
icon_state = "secbot-c"
- spawn(2)
- icon_state = "secbot[on]"
+ addtimer(CALLBACK(src, .proc/update_onsprite), 2)
var/threat = 5
if(ishuman(C))
C.stuttering = 5
@@ -352,15 +355,13 @@ Auto Patrol: []"},
target = null
last_found = world.time
frustration = 0
- spawn(0)
- handle_automated_action() //ensure bot quickly responds
+ INVOKE_ASYNC(src, .proc/handle_automated_action)
/mob/living/simple_animal/bot/secbot/proc/back_to_hunt()
anchored = FALSE
frustration = 0
mode = BOT_HUNT
- spawn(0)
- handle_automated_action() //ensure bot quickly responds
+ INVOKE_ASYNC(src, .proc/handle_automated_action)
// look for a criminal in view of the bot
/mob/living/simple_animal/bot/secbot/proc/look_for_perp()
@@ -385,8 +386,7 @@ Auto Patrol: []"},
playsound(loc, pick('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg'), 50, 0)
visible_message("[src] points at [C.name]!")
mode = BOT_HUNT
- spawn(0)
- handle_automated_action() // ensure bot quickly responds to a perp
+ INVOKE_ASYNC(src, .proc/handle_automated_action)
break
else
continue
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 49ef79a4d9..feb581e03b 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -30,6 +30,7 @@
var/mob/living/simple_animal/mouse/movement_target
gold_core_spawnable = 2
devourable = TRUE
+ no_vore = FALSE
/mob/living/simple_animal/pet/cat/Initialize()
. = ..()
@@ -84,7 +85,7 @@
var/list/family = list()//var restored from savefile, has count of each child type
var/list/children = list()//Actual mob instances of children
var/cats_deployed = 0
- var/memory_saved = 0
+ var/memory_saved = FALSE
/mob/living/simple_animal/pet/cat/Runtime/Initialize()
if(prob(5))
@@ -99,6 +100,7 @@
Deploy_The_Cats()
if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
Write_Memory()
+ memory_saved = TRUE
..()
/mob/living/simple_animal/pet/cat/Runtime/make_babies()
@@ -109,21 +111,26 @@
/mob/living/simple_animal/pet/cat/Runtime/death()
if(!memory_saved)
- Write_Memory(1)
+ Write_Memory(TRUE)
..()
/mob/living/simple_animal/pet/cat/Runtime/proc/Read_Memory()
- var/json_file = file("data/npc_saves/Runtime.json")
- if(!fexists(json_file))
- return
- var/list/json = list()
- json = json_decode(file2text(json_file))
- family = json["family"]
+ if(fexists("data/npc_saves/Runtime.sav")) //legacy compatability to convert old format to new
+ var/savefile/S = new /savefile("data/npc_saves/Runtime.sav")
+ S["family"] >> family
+ fdel("data/npc_saves/Runtime.sav")
+ else
+ var/json_file = file("data/npc_saves/Runtime.json")
+ if(!fexists(json_file))
+ return
+ var/list/json = json_decode(file2text(json_file))
+ family = json["family"]
if(isnull(family))
family = list()
/mob/living/simple_animal/pet/cat/Runtime/proc/Write_Memory(dead)
var/json_file = file("data/npc_saves/Runtime.json")
+ var/list/file_data = list()
family = list()
if(!dead)
for(var/mob/living/simple_animal/pet/cat/kitten/C in children)
@@ -133,9 +140,9 @@
family[C.type] += 1
else
family[C.type] = 1
+ file_data["family"] = family
fdel(json_file)
- WRITE_FILE(json_file, json_encode(family))
- memory_saved = 1
+ WRITE_FILE(json_file, json_encode(file_data))
/mob/living/simple_animal/pet/cat/Runtime/proc/Deploy_The_Cats()
cats_deployed = 1
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 31c080c66c..b9b526514b 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -13,6 +13,7 @@
speak_chance = 1
turns_per_move = 10
devourable = TRUE
+ no_vore = FALSE
//Corgis and pugs are now under one dog subtype
@@ -291,7 +292,7 @@
gold_core_spawnable = 0
var/age = 0
var/record_age = 1
- var/memory_saved = 0
+ var/memory_saved = FALSE
var/saved_head //path
/mob/living/simple_animal/pet/dog/corgi/Ian/Initialize()
@@ -307,7 +308,7 @@
P.real_name = "Ian"
P.gender = MALE
P.desc = "It's the HoP's beloved corgi puppy."
- Write_Memory(0)
+ Write_Memory(FALSE)
qdel(src)
else if(age == record_age)
icon_state = "old_corgi"
@@ -317,24 +318,31 @@
turns_per_move = 20
/mob/living/simple_animal/pet/dog/corgi/Ian/Life()
- if(SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
- Write_Memory(0)
+ if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
+ Write_Memory(FALSE)
+ memory_saved = TRUE
..()
/mob/living/simple_animal/pet/dog/corgi/Ian/death()
if(!memory_saved)
- Write_Memory(1)
+ Write_Memory(TRUE)
..()
/mob/living/simple_animal/pet/dog/corgi/Ian/proc/Read_Memory()
- var/json_file = file("data/npc_saves/Ian.json")
- if(!fexists(json_file))
- return
- var/list/json = list()
- json = json_decode(file2text(json_file))
- age = json["age"]
- record_age = json["record_age"]
- saved_head = json["saved_head"]
+ if(fexists("data/npc_saves/Ian.sav")) //legacy compatability to convert old format to new
+ var/savefile/S = new /savefile("data/npc_saves/Ian.sav")
+ S["age"] >> age
+ S["record_age"] >> record_age
+ S["saved_head"] >> saved_head
+ fdel("data/npc_saves/Ian.sav")
+ else
+ var/json_file = file("data/npc_saves/Ian.json")
+ if(!fexists(json_file))
+ return
+ var/list/json = json_decode(file2text(json_file))
+ age = json["age"]
+ record_age = json["record_age"]
+ saved_head = json["saved_head"]
if(isnull(age))
age = 0
if(isnull(record_age))
@@ -349,14 +357,18 @@
file_data["age"] = age + 1
if((age + 1) > record_age)
file_data["record_age"] = record_age + 1
+ else
+ file_data["record_age"] = record_age
if(inventory_head)
file_data["saved_head"] = inventory_head.type
+ else
+ file_data["saved_head"] = null
else
file_data["age"] = 0
+ file_data["record_age"] = record_age
file_data["saved_head"] = null
fdel(json_file)
WRITE_FILE(json_file, json_encode(file_data))
- memory_saved = 1
/mob/living/simple_animal/pet/dog/corgi/Ian/Life()
..()
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index d223984cf5..c29236c2fc 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -29,6 +29,7 @@
blood_volume = BLOOD_VOLUME_NORMAL
var/obj/item/udder/udder = null
devourable = TRUE
+ no_vore = FALSE
/mob/living/simple_animal/hostile/retaliate/goat/Initialize()
udder = new()
@@ -119,6 +120,7 @@
gold_core_spawnable = 2
blood_volume = BLOOD_VOLUME_NORMAL
devourable = TRUE
+ no_vore = FALSE
/mob/living/simple_animal/cow/Initialize()
udder = new()
@@ -251,6 +253,7 @@
gold_core_spawnable = 2
var/static/chicken_count = 0
devourable = TRUE
+ no_vore = FALSE
/mob/living/simple_animal/chicken/Initialize()
. = ..()
@@ -275,7 +278,6 @@
user.drop_item()
qdel(O)
eggsleft += rand(1, 4)
- //to_chat(world, eggsleft)
else
to_chat(user, "[name] doesn't seem hungry!")
else
diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm
index 22f2041d18..e7d6bfbf64 100644
--- a/code/modules/mob/living/simple_animal/friendly/fox.dm
+++ b/code/modules/mob/living/simple_animal/friendly/fox.dm
@@ -21,6 +21,7 @@
devourable = TRUE
var/mob/living/simple_animal/mouse/movement_target
var/turns_since_scan = 0
+ no_vore = FALSE
/mob/living/simple_animal/pet/fox/Life()
//MICE!
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 6983bed378..1a7ed0261f 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -28,6 +28,7 @@
/mob/living/simple_animal/mouse/Initialize()
. = ..()
+ AddComponent(/datum/component/squeak, list('sound/effects/mousesqueek.ogg'=1), 100)
if(!body_color)
body_color = pick( list("brown","gray","white") )
icon_state = "mouse_[body_color]"
@@ -58,7 +59,6 @@
if(!stat)
var/mob/M = AM
to_chat(M, "[icon2html(src, M)] Squeek!")
- playsound(src, 'sound/effects/mousesqueek.ogg', 100, 1)
..()
/mob/living/simple_animal/mouse/handle_automated_action()
diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm
index 1fa0fd53b8..6833ea83a6 100644
--- a/code/modules/mob/living/simple_animal/friendly/penguin.dm
+++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm
@@ -13,6 +13,7 @@
speak_chance = 1
turns_per_move = 10
icon = 'icons/mob/penguins.dmi'
+ no_vore = FALSE
/mob/living/simple_animal/pet/penguin/emperor
name = "Emperor penguin"
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index d8a2985594..144f7081e0 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -159,7 +159,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
resulthealth = round((summoner.health / summoner.maxHealth) * 100, 0.5)
stat(null, "Summoner Health: [resulthealth]%")
if(cooldown >= world.time)
- stat(null, "Manifest/Recall Cooldown Remaining: [max(round((cooldown - world.time)*0.1, 0.1), 0)] seconds")
+ stat(null, "Manifest/Recall Cooldown Remaining: [DisplayTimeText(cooldown - world.time)]")
/mob/living/simple_animal/hostile/guardian/Move() //Returns to summoner if they move out of range
. = ..()
diff --git a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
index 9632ce3ff9..45d8c17d0c 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
@@ -30,7 +30,7 @@
..()
if(statpanel("Status"))
if(stealthcooldown >= world.time)
- stat(null, "Stealth Cooldown Remaining: [max(round((stealthcooldown - world.time)*0.1, 0.1), 0)] seconds")
+ stat(null, "Stealth Cooldown Remaining: [DisplayTimeText(stealthcooldown - world.time)]")
/mob/living/simple_animal/hostile/guardian/assassin/AttackingTarget()
. = ..()
@@ -79,7 +79,7 @@
updatestealthalert()
toggle = TRUE
else if(!forced)
- to_chat(src, "You cannot yet enter stealth, wait another [max(round((stealthcooldown - world.time)*0.1, 0.1), 0)] seconds!")
+ to_chat(src, "You cannot yet enter stealth, wait another [DisplayTimeText(stealthcooldown - world.time)]!")
/mob/living/simple_animal/hostile/guardian/assassin/proc/updatestealthalert()
if(stealthcooldown <= world.time)
diff --git a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
index 45c093bbf2..c21b1474d8 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
@@ -14,7 +14,7 @@
..()
if(statpanel("Status"))
if(bomb_cooldown >= world.time)
- stat(null, "Bomb Cooldown Remaining: [max(round((bomb_cooldown - world.time)*0.1, 0.1), 0)] seconds")
+ stat(null, "Bomb Cooldown Remaining: [DisplayTimeText(bomb_cooldown - world.time)]")
/mob/living/simple_animal/hostile/guardian/bomb/AttackingTarget()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/guardian/types/support.dm b/code/modules/mob/living/simple_animal/guardian/types/support.dm
index 4b5f7c2de5..db1581d8cb 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/support.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/support.dm
@@ -24,11 +24,11 @@
..()
if(statpanel("Status"))
if(beacon_cooldown >= world.time)
- stat(null, "Beacon Cooldown Remaining: [max(round((beacon_cooldown - world.time)*0.1, 0.1), 0)] seconds")
+ stat(null, "Beacon Cooldown Remaining: [DisplayTimeText(beacon_cooldown - world.time)]")
/mob/living/simple_animal/hostile/guardian/healer/AttackingTarget()
. = ..()
- if(toggle && iscarbon(target))
+ if(. && toggle && iscarbon(target))
var/mob/living/carbon/C = target
C.adjustBruteLoss(-5)
C.adjustFireLoss(-5)
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index e06de7b762..fa4cefd839 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -35,6 +35,8 @@
gold_core_spawnable = 0
death_sound = 'sound/voice/hiss6.ogg'
deathmessage = "lets out a waning guttural screech, green blood bubbling from its maw..."
+ devourable = TRUE
+ no_vore = FALSE
/mob/living/simple_animal/hostile/alien/drone
name = "alien drone"
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index 1c92b6233d..6b08d041c0 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -36,6 +36,8 @@
faction = list("russian")
gold_core_spawnable = 1
+ devourable = TRUE
+ no_vore = FALSE
//SPACE BEARS! SQUEEEEEEEE~ OW! FUCK! IT BIT MY HAND OFF!!
/mob/living/simple_animal/hostile/bear/Hudson
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index dea21157c6..f2d29d3660 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -128,11 +128,12 @@
if(istype(target, /obj/machinery/hydroponics))
var/obj/machinery/hydroponics/Hydro = target
pollinate(Hydro)
- else if(target == beehome)
- var/obj/structure/beebox/BB = target
- loc = BB
- target = null
- wanted_objects -= typecacheof(/obj/structure/beebox) //so we don't attack beeboxes when not going home
+ else if(istype(target, /obj/structure/beebox))
+ if(target == beehome)
+ var/obj/structure/beebox/BB = target
+ forceMove(BB)
+ target = null
+ wanted_objects -= typecacheof(/obj/structure/beebox) //so we don't attack beeboxes when not going home
return //no don't attack the goddamm box
else
. = ..()
@@ -186,7 +187,7 @@
if(loc == beehome)
idle = min(100, ++idle)
if(idle >= BEE_IDLE_ROAMING && prob(BEE_PROB_GOROAM))
- loc = get_turf(beehome)
+ forceMove(get_turf(beehome))
else
idle = max(0, --idle)
if(idle <= BEE_IDLE_GOHOME && prob(BEE_PROB_GOHOME))
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index 9a8592e48c..fde10031d1 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -17,6 +17,7 @@
maxHealth = 25
health = 25
devourable = TRUE
+ no_vore = FALSE
harm_intent_damage = 8
obj_damage = 50
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 564280df02..7e8bd6d2c8 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -15,8 +15,6 @@
if(L.reagents)
L.reagents.add_reagent(poison_type, poison_per_bite)
-
-
//basic spider mob, these generally guard nests
/mob/living/simple_animal/hostile/poison/giant_spider
name = "giant spider"
@@ -104,6 +102,64 @@
poison_per_bite = 5
move_to_delay = 5
+//vipers are the rare variant of the hunter, no IMMEDIATE damage but so much poison medical care will be needed fast.
+/mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper
+ name = "viper"
+ desc = "Furry and black, it makes you shudder to look at it. This one has effervescent purple eyes."
+ icon_state = "viper"
+ icon_living = "viper"
+ icon_dead = "viper_dead"
+ maxHealth = 40
+ health = 40
+ melee_damage_lower = 1
+ melee_damage_upper = 1
+ poison_per_bite = 12
+ move_to_delay = 4
+ poison_type = "venom" //all in venom, glass cannon. you bite 5 times and they are DEFINITELY dead, but 40 health and you are extremely obvious. Ambush, maybe?
+ speed = 1
+
+//tarantulas are really tanky, regenerating (maybe), hulky monster but are also extremely slow, so.
+/mob/living/simple_animal/hostile/poison/giant_spider/tarantula
+ name = "tarantula"
+ desc = "Furry and black, it makes you shudder to look at it. This one has abyssal red eyes."
+ icon_state = "tarantula"
+ icon_living = "tarantula"
+ icon_dead = "tarantula_dead"
+ maxHealth = 300 // woah nelly
+ health = 300
+ melee_damage_lower = 35
+ melee_damage_upper = 40
+ poison_per_bite = 0
+ move_to_delay = 8
+ speed = 7
+ status_flags = NONE
+ mob_size = MOB_SIZE_LARGE
+
+/mob/living/simple_animal/hostile/poison/giant_spider/tarantula/movement_delay()
+ var/turf/T = get_turf(src)
+ if(locate(/obj/structure/spider/stickyweb) in T)
+ speed = 2
+ else
+ speed = 7
+ . = ..()
+
+//midwives are the queen of the spiders, can send messages to all them and web faster. That rare round where you get a queen spider and turn your 'for honor' players into 'r6siege' players will be a fun one.
+/mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife
+ name = "midwife"
+ desc = "Furry and black, it makes you shudder to look at it. This one has scintillating green eyes."
+ icon_state = "midwife"
+ icon_living = "midwife"
+ icon_dead = "midwife_dead"
+ maxHealth = 40
+ health = 40
+ var/datum/action/innate/spider/comm/letmetalkpls
+
+/mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife/Initialize()
+ . = ..()
+ letmetalkpls = new
+ letmetalkpls.Grant(src)
+
+
/mob/living/simple_animal/hostile/poison/giant_spider/ice //spiders dont usually like tempatures of 140 kelvin who knew
name = "giant ice spider"
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
@@ -296,6 +352,39 @@
busy = SPIDER_IDLE
stop_automated_movement = FALSE
+/mob/living/simple_animal/hostile/poison/giant_spider/Login()
+ . = ..()
+ GLOB.spidermobs[src] = TRUE
+
+/mob/living/simple_animal/hostile/poison/giant_spider/Destroy()
+ GLOB.spidermobs -= src
+ return ..()
+
+/datum/action/innate/spider/comm
+ name = "Command"
+ button_icon_state = "cult_comms"
+
+/datum/action/innate/spider/comm/IsAvailable()
+ if(!istype(owner, /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife))
+ return FALSE
+ return TRUE
+
+/datum/action/innate/spider/comm/Trigger()
+ var/input = stripped_input(usr, "Input a message for your legions to follow.", "Command", "")
+ if(QDELETED(src) || !input || !IsAvailable())
+ return FALSE
+ spider_command(usr, input)
+ return TRUE
+
+/datum/action/innate/spider/comm/proc/spider_command(mob/living/user, message)
+ if(!message)
+ return
+ var/my_message
+ my_message = "COMMAND FROM SPIDER QUEEN: [message]"
+ for(var/mob/living/simple_animal/hostile/poison/giant_spider/M in GLOB.spidermobs)
+ to_chat(M, my_message)
+ log_talk(user, "SPIDERCOMMAND: [key_name(user)] : [message]",LOGSAY)
+
/mob/living/simple_animal/hostile/poison/giant_spider/handle_temperature_damage()
if(bodytemperature < minbodytemp)
adjustBruteLoss(20)
diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
index b697473787..e0afdefd6b 100644
--- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
+++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
@@ -22,7 +22,7 @@
melee_damage_upper = 18
damage_coeff = list(BRUTE = 1, BURN = 1.5, TOX = 1.5, CLONE = 0, STAMINA = 0, OXY = 1.5)
obj_damage = 20
- environment_smash = 2
+ environment_smash = ENVIRONMENT_SMASH_WALLS
attacktext = "pummels"
attack_sound = 'sound/weapons/punch1.ogg'
dextrous = TRUE
@@ -32,7 +32,11 @@
stat_attack = UNCONSCIOUS
minbodytemp = 270
maxbodytemp = 350
+ unique_name = TRUE
var/list/gorilla_overlays[GORILLA_TOTAL_LAYERS]
+ var/oogas = 0
+ devourable = TRUE
+ no_vore = FALSE
// Gorillas like to dismember limbs from unconcious mobs.
// Returns null when the target is not an unconcious carbon mob; a list of limbs (possibly empty) otherwise.
@@ -49,6 +53,8 @@
return parts
/mob/living/simple_animal/hostile/gorilla/AttackingTarget()
+ if(client)
+ oogaooga()
var/list/parts = target_bodyparts(target)
if(parts)
if(!parts.len)
@@ -61,7 +67,7 @@
var/mob/living/L = target
if(prob(80))
var/atom/throw_target = get_edge_target_turf(L, dir)
- L.throw_at(throw_target, rand(1,2), 7, src)
+ L.throw_at(throw_target, rand(1,2), 7, src)
else
L.Knockdown(20)
visible_message("[src] knocks [L] down!")
@@ -70,8 +76,30 @@
var/list/parts = target_bodyparts(target)
return ..() && !istype(the_target, /mob/living/carbon/monkey) && (!parts || parts.len > 3)
+/mob/living/simple_animal/hostile/gorilla/CanSmashTurfs(turf/T)
+ return iswallturf(T)
+
+/mob/living/simple_animal/hostile/gorilla/gib(no_brain)
+ if(!no_brain)
+ var/mob/living/brain/B = new(drop_location())
+ B.name = real_name
+ B.real_name = real_name
+ if(mind)
+ mind.transfer_to(B)
+ ..()
+
/mob/living/simple_animal/hostile/gorilla/handle_automated_speech(override)
if(speak_chance && (override || prob(speak_chance)))
playsound(src, "sound/creatures/gorilla.ogg", 200)
..()
+/mob/living/simple_animal/hostile/gorilla/can_use_guns(obj/item/G)
+ to_chat(src, "Your meaty finger is much too large for the trigger guard!")
+ return FALSE
+
+
+/mob/living/simple_animal/hostile/gorilla/proc/oogaooga()
+ oogas++
+ if(oogas >= rand(2,6))
+ playsound(src, "sound/creatures/gorilla.ogg", 200)
+ oogas = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 866f9c995a..86fe54aaeb 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -228,6 +228,9 @@
if(!target || !CanAttack(target))
LoseTarget()
return 0
+ if(ismob(target.loc))
+ LoseTarget()
+ return 0
if(target in possible_targets)
if(target.z != z)
LoseTarget()
@@ -366,23 +369,26 @@
P.original = targeted_atom
P.fire()
return P
-
+
+/mob/living/simple_animal/hostile/proc/CanSmashTurfs(turf/T)
+ return iswallturf(T) || ismineralturf(T)
/mob/living/simple_animal/hostile/proc/DestroySurroundings()
if(environment_smash)
EscapeConfinement()
for(var/dir in GLOB.cardinals)
var/turf/T = get_step(targets_from, dir)
- if(iswallturf(T) || ismineralturf(T))
+ if(CanSmashTurfs(T))
if(T.Adjacent(targets_from))
T.attack_animal(src)
for(var/a in T)
var/atom/A = a
if(!A.Adjacent(targets_from))
continue
- if(is_type_in_typecache(A, environment_target_typecache))
+ if(is_type_in_typecache(A, environment_target_typecache) && !A.IsObscured())
A.attack_animal(src)
+
/mob/living/simple_animal/hostile/proc/EscapeConfinement()
if(buckled)
buckled.attack_animal(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 480408eab4..f3a398d5d9 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -250,7 +250,7 @@ Difficulty: Very Hard
use_power = NO_POWER_USE
var/memory_saved = FALSE
var/list/stored_items = list()
- var/static/list/blacklist = typecacheof(list(/obj/item/spellbook))
+ var/list/blacklist = list()
/obj/machinery/smartfridge/black_box/update_icon()
return
@@ -258,7 +258,8 @@ Difficulty: Very Hard
/obj/machinery/smartfridge/black_box/accept_check(obj/item/O)
if(!istype(O))
return FALSE
- if(is_type_in_typecache(O, blacklist))
+ if(blacklist[O])
+ visible_message("[src] ripples as it rejects [O]. The device will not accept items that have been removed from it.")
return FALSE
return TRUE
@@ -275,6 +276,7 @@ Difficulty: Very Hard
..()
if(!memory_saved && SSticker.current_state == GAME_STATE_FINISHED)
WriteMemory()
+ memory_saved = TRUE
/obj/machinery/smartfridge/black_box/proc/WriteMemory()
var/json_file = file("data/npc_saves/Blackbox.json")
@@ -286,15 +288,18 @@ Difficulty: Very Hard
file_data["data"] = stored_items
fdel(json_file)
WRITE_FILE(json_file, json_encode(file_data))
- memory_saved = TRUE
/obj/machinery/smartfridge/black_box/proc/ReadMemory()
- var/json_file = file("data/npc_saves/Blackbox.json")
- if(!fexists(json_file))
- return
- var/list/json = list()
- json = json_decode(file2text(json_file))
- stored_items = json["data"]
+ if(fexists("data/npc_saves/Blackbox.sav")) //legacy compatability to convert old format to new
+ var/savefile/S = new /savefile("data/npc_saves/Blackbox.sav")
+ S["stored_items"] >> stored_items
+ fdel("data/npc_saves/Blackbox.sav")
+ else
+ var/json_file = file("data/npc_saves/Blackbox.json")
+ if(!fexists(json_file))
+ return
+ var/list/json = json_decode(file2text(json_file))
+ stored_items = json["data"]
if(isnull(stored_items))
stored_items = list()
@@ -304,7 +309,8 @@ Difficulty: Very Hard
//in it's own proc to avoid issues with items that nolonger exist in the code base.
//try catch doesn't always prevent byond runtimes from halting a proc,
/obj/machinery/smartfridge/black_box/proc/create_item(item_type)
- new item_type(src)
+ var/obj/O = new item_type(src)
+ blacklist[O] = TRUE
/obj/machinery/smartfridge/black_box/Destroy(force = FALSE)
if(force)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
index f5e097841a..d1ddfa9a00 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
@@ -60,6 +60,7 @@ Difficulty: Medium
score_type = DRAKE_SCORE
deathmessage = "collapses into a pile of bones, its flesh sloughing away."
death_sound = 'sound/magic/demon_dies.ogg'
+ no_vore = FALSE
/mob/living/simple_animal/hostile/megafauna/dragon/Initialize()
. = ..()
@@ -352,9 +353,9 @@ Difficulty: Medium
/obj/effect/temp_visual/dragon_flight/proc/flight(negative)
if(negative)
- animate(src, pixel_x = -DRAKE_SWOOP_HEIGHT*0.10, pixel_z = DRAKE_SWOOP_HEIGHT*0.15, time = 3, easing = BOUNCE_EASING)
+ animate(src, pixel_x = -DRAKE_SWOOP_HEIGHT*0.1, pixel_z = DRAKE_SWOOP_HEIGHT*0.15, time = 3, easing = BOUNCE_EASING)
else
- animate(src, pixel_x = DRAKE_SWOOP_HEIGHT*0.10, pixel_z = DRAKE_SWOOP_HEIGHT*0.15, time = 3, easing = BOUNCE_EASING)
+ animate(src, pixel_x = DRAKE_SWOOP_HEIGHT*0.1, pixel_z = DRAKE_SWOOP_HEIGHT*0.15, time = 3, easing = BOUNCE_EASING)
sleep(3)
icon_state = "swoop"
if(negative)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon_vore.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon_vore.dm
new file mode 100644
index 0000000000..898a2ad734
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon_vore.dm
@@ -0,0 +1,50 @@
+/mob/living/simple_animal/hostile/megafauna/dragon
+ vore_active = TRUE
+
+/mob/living/simple_animal/hostile/megafauna/dragon/Initialize()
+ // Create and register 'stomachs'
+ var/datum/belly/megafauna/dragon/maw/maw = new(src)
+ var/datum/belly/megafauna/dragon/gullet/gullet = new(src)
+ var/datum/belly/megafauna/dragon/gut/gut = new(src)
+ for(var/datum/belly/X in list(maw, gullet, gut))
+ vore_organs[X.name] = X
+ // Connect 'stomachs' together
+ maw.transferlocation = gullet
+ gullet.transferlocation = gut
+ vore_selected = maw.name // NPC eats into maw
+ return ..()
+
+/datum/belly/megafauna/dragon
+ human_prey_swallow_time = 50 // maybe enough to switch targets if distracted
+ nonhuman_prey_swallow_time = 50
+
+/datum/belly/megafauna/dragon/maw
+ name = "maw"
+ inside_flavor = "The maw of the dreaded Ash drake closes around you, engulfing you into a swelteringly hot, disgusting enviroment. The acidic saliva tingles over your form while that tongue pushes you further back...towards the dark gullet beyond."
+ vore_verb = "scoop"
+ vore_sound = 'sound/vore/pred/taurswallow.ogg'
+ swallow_time = 20
+ escapechance = 25
+ // From above, will transfer into gullet
+ transferchance = 25
+ autotransferchance = 66
+ autotransferwait = 200
+
+/datum/belly/megafauna/dragon/gullet
+ name = "gullet"
+ inside_flavor = "A ripple of muscle and arching of the tongue pushes you down like any other food. No choice in the matter, you're simply consumed. The dark ambiance of the outside world is replaced with working, wet flesh. Your only light being what you brought with you."
+ swallow_time = 60 // costs extra time to eat directly to here
+ escapechance = 5
+ // From above, will transfer into gut
+ transferchance = 25
+ autotransferchance = 50
+ autotransferwait = 200
+
+/datum/belly/megafauna/dragon/gut
+ name = "stomach"
+ vore_capacity = 5 //I doubt this many people will actually last in the gut, but...
+ inside_flavor = "With a rush of burning ichor greeting you, you're introduced to the Drake's stomach. Wrinkled walls greedily grind against you, acidic slimes working into your body as you become fuel and nutriton for a superior predator. All that's left is your body's willingness to resist your destiny."
+ digest_mode = DM_DRAGON
+ digest_burn = 5
+ swallow_time = 100 // costs extra time to eat directly to here
+ escapechance = 0
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index c4618db620..5f45d47494 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -60,7 +60,7 @@
else
var/datum/status_effect/crusher_damage/C = has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING)
if(C && crusher_loot)
- if(C.total_damage >= maxHealth * 0.60) //if you do at least 60% of its health with the crusher, you'll get the item
+ if(C.total_damage >= maxHealth * 0.6) //if you do at least 60% of its health with the crusher, you'll get the item
spawn_crusher_loot()
if(!admin_spawned)
SSblackbox.set_details("megafauna_kills","[initial(name)]")
@@ -89,11 +89,15 @@
. = ..()
if(. && isliving(target))
var/mob/living/L = target
- if(L.stat != DEAD)
- if(!client && ranged && ranged_cooldown <= world.time)
- OpenFire()
+ if(L.stat >= SOFT_CRIT)
+ if(vore_active == TRUE && L.devourable == TRUE)
+ dragon_feeding(src,L)
+ else if(L.stat == DEAD)
+ devour(L)
else
- devour(L)
+ if(L.stat != DEAD)
+ if(!client && ranged && ranged_cooldown <= world.time)
+ OpenFire()
/mob/living/simple_animal/hostile/megafauna/proc/devour(mob/living/L)
if(!L)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
index de995f951a..af283b9139 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm
@@ -31,6 +31,7 @@
var/pre_attack = 0
var/pre_attack_icon = "Goliath_preattack"
loot = list(/obj/item/stack/sheet/animalhide/goliath_hide)
+ no_vore = FALSE
/mob/living/simple_animal/hostile/asteroid/goliath/Life()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index ba2a0f3702..8c5be75684 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -60,7 +60,7 @@
cap_color = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
UpdateMushroomCap()
health = maxHealth
- ..()
+ . = ..()
/mob/living/simple_animal/hostile/mushroom/adjustHealth(amount, updating_health = TRUE, forced = FALSE) //Possibility to flee from a fight just to make it more visually interesting
if(!retreat_distance && prob(33))
diff --git a/code/modules/mob/living/simple_animal/hostile/stickman.dm b/code/modules/mob/living/simple_animal/hostile/stickman.dm
index fd66b8d0ae..44a0a06cdc 100644
--- a/code/modules/mob/living/simple_animal/hostile/stickman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/stickman.dm
@@ -38,7 +38,7 @@
minimum_distance = 5
icon_state = "stickmanranged"
icon_living = "stickmanranged"
- casingtype = /obj/item/ammo_casing/c45nostamina
+ casingtype = /obj/item/ammo_casing/c45/nostamina
projectilesound = 'sound/misc/bang.ogg'
loot = list(/obj/item/gun/ballistic/automatic/pistol/stickman)
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index 7cadba01d9..11331e7ab7 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -95,7 +95,7 @@
minimum_distance = 5
icon_state = "syndicateranged"
icon_living = "syndicateranged"
- casingtype = /obj/item/ammo_casing/c45nostamina
+ casingtype = /obj/item/ammo_casing/c45/nostamina
projectilesound = 'sound/weapons/gunshot_smg.ogg'
loot = list(/obj/effect/gibspawner/human)
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 467bd13c65..6357f83286 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -60,6 +60,7 @@
movement_type = FLYING
gold_core_spawnable = 2
devourable = TRUE
+ no_vore = FALSE
var/parrot_damage_upper = 10
var/parrot_state = PARROT_WANDER //Hunt for a perch when created
@@ -296,7 +297,7 @@
else
parrot_state |= PARROT_FLEE //Otherwise, fly like a bat out of hell!
drop_held_item(0)
- if(!stat && M.a_intent == INTENT_HELP)
+ if(stat != DEAD && M.a_intent == INTENT_HELP)
handle_automated_speech(1) //assured speak/emote
return
@@ -872,7 +873,7 @@
speak = list("Poly wanna cracker!", ":e Check the crystal, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN HARDSUITS?",":e OH GOD ITS ABOUT TO DELAMINATE CALL THE SHUTTLE")
gold_core_spawnable = 0
speak_chance = 3
- var/memory_saved = 0
+ var/memory_saved = FALSE
var/rounds_survived = 0
var/longest_survival = 0
var/longest_deathstreak = 0
@@ -903,50 +904,62 @@
rounds_survived = max(++rounds_survived,1)
if(rounds_survived > longest_survival)
longest_survival = rounds_survived
- Write_Memory()
+ Write_Memory(FALSE)
+ memory_saved = TRUE
..()
/mob/living/simple_animal/parrot/Poly/death(gibbed)
if(!memory_saved)
- var/go_ghost = 0
- if(rounds_survived == longest_survival || rounds_survived == longest_deathstreak || prob(0.666))
- go_ghost = 1
- rounds_survived = min(--rounds_survived,0)
- if(rounds_survived < longest_deathstreak)
- longest_deathstreak = rounds_survived
- Write_Memory()
- if(go_ghost)
- var/mob/living/simple_animal/parrot/Poly/ghost/G = new(loc)
- if(mind)
- mind.transfer_to(G)
- else
- G.key = key
+ Write_Memory(TRUE)
+ if(rounds_survived == longest_survival || rounds_survived == longest_deathstreak || prob(0.666))
+ var/mob/living/simple_animal/parrot/Poly/ghost/G = new(loc)
+ if(mind)
+ mind.transfer_to(G)
+ else
+ G.key = key
..(gibbed)
/mob/living/simple_animal/parrot/Poly/proc/Read_Memory()
- var/json_file = file("data/npc_saves/Poly.json")
- if(!fexists(json_file))
- return
- var/list/json = list()
- json = json_decode(file2text(json_file))
- speech_buffer = json["phrases"]
- rounds_survived = json["roundssurvived"]
- longest_survival = json["longestsurvival"]
- longest_deathstreak = json["longestdeathstreak"]
+ if(fexists("data/npc_saves/Poly.sav")) //legacy compatability to convert old format to new
+ var/savefile/S = new /savefile("data/npc_saves/Poly.sav")
+ S["phrases"] >> speech_buffer
+ S["roundssurvived"] >> rounds_survived
+ S["longestsurvival"] >> longest_survival
+ S["longestdeathstreak"] >> longest_deathstreak
+ fdel("data/npc_saves/Poly.sav")
+ else
+ var/json_file = file("data/npc_saves/Poly.json")
+ if(!fexists(json_file))
+ return
+ var/list/json = json_decode(file2text(json_file))
+ speech_buffer = json["phrases"]
+ rounds_survived = json["roundssurvived"]
+ longest_survival = json["longestsurvival"]
+ longest_deathstreak = json["longestdeathstreak"]
if(!islist(speech_buffer))
speech_buffer = list()
-/mob/living/simple_animal/parrot/Poly/proc/Write_Memory()
+/mob/living/simple_animal/parrot/Poly/proc/Write_Memory(dead)
var/json_file = file("data/npc_saves/Poly.json")
var/list/file_data = list()
if(islist(speech_buffer))
file_data["phrases"] = speech_buffer
- file_data["roundssurvived"] = rounds_survived
- file_data["longestsurvival"] = longest_survival
- file_data["longestdeathstreak"] = longest_deathstreak
+ if(dead)
+ file_data["roundssurvived"] = min(rounds_survived - 1, 0)
+ file_data["longestsurvival"] = longest_survival
+ if(rounds_survived - 1 < longest_deathstreak)
+ file_data["longestdeathstreak"] = rounds_survived - 1
+ else
+ file_data["longestdeathstreak"] = longest_deathstreak
+ else
+ file_data["roundssurvived"] = rounds_survived + 1
+ if(rounds_survived + 1 > longest_survival)
+ file_data["longestsurvival"] = rounds_survived + 1
+ else
+ file_data["longestsurvival"] = longest_survival
+ file_data["longestdeathstreak"] = longest_deathstreak
fdel(json_file)
WRITE_FILE(json_file, json_encode(file_data))
- memory_saved = 1
/mob/living/simple_animal/parrot/Poly/ghost
name = "The Ghost of Poly"
@@ -958,8 +971,8 @@
butcher_results = list(/obj/item/ectoplasm = 1)
/mob/living/simple_animal/parrot/Poly/ghost/Initialize()
- memory_saved = 1 //At this point nothing is saved
- ..()
+ memory_saved = TRUE //At this point nothing is saved
+ . = ..()
/mob/living/simple_animal/parrot/Poly/ghost/handle_automated_speech()
if(ismob(loc))
@@ -983,4 +996,4 @@
loc = H
H.ContractDisease(P)
parrot_interest = null
- H.visible_message("[src] dive bombs into [H]'s chest and vanishes!", "[src] dive bombs into your chest, vanishing! This can't be good!")
+ H.visible_message("[src] dive bombs into [H]'s chest and vanishes!", "[src] dive bombs into your chest, vanishing! This can't be good!")
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index aa95d182cb..144fec4a4a 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -85,6 +85,8 @@
//domestication
var/tame = 0
+ no_vore = TRUE
+
/mob/living/simple_animal/Initialize()
. = ..()
GLOB.simple_animals += src
@@ -95,6 +97,9 @@
real_name = name
if(!loc)
stack_trace("Simple animal being instantiated in nullspace")
+ if(vore_active)
+ init_belly()
+ verbs |= /mob/living/proc/animal_nom
/mob/living/simple_animal/Login()
@@ -228,7 +233,6 @@
if( abs(areatemp - bodytemperature) > 40 )
var/diff = areatemp - bodytemperature
diff = diff / 5
- //to_chat(world, "changed from [bodytemperature] by [diff] to [bodytemperature + diff]")
bodytemperature += diff
if(!environment_is_safe(environment))
diff --git a/code/modules/mob/living/simple_animal/simple_animal_vr.dm b/code/modules/mob/living/simple_animal/simple_animal_vr.dm
index 45320ecc3e..2eca841c17 100644
--- a/code/modules/mob/living/simple_animal/simple_animal_vr.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal_vr.dm
@@ -2,3 +2,101 @@
// List of targets excluded (for now) from being eaten by this mob.
var/list/prey_exclusions = list()
devourable = FALSE //insurance because who knows.
+ var/vore_active = FALSE // If vore behavior is enabled for this mob
+
+ var/vore_default_mode = DM_DIGEST // Default bellymode (DM_DIGEST, DM_HOLD, DM_ABSORB)
+ var/vore_digest_chance = 25 // Chance to switch to digest mode if resisted
+ var/vore_escape_chance = 25 // Chance of resisting out of mob
+
+ var/vore_stomach_name // The name for the first belly if not "stomach"
+ var/vore_stomach_flavor // The flavortext for the first belly if not the default
+
+ var/vore_fullness = 0 // How "full" the belly is (controls icons)
+
+
+// Release belly contents beforey being gc'd!
+/mob/living/simple_animal/Destroy()
+ for(var/I in vore_organs)
+ var/datum/belly/B = vore_organs[I]
+ B.release_all_contents() // When your stomach is empty
+ prey_excludes.Cut()
+ . = ..()
+
+
+// Update fullness based on size & quantity of belly contents
+/mob/living/simple_animal/proc/update_fullness(var/atom/movable/M)
+ var/new_fullness = 0
+ for(var/I in vore_organs)
+ var/datum/belly/B = vore_organs[I]
+ if (!(M in B.internal_contents))
+ return FALSE // Nothing's inside
+ new_fullness += M
+
+ vore_fullness = new_fullness
+
+
+/mob/living/simple_animal/proc/swallow_check()
+ for(var/I in vore_organs)
+ var/datum/belly/B = vore_organs[I]
+ if(vore_active)
+ update_fullness()
+ if(!vore_fullness)
+ // Nothing
+ return
+ else
+ addtimer(CALLBACK(src, .proc/swallow_mob), B.swallow_time)
+
+/mob/living/simple_animal/proc/swallow_mob()
+ for(var/I in vore_organs)
+ var/datum/belly/B = vore_organs[I]
+ for(var/mob/living/M in B.internal_contents)
+ B.transfer_contents(M, B.transferlocation)
+
+
+/mob/living/simple_animal/death()
+ for(var/I in vore_organs)
+ var/datum/belly/B = vore_organs[I]
+ B.release_all_contents() // When your stomach is empty
+ ..() // then you have my permission to die.
+
+// Simple animals have only one belly. This creates it (if it isn't already set up)
+/mob/living/simple_animal/proc/init_belly()
+ if(vore_organs.len)
+ return
+ if(no_vore) //If it can't vore, let's not give it a stomach.
+ return
+
+ var/datum/belly/B = new /datum/belly(src)
+ B.immutable = TRUE
+ B.name = vore_stomach_name ? vore_stomach_name : "stomach"
+ B.inside_flavor = vore_stomach_flavor ? vore_stomach_flavor : "Your surroundings are warm, soft, and slimy. Makes sense, considering you're inside \the [name]."
+ B.digest_mode = vore_default_mode
+ B.escapable = vore_escape_chance > 0
+ B.escapechance = vore_escape_chance
+ B.digestchance = vore_digest_chance
+ B.human_prey_swallow_time = swallowTime
+ B.nonhuman_prey_swallow_time = swallowTime
+ B.vore_verb = "swallow"
+ // TODO - Customizable per mob
+ B.emote_lists[DM_HOLD] = list( // We need more that aren't repetitive. I suck at endo. -Ace
+ "The insides knead at you gently for a moment.",
+ "The guts glorp wetly around you as some air shifts.",
+ "The predator takes a deep breath and sighs, shifting you somewhat.",
+ "The stomach squeezes you tight for a moment, then relaxes harmlessly.",
+ "The predator's calm breathing and thumping heartbeat pulses around you.",
+ "The warm walls kneads harmlessly against you.",
+ "The liquids churn around you, though there doesn't seem to be much effect.",
+ "The sound of bodily movements drown out everything for a moment.",
+ "The predator's movements gently force you into a different position.")
+ B.emote_lists[DM_DIGEST] = list(
+ "The burning acids eat away at your form.",
+ "The muscular stomach flesh grinds harshly against you.",
+ "The caustic air stings your chest when you try to breathe.",
+ "The slimy guts squeeze inward to help the digestive juices soften you up.",
+ "The onslaught against your body doesn't seem to be letting up; you're food now.",
+ "The predator's body ripples and crushes against you as digestive enzymes pull you apart.",
+ "The juices pooling beneath you sizzle against your sore skin.",
+ "The churning walls slowly pulverize you into meaty nutrients.",
+ "The stomach glorps and gurgles as it tries to work you into slop.")
+ src.vore_organs[B.name] = B
+ src.vore_selected = B.name
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index d795f4ff9e..3396d157de 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -225,7 +225,9 @@
var/mob/living/L = mob
switch(L.incorporeal_move)
if(INCORPOREAL_MOVE_BASIC)
- L.loc = get_step(L, direct)
+ var/T = get_step(L,direct)
+ if(T)
+ L.loc = T
L.setDir(direct)
if(INCORPOREAL_MOVE_SHADOW)
if(prob(50))
@@ -254,31 +256,36 @@
return
else
return
- L.loc = locate(locx,locy,mobloc.z)
- var/limit = 2//For only two trailing shadows.
- for(var/turf/T in getline(mobloc, L.loc))
- new /obj/effect/temp_visual/dir_setting/ninja/shadow(T, L.dir)
- limit--
- if(limit<=0)
- break
+ var/target = locate(locx,locy,mobloc.z)
+ if(target)
+ L.loc = target
+ var/limit = 2//For only two trailing shadows.
+ for(var/turf/T in getline(mobloc, L.loc))
+ new /obj/effect/temp_visual/dir_setting/ninja/shadow(T, L.dir)
+ limit--
+ if(limit<=0)
+ break
else
new /obj/effect/temp_visual/dir_setting/ninja/shadow(mobloc, L.dir)
- L.loc = get_step(L, direct)
+ var/T = get_step(L,direct)
+ if(T)
+ L.loc = T
L.setDir(direct)
if(INCORPOREAL_MOVE_JAUNT) //Incorporeal move, but blocked by holy-watered tiles and salt piles.
var/turf/open/floor/stepTurf = get_step(L, direct)
- for(var/obj/effect/decal/cleanable/salt/S in stepTurf)
- to_chat(L, "[S] bars your passage!")
- if(isrevenant(L))
- var/mob/living/simple_animal/revenant/R = L
- R.reveal(20)
- R.stun(20)
- return
- if(stepTurf.flags_1 & NOJAUNT_1)
- to_chat(L, "Holy energies block your path.")
- else
- L.loc = get_step(L, direct)
- L.setDir(direct)
+ if(stepTurf)
+ for(var/obj/effect/decal/cleanable/salt/S in stepTurf)
+ to_chat(L, "[S] bars your passage!")
+ if(isrevenant(L))
+ var/mob/living/simple_animal/revenant/R = L
+ R.reveal(20)
+ R.stun(20)
+ return
+ if(stepTurf.flags_1 & NOJAUNT_1)
+ to_chat(L, "Holy energies block your path.")
+ else
+ L.loc = get_step(L, direct)
+ L.setDir(direct)
return TRUE
diff --git a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm
index 4a0532104a..8e86acb965 100644
--- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm
+++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm
@@ -44,7 +44,7 @@
//var/valid_z_levels = (GetConnectedZlevels(T.z) & using_map.station_levels)
for(var/obj/machinery/power/supermatter_shard/S in GLOB.machines)
// Delaminating, not within coverage, not on a tile.
- if(!((S.z in GLOB.station_z_levels) || S.z == ZLEVEL_MINING || S.z == T.z) || !istype(S.loc, /turf/))
+ if(!((S.z in GLOB.station_z_levels) || S.z == ZLEVEL_MINING || S.z == T.z || !isturf(S.loc)))
continue
supermatters.Add(S)
diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm
index 9ad64cc55e..7d0d2d8cef 100644
--- a/code/modules/paperwork/paper_premade.dm
+++ b/code/modules/paperwork/paper_premade.dm
@@ -47,7 +47,7 @@
/obj/item/paper/fluff/jobs/toxins/chemical_info
name = "paper- 'Chemical Information'"
- info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Plasma:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter plasma after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in a enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Plasma.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure unconscious and sleep toxins.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administeredd to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tMorphine T#054:
\n\t\t5 units wilkl induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization"
+ info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Plasma:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter plasma after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in an enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Plasma.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure unconscious and sleep toxins.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administered to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tMorphine T#054:
\n\t\t5 units will induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization"
/*
* Stations
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 1545bfd452..4d9fc45b1a 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -546,6 +546,35 @@
to_chat(user, "You place the power control board inside the frame.")
qdel(W)
+ else if(istype(W, /obj/item/device/electroadaptive_pseudocircuit) && opened)
+ var/obj/item/device/electroadaptive_pseudocircuit/P = W
+ if(!has_electronics)
+ if(stat & BROKEN)
+ to_chat(user, "[src]'s frame is too damaged to support a circuit.")
+ return
+ if(!P.adapt_circuit(user, 50))
+ return
+ user.visible_message("[user] fabricates a circuit and places it into [src].", \
+ "You adapt a power control board and click it into place in [src]'s guts.")
+ has_electronics = TRUE
+ locked = TRUE
+ else if(!cell)
+ if(stat & MAINT)
+ to_chat(user, "There's no connector for a power cell.")
+ return
+ if(!P.adapt_circuit(user, 500))
+ return
+ var/obj/item/stock_parts/cell/crap/empty/C = new(src)
+ C.forceMove(src)
+ cell = C
+ chargecount = 0
+ user.visible_message("[user] fabricates a weak power cell and places it into [src].", \
+ "Your [P.name] whirrs with strain as you create a weak power cell and place it into [src]!")
+ update_icon()
+ else
+ to_chat(user, "[src] has both electronics and a cell.")
+ return
+
else if (istype(W, /obj/item/weldingtool) && opened && has_electronics==0 && !terminal)
var/obj/item/weldingtool/WT = W
if (WT.get_fuel() < 3)
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index b5eef4260e..6aeaff9477 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -82,24 +82,16 @@
return
if(powernet)
- //to_chat(world, "cold_circ and hot_circ pass")
-
var/datum/gas_mixture/cold_air = cold_circ.return_transfer_air()
var/datum/gas_mixture/hot_air = hot_circ.return_transfer_air()
- //to_chat(world, "hot_air = [hot_air]; cold_air = [cold_air];")
-
if(cold_air && hot_air)
- //to_chat(world, "hot_air = [hot_air] temperature = [hot_air.temperature]; cold_air = [cold_air] temperature = [hot_air.temperature];")
-
- //to_chat(world, "coldair and hotair pass")
var/cold_air_heat_capacity = cold_air.heat_capacity()
var/hot_air_heat_capacity = hot_air.heat_capacity()
var/delta_temperature = hot_air.temperature - cold_air.temperature
- //to_chat(world, "delta_temperature = [delta_temperature]; cold_air_heat_capacity = [cold_air_heat_capacity]; hot_air_heat_capacity = [hot_air_heat_capacity]")
if(delta_temperature > 0 && cold_air_heat_capacity > 0 && hot_air_heat_capacity > 0)
var/efficiency = 0.65
@@ -109,13 +101,9 @@
var/heat = energy_transfer*(1-efficiency)
lastgen += energy_transfer*efficiency
- //to_chat(world, "lastgen = [lastgen]; heat = [heat]; delta_temperature = [delta_temperature]; hot_air_heat_capacity = [hot_air_heat_capacity]; cold_air_heat_capacity = [cold_air_heat_capacity];")
-
hot_air.temperature = hot_air.temperature - energy_transfer/hot_air_heat_capacity
cold_air.temperature = cold_air.temperature + heat/cold_air_heat_capacity
- //to_chat(world, "POWER: [lastgen] W generated at [efficiency*100]% efficiency and sinks sizes [cold_air_heat_capacity], [hot_air_heat_capacity]")
-
//add_avail(lastgen) This is done in process now
// update icon overlays only if displayed level has changed
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index e5e65beb6e..382853066d 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -204,7 +204,7 @@
/obj/machinery/particle_accelerator/control_box/proc/toggle_power()
active = !active
investigate_log("turned [active?"ON":"OFF"] by [usr ? key_name(usr) : "outside forces"]", INVESTIGATE_SINGULO)
- message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? key_name_admin(usr) : "outside forces"](?) (FLW) in ([x],[y],[z] - JMP)",0,1)
+ message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? key_name_admin(usr) : "outside forces"](?) (FLW) in ([x],[y],[z] - JMP)",0,1)
log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr ? "[key_name(usr)]" : "outside forces"] in ([x],[y],[z])")
if(active)
use_power = ACTIVE_POWER_USE
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index 65cce2b7c7..848d690853 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -1,100 +1,126 @@
+// .357 (Syndie Revolver)
+
/obj/item/ammo_casing/a357
+ name = ".357 bullet casing"
desc = "A .357 bullet casing."
caliber = "357"
- projectile_type = /obj/item/projectile/bullet
+ projectile_type = /obj/item/projectile/bullet/a357
+
+// 7.62 (Nagant Rifle)
/obj/item/ammo_casing/a762
+ name = "7.62 bullet casing"
desc = "A 7.62 bullet casing."
icon_state = "762-casing"
caliber = "a762"
- projectile_type = /obj/item/projectile/bullet
+ projectile_type = /obj/item/projectile/bullet/a762
/obj/item/ammo_casing/a762/enchanted
- projectile_type = /obj/item/projectile/bullet/weakbullet3
+ projectile_type = /obj/item/projectile/bullet/a762_enchanted
-/obj/item/ammo_casing/a50
- desc = "A .50AE bullet casing."
- caliber = ".50"
- projectile_type = /obj/item/projectile/bullet
-
-/obj/item/ammo_casing/c38
- desc = "A .38 bullet casing."
- caliber = "38"
- projectile_type = /obj/item/projectile/bullet/weakbullet2
-
-/obj/item/ammo_casing/c10mm
- desc = "A 10mm bullet casing."
- caliber = "10mm"
- projectile_type = /obj/item/projectile/bullet/midbullet3
-
-/obj/item/ammo_casing/c10mm/ap
- projectile_type = /obj/item/projectile/bullet/midbullet3/ap
-
-/obj/item/ammo_casing/c10mm/fire
- projectile_type = /obj/item/projectile/bullet/midbullet3/fire
-
-/obj/item/ammo_casing/c10mm/hp
- projectile_type = /obj/item/projectile/bullet/midbullet3/hp
-
-/obj/item/ammo_casing/c9mm
- desc = "A 9mm bullet casing."
- caliber = "9mm"
- projectile_type = /obj/item/projectile/bullet/weakbullet3
-
-/obj/item/ammo_casing/c9mmap
- desc = "A 9mm bullet casing."
- caliber = "9mm"
- projectile_type =/obj/item/projectile/bullet/armourpiercing
-
-/obj/item/ammo_casing/c9mmtox
- desc = "A 9mm bullet casing."
- caliber = "9mm"
- projectile_type = /obj/item/projectile/bullet/toxinbullet
-
-/obj/item/ammo_casing/c9mminc
- desc = "A 9mm bullet casing."
- caliber = "9mm"
- projectile_type = /obj/item/projectile/bullet/incendiary/firebullet
-
-/obj/item/ammo_casing/c46x30mm
- desc = "A 4.6x30mm bullet casing."
- caliber = "4.6x30mm"
- projectile_type = /obj/item/projectile/bullet/weakbullet3
-
-/obj/item/ammo_casing/c46x30mmap
- desc = "A 4.6x30mm bullet casing."
- caliber = "4.6x30mm"
- projectile_type =/obj/item/projectile/bullet/armourpiercing
-
-/obj/item/ammo_casing/c46x30mmtox
- desc = "A 4.6x30mm bullet casing."
- caliber = "4.6x30mm"
- projectile_type = /obj/item/projectile/bullet/toxinbullet
-
-/obj/item/ammo_casing/c46x30mminc
- desc = "A 4.6x30mm bullet casing."
- caliber = "4.6x30mm"
- projectile_type = /obj/item/projectile/bullet/incendiary/firebullet
-
-/obj/item/ammo_casing/c45
- desc = "A .45 bullet casing."
- caliber = ".45"
- projectile_type = /obj/item/projectile/bullet/midbullet
-
-/obj/item/ammo_casing/c45nostamina
- desc = "A .45 bullet casing."
- caliber = ".45"
- projectile_type = /obj/item/projectile/bullet/midbullet3
+// 7.62x38mmR (Nagant Revolver)
/obj/item/ammo_casing/n762
+ name = "7.62x38mmR bullet casing"
desc = "A 7.62x38mmR bullet casing."
caliber = "n762"
- projectile_type = /obj/item/projectile/bullet
+ projectile_type = /obj/item/projectile/bullet/n762
+
+// .50AE (Desert Eagle)
+
+/obj/item/ammo_casing/a50AE
+ name = ".50AE bullet casing"
+ desc = "A .50AE bullet casing."
+ caliber = ".50"
+ projectile_type = /obj/item/projectile/bullet/a50AE
+
+// .38 (Detective's Gun)
+
+/obj/item/ammo_casing/c38
+ name = ".38 bullet casing"
+ desc = "A .38 bullet casing."
+ caliber = "38"
+ projectile_type = /obj/item/projectile/bullet/c38
+
+// 10mm (Stechkin)
+
+/obj/item/ammo_casing/c10mm
+ name = ".10mm bullet casing"
+ desc = "A 10mm bullet casing."
+ caliber = "10mm"
+ projectile_type = /obj/item/projectile/bullet/c10mm
+
+/obj/item/ammo_casing/c10mm/ap
+ name = ".10mm armor-piercing bullet casing"
+ desc = "A 10mm armor-piercing bullet casing."
+ projectile_type = /obj/item/projectile/bullet/c10mm_ap
+
+/obj/item/ammo_casing/c10mm/hp
+ name = ".10mm hollow-point bullet casing"
+ desc = "A 10mm hollow-point bullet casing."
+ projectile_type = /obj/item/projectile/bullet/c10mm_hp
+
+/obj/item/ammo_casing/c10mm/fire
+ name = ".10mm incendiary bullet casing"
+ desc = "A 10mm incendiary bullet casing."
+ projectile_type = /obj/item/projectile/bullet/incendiary/c10mm
+
+// 9mm (Stechkin APS)
+
+/obj/item/ammo_casing/c9mm
+ name = "9mm bullet casing"
+ desc = "A 9mm bullet casing."
+ caliber = "9mm"
+ projectile_type = /obj/item/projectile/bullet/c9mm
+
+/obj/item/ammo_casing/c9mm/ap
+ name = "9mm armor-piercing bullet casing"
+ desc = "A 9mm armor-piercing bullet casing."
+ projectile_type =/obj/item/projectile/bullet/c9mm_ap
+
+/obj/item/ammo_casing/c9mm/inc
+ name = "9mm incendiary bullet casing"
+ desc = "A 9mm incendiary bullet casing."
+ projectile_type = /obj/item/projectile/bullet/incendiary/c9mm
+
+// 4.6x30mm (Autorifles)
+
+/obj/item/ammo_casing/c46x30mm
+ name = "4.6x30mm bullet casing"
+ desc = "A 4.6x30mm bullet casing."
+ caliber = "4.6x30mm"
+ projectile_type = /obj/item/projectile/bullet/c46x30mm
+
+/obj/item/ammo_casing/c46x30mm/ap
+ name = "4.6x30mm armor-piercing bullet casing"
+ desc = "A 4.6x30mm armor-piercing bullet casing."
+ projectile_type = /obj/item/projectile/bullet/c46x30mm_ap
+
+/obj/item/ammo_casing/c46x30mm/inc
+ name = "4.6x30mm incendiary bullet casing"
+ desc = "A 4.6x30mm incendiary bullet casing."
+ projectile_type = /obj/item/projectile/bullet/incendiary/c46x30mm
+
+// .45 (M1911)
+
+/obj/item/ammo_casing/c45
+ name = ".45 bullet casing"
+ desc = "A .45 bullet casing."
+ caliber = ".45"
+ projectile_type = /obj/item/projectile/bullet/c45
+
+/obj/item/ammo_casing/c45/nostamina
+ projectile_type = /obj/item/projectile/bullet/c45_nostamina
+
+// 5.56mm (M-90gl Carbine)
/obj/item/ammo_casing/a556
+ name = "5.56mm bullet casing"
desc = "A 5.56mm bullet casing."
caliber = "a556"
- projectile_type = /obj/item/projectile/bullet/heavybullet
+ projectile_type = /obj/item/projectile/bullet/a556
+
+// 40mm (Grenade Launcher)
/obj/item/ammo_casing/a40mm
name = "40mm HE shell"
@@ -103,148 +129,93 @@
icon_state = "40mmHE"
projectile_type = /obj/item/projectile/bullet/a40mm
+// .50 (Sniper)
-
-/////SNIPER ROUNDS
-
-/obj/item/ammo_casing/point50
+/obj/item/ammo_casing/p50
+ name = ".50 bullet casing"
desc = "A .50 bullet casing."
caliber = ".50"
- projectile_type = /obj/item/projectile/bullet/sniper
+ projectile_type = /obj/item/projectile/bullet/p50
icon_state = ".50"
-/obj/item/ammo_casing/soporific
+/obj/item/ammo_casing/p50/soporific
+ name = ".50 soporific bullet casing"
desc = "A .50 bullet casing, specialised in sending the target to sleep, instead of hell."
- caliber = ".50"
- projectile_type = /obj/item/projectile/bullet/sniper/soporific
+ projectile_type = /obj/item/projectile/bullet/p50/soporific
icon_state = "sleeper"
-/obj/item/ammo_casing/haemorrhage
- desc = "A .50 bullet casing, specialised in causing massive bloodloss."
- caliber = ".50"
- projectile_type = /obj/item/projectile/bullet/sniper/haemorrhage
- icon_state = ".50"
-
-/obj/item/ammo_casing/penetrator
+/obj/item/ammo_casing/p50/penetrator
+ name = ".50 penetrator round bullet casing"
desc = "A .50 caliber penetrator round casing."
- caliber = ".50"
- projectile_type = /obj/item/projectile/bullet/sniper/penetrator
- icon_state = ".50"
+ projectile_type = /obj/item/projectile/bullet/p50/penetrator
-/obj/item/ammo_casing/point50/gang
- desc = "A black market .50 bullet casing."
- projectile_type = /obj/item/projectile/bullet/sniper/gang
-
-/obj/item/ammo_casing/point50/gang/sleeper
- desc = "Am illegally modified tranquilizer round."
- projectile_type = /obj/item/projectile/bullet/sniper/gang/sleeper
- icon_state = "sleeper"
-
-/// SAW ROUNDS
+// 1.95x129mm (SAW)
/obj/item/ammo_casing/mm195x129
+ name = "1.95x129mm bullet casing"
desc = "A 1.95x129mm bullet casing."
icon_state = "762-casing"
caliber = "mm195129"
- projectile_type = /obj/item/projectile/bullet/saw
-
-/obj/item/ammo_casing/mm195x129/bleeding
- desc = "A 1.95x129mm bullet casing with specialized inner-casing, that when it makes contact with a target, releases tiny shrapnel to induce internal bleeding."
- icon_state = "762-casing"
- projectile_type = /obj/item/projectile/bullet/saw/bleeding
-
-/obj/item/ammo_casing/mm195x129/hollow
- desc = "A 1.95x129mm bullet casing designed to cause more damage to unarmored targets."
- projectile_type = /obj/item/projectile/bullet/saw/hollow
+ projectile_type = /obj/item/projectile/bullet/mm195x129
/obj/item/ammo_casing/mm195x129/ap
+ name = "1.95x129mm armor-piercing bullet casing"
desc = "A 1.95x129mm bullet casing designed with a hardened-tipped core to help penetrate armored targets."
- projectile_type = /obj/item/projectile/bullet/saw/ap
+ projectile_type = /obj/item/projectile/bullet/mm195x129_ap
+
+/obj/item/ammo_casing/mm195x129/hollow
+ name = "1.95x129mm hollow-point bullet casing"
+ desc = "A 1.95x129mm bullet casing designed to cause more damage to unarmored targets."
+ projectile_type = /obj/item/projectile/bullet/mm195x129_hp
/obj/item/ammo_casing/mm195x129/incen
+ name = "1.95x129mm incendiary bullet casing"
desc = "A 1.95x129mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames. "
- projectile_type = /obj/item/projectile/bullet/saw/incen
+ projectile_type = /obj/item/projectile/bullet/incendiary/mm195x129
-
-
-
-//SHOTGUN ROUNDS
+// Shotgun
/obj/item/ammo_casing/shotgun
name = "shotgun slug"
desc = "A 12 gauge lead slug."
icon_state = "blshell"
caliber = "shotgun"
- projectile_type = /obj/item/projectile/bullet
+ projectile_type = /obj/item/projectile/bullet/shotgun_slug
materials = list(MAT_METAL=4000)
-
-/obj/item/ammo_casing/shotgun/buckshot
- name = "buckshot shell"
- desc = "A 12 gauge buckshot shell."
- icon_state = "gshell"
- projectile_type = /obj/item/projectile/bullet/pellet
- pellets = 6
- variance = 25
-
-/obj/item/ammo_casing/shotgun/rubbershot
- name = "rubber shot"
- desc = "A shotgun casing filled with densely-packed rubber balls, used to incapacitate crowds from a distance."
- icon_state = "bshell"
- projectile_type = /obj/item/projectile/bullet/rpellet
- pellets = 6
- variance = 25
- materials = list(MAT_METAL=4000)
-
-
/obj/item/ammo_casing/shotgun/beanbag
name = "beanbag slug"
desc = "A weak beanbag slug for riot control."
icon_state = "bshell"
- projectile_type = /obj/item/projectile/bullet/weakbullet
+ projectile_type = /obj/item/projectile/bullet/shotgun_beanbag
materials = list(MAT_METAL=250)
+/obj/item/ammo_casing/shotgun/incendiary
+ name = "incendiary slug"
+ desc = "An incendiary-coated shotgun slug."
+ icon_state = "ishell"
+ projectile_type = /obj/item/projectile/bullet/incendiary/shotgun
-/obj/item/ammo_casing/shotgun/improvised
- name = "improvised shell"
- desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards."
- icon_state = "improvshell"
- projectile_type = /obj/item/projectile/bullet/pellet/weak
- materials = list(MAT_METAL=250)
- pellets = 10
- variance = 25
-
-
-/obj/item/ammo_casing/shotgun/improvised/overload
- name = "overloaded improvised shell"
- desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards. This one has been packed with even more \
- propellant. It's like playing russian roulette, with a shotgun."
- icon_state = "improvshell"
- projectile_type = /obj/item/projectile/bullet/pellet/overload
- materials = list(MAT_METAL=250)
+/obj/item/ammo_casing/shotgun/dragonsbreath
+ name = "dragonsbreath shell"
+ desc = "A shotgun shell which fires a spread of incendiary pellets."
+ icon_state = "ishell2"
+ projectile_type = /obj/item/projectile/bullet/incendiary/shotgun/dragonsbreath
pellets = 4
- variance = 40
-
+ variance = 35
/obj/item/ammo_casing/shotgun/stunslug
name = "taser slug"
desc = "A stunning taser slug."
icon_state = "stunshell"
- projectile_type = /obj/item/projectile/bullet/stunshot
+ projectile_type = /obj/item/projectile/bullet/shotgun_stunslug
materials = list(MAT_METAL=250)
-
-/obj/item/ammo_casing/shotgun/meteorshot
- name = "meteorshot shell"
+/obj/item/ammo_casing/shotgun/meteorslug
+ name = "meteorslug shell"
desc = "A shotgun shell rigged with CMC technology, which launches a massive slug when fired."
icon_state = "mshell"
- projectile_type = /obj/item/projectile/bullet/meteorshot
-
-/obj/item/ammo_casing/shotgun/breaching
- name = "breaching shell"
- desc = "An economic version of the meteorshot, utilizing similar technologies. Great for busting down doors."
- icon_state = "mshell"
- projectile_type = /obj/item/projectile/bullet/meteorshot/weak
+ projectile_type = /obj/item/projectile/bullet/shotgun_meteorslug
/obj/item/ammo_casing/shotgun/pulseslug
name = "pulse slug"
@@ -252,27 +223,39 @@
energy blast. While the heat and power drain limit it to one use, it can still allow an operator to engage targets that ballistic ammunition \
would have difficulty with."
icon_state = "pshell"
- projectile_type = /obj/item/projectile/beam/pulse/shot
-
-/obj/item/ammo_casing/shotgun/incendiary
- name = "incendiary slug"
- desc = "An incendiary-coated shotgun slug."
- icon_state = "ishell"
- projectile_type = /obj/item/projectile/bullet/incendiary/shell
+ projectile_type = /obj/item/projectile/beam/pulse/shotgun
/obj/item/ammo_casing/shotgun/frag12
name = "FRAG-12 slug"
desc = "A high explosive breaching round for a 12 gauge shotgun."
icon_state = "heshell"
- projectile_type = /obj/item/projectile/bullet/frag12
+ projectile_type = /obj/item/projectile/bullet/shotgun_frag12
-/obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
- name = "dragonsbreath shell"
- desc = "A shotgun shell which fires a spread of incendiary pellets."
- icon_state = "ishell2"
- projectile_type = /obj/item/projectile/bullet/incendiary/shell/dragonsbreath
- pellets = 4
- variance = 35
+/obj/item/ammo_casing/shotgun/buckshot
+ name = "buckshot shell"
+ desc = "A 12 gauge buckshot shell."
+ icon_state = "gshell"
+ projectile_type = /obj/item/projectile/bullet/pellet/shotgun_buckshot
+ pellets = 6
+ variance = 25
+
+/obj/item/ammo_casing/shotgun/rubbershot
+ name = "rubber shot"
+ desc = "A shotgun casing filled with densely-packed rubber balls, used to incapacitate crowds from a distance."
+ icon_state = "bshell"
+ projectile_type = /obj/item/projectile/bullet/pellet/shotgun_rubbershot
+ pellets = 6
+ variance = 25
+ materials = list(MAT_METAL=4000)
+
+/obj/item/ammo_casing/shotgun/improvised
+ name = "improvised shell"
+ desc = "An extremely weak shotgun shell with multiple small pellets made out of metal shards."
+ icon_state = "improvshell"
+ projectile_type = /obj/item/projectile/bullet/pellet/shotgun_improvised
+ materials = list(MAT_METAL=250)
+ pellets = 10
+ variance = 25
/obj/item/ammo_casing/shotgun/ion
name = "ion shell"
@@ -319,4 +302,4 @@
reagents.add_reagent("spore", 6)
reagents.add_reagent("mutetoxin", 6) //;HELP OPS IN MAINT
reagents.add_reagent("coniine", 6)
- reagents.add_reagent("sodium_thiopental", 6)
+ reagents.add_reagent("sodium_thiopental", 6)
\ No newline at end of file
diff --git a/code/modules/projectiles/ammunition/special.dm b/code/modules/projectiles/ammunition/special.dm
index fa9c2ae5b0..11fd12da70 100644
--- a/code/modules/projectiles/ammunition/special.dm
+++ b/code/modules/projectiles/ammunition/special.dm
@@ -85,7 +85,7 @@
..()
/obj/item/ammo_casing/energy/c3dbullet
- projectile_type = /obj/item/projectile/bullet/midbullet3
+ projectile_type = /obj/item/projectile/bullet/c3d
select_name = "spraydown"
fire_sound = 'sound/weapons/gunshot_smg.ogg'
e_cost = 20
diff --git a/code/modules/projectiles/boxes_magazines/external_mag.dm b/code/modules/projectiles/boxes_magazines/external_mag.dm
index 525466be28..5ffe1b475a 100644
--- a/code/modules/projectiles/boxes_magazines/external_mag.dm
+++ b/code/modules/projectiles/boxes_magazines/external_mag.dm
@@ -1,6 +1,4 @@
-
-
///////////EXTERNAL MAGAZINES////////////////
/obj/item/ammo_box/magazine/m10mm
@@ -72,25 +70,16 @@
/obj/item/ammo_box/magazine/wt550m9/wtap
name = "wt550 magazine (Armour Piercing 4.6x30mm)"
icon_state = "46x30mmtA-20"
- ammo_type = /obj/item/ammo_casing/c46x30mmap
+ ammo_type = /obj/item/ammo_casing/c46x30mm/ap
/obj/item/ammo_box/magazine/wt550m9/wtap/update_icon()
..()
icon_state = "46x30mmtA-[round(ammo_count(),4)]"
-/obj/item/ammo_box/magazine/wt550m9/wttx
- name = "wt550 magazine (Toxin Tipped 4.6x30mm)"
- icon_state = "46x30mmtT-20"
- ammo_type = /obj/item/ammo_casing/c46x30mmtox
-
-/obj/item/ammo_box/magazine/wt550m9/wttx/update_icon()
- ..()
- icon_state = "46x30mmtT-[round(ammo_count(),4)]"
-
/obj/item/ammo_box/magazine/wt550m9/wtic
name = "wt550 magazine (Incindiary 4.6x30mm)"
icon_state = "46x30mmtI-20"
- ammo_type = /obj/item/ammo_casing/c46x30mminc
+ ammo_type = /obj/item/ammo_casing/c46x30mm/inc
/obj/item/ammo_box/magazine/wt550m9/wtic/update_icon()
..()
@@ -120,15 +109,11 @@
/obj/item/ammo_box/magazine/smgm9mm/ap
name = "SMG magazine (Armour Piercing 9mm)"
- ammo_type = /obj/item/ammo_casing/c9mmap
-
-/obj/item/ammo_box/magazine/smgm9mm/toxin
- name = "SMG magazine (Toxin Tipped 9mm)"
- ammo_type = /obj/item/ammo_casing/c9mmtox
+ ammo_type = /obj/item/ammo_casing/c9mm/ap
/obj/item/ammo_box/magazine/smgm9mm/fire
name = "SMG Magazine (Incindiary 9mm)"
- ammo_type = /obj/item/ammo_casing/c9mminc
+ ammo_type = /obj/item/ammo_casing/c9mm/inc
/obj/item/ammo_box/magazine/pistolm9mm
name = "pistol magazine (9mm)"
@@ -145,7 +130,7 @@
name = "SMG magazine (.45)"
icon_state = "c20r45-24"
origin_tech = "combat=2"
- ammo_type = /obj/item/ammo_casing/c45nostamina
+ ammo_type = /obj/item/ammo_casing/c45/nostamina
caliber = ".45"
max_ammo = 24
@@ -164,7 +149,7 @@
name = "handgun magazine (.50ae)"
icon_state = "50ae"
origin_tech = "combat=2"
- ammo_type = /obj/item/ammo_casing/a50
+ ammo_type = /obj/item/ammo_casing/a50AE
caliber = ".50"
max_ammo = 7
multiple_sprites = 1
@@ -212,17 +197,17 @@
/obj/item/ammo_box/magazine/m12g/dragon
name = "shotgun magazine (12g dragon's breath)"
icon_state = "m12gf"
- ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
+ ammo_type = /obj/item/ammo_casing/shotgun/dragonsbreath
/obj/item/ammo_box/magazine/m12g/bioterror
name = "shotgun magazine (12g bioterror)"
icon_state = "m12gt"
ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror
-/obj/item/ammo_box/magazine/m12g/breach
- name = "shotgun magazine (12g breacher slugs)"
+/obj/item/ammo_box/magazine/m12g/meteor
+ name = "shotgun magazine (12g meteor slugs)"
icon_state = "m12gbc"
- ammo_type = /obj/item/ammo_casing/shotgun/breaching
+ ammo_type = /obj/item/ammo_casing/shotgun/meteorslug
//// SNIPER MAGAZINES
@@ -231,7 +216,7 @@
name = "sniper rounds (.50)"
icon_state = ".50mag"
origin_tech = "combat=6;syndicate=2"
- ammo_type = /obj/item/ammo_casing/point50
+ ammo_type = /obj/item/ammo_casing/p50
max_ammo = 6
caliber = ".50"
@@ -246,37 +231,17 @@
desc = "Soporific sniper rounds, designed for happy days and dead quiet nights..."
icon_state = "soporific"
origin_tech = "combat=6;syndicate=3"
- ammo_type = /obj/item/ammo_casing/soporific
+ ammo_type = /obj/item/ammo_casing/p50/soporific
max_ammo = 3
caliber = ".50"
-/obj/item/ammo_box/magazine/sniper_rounds/haemorrhage
- name = "sniper rounds (Bleed)"
- desc = "Haemorrhage sniper rounds, leaves your target in a pool of crimson pain"
- icon_state = "haemorrhage"
- ammo_type = /obj/item/ammo_casing/haemorrhage
- max_ammo = 5
- caliber = ".50"
-
/obj/item/ammo_box/magazine/sniper_rounds/penetrator
name = "sniper rounds (penetrator)"
desc = "An extremely powerful round capable of passing straight through cover and anyone unfortunate enough to be behind it."
- ammo_type = /obj/item/ammo_casing/penetrator
+ ammo_type = /obj/item/ammo_casing/p50/penetrator
origin_tech = "combat=6;syndicate=3"
max_ammo = 5
-/obj/item/ammo_box/magazine/sniper_rounds/gang
- name = "black market sniper rounds (.50)"
- icon_state = ".50mag"
- origin_tech = "combat=6"
- ammo_type = /obj/item/ammo_casing/point50/gang
-
-/obj/item/ammo_box/magazine/sniper_rounds/gang/sleeper
- name = "illegally modified tranquilizer round"
- icon_state = "soporific"
- origin_tech = "combat=6"
- ammo_type = /obj/item/ammo_casing/point50/gang/sleeper
-
//// SAW MAGAZINES
/obj/item/ammo_box/magazine/mm195x129
@@ -287,11 +252,6 @@
caliber = "mm195129"
max_ammo = 50
-/obj/item/ammo_box/magazine/mm195x129/bleeding
- name = "box magazine (Bleeding 1.95x129mm)"
- origin_tech = "combat=3"
- ammo_type = /obj/item/ammo_casing/mm195x129/bleeding
-
/obj/item/ammo_box/magazine/mm195x129/hollow
name = "box magazine (Hollow-Point 1.95x129mm)"
origin_tech = "combat=3"
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 1c076d6776..e5767e48ba 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -21,9 +21,9 @@
attack_verb = list("struck", "hit", "bashed")
var/fire_sound = "gunshot"
- var/suppressed = 0 //whether or not a message is displayed when fired
- var/can_suppress = 0
- var/can_unsuppress = 1
+ var/suppressed = null //whether or not a message is displayed when fired
+ var/can_suppress = FALSE
+ var/can_unsuppress = TRUE
var/recoil = 0 //boom boom shake the room
var/clumsy_check = 1
var/obj/item/ammo_casing/chambered = null
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index d65364c062..58ff061e9d 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -4,10 +4,10 @@
icon_state = "pistol"
origin_tech = "combat=2;materials=2"
w_class = WEIGHT_CLASS_NORMAL
- var/spawnwithmagazine = 1
+ var/spawnwithmagazine = TRUE
var/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info
var/obj/item/ammo_box/magazine/magazine
- var/casing_ejector = 1 //whether the gun ejects the chambered casing
+ var/casing_ejector = TRUE //whether the gun ejects the chambered casing
/obj/item/gun/ballistic/Initialize()
. = ..()
@@ -70,24 +70,23 @@
to_chat(user, "There's already a magazine in \the [src].")
if(istype(A, /obj/item/suppressor))
var/obj/item/suppressor/S = A
- if(can_suppress)
- if(!suppressed)
- if(!user.transferItemToLoc(A, src))
- return
- to_chat(user, "You screw [S] onto [src].")
- suppressed = A
- S.oldsound = fire_sound
- S.initial_w_class = w_class
- fire_sound = 'sound/weapons/gunshot_silenced.ogg'
- w_class = WEIGHT_CLASS_NORMAL //so pistols do not fit in pockets when suppressed
- update_icon()
- return
- else
- to_chat(user, "[src] already has a suppressor!")
- return
- else
+ if(!can_suppress)
to_chat(user, "You can't seem to figure out how to fit [S] on [src]!")
return
+ if(!user.is_holding(src))
+ to_chat(user, "You need be holding [src] to fit [S] to it!")
+ return
+ if(suppressed)
+ to_chat(user, "[src] already has a suppressor!")
+ return
+ if(user.transferItemToLoc(A, src))
+ to_chat(user, "You screw [S] onto [src].")
+ suppressed = A
+ S.oldsound = fire_sound
+ fire_sound = 'sound/weapons/gunshot_silenced.ogg'
+ w_class += A.w_class //so pistols do not fit in pockets when suppressed
+ update_icon()
+ return
return 0
/obj/item/gun/ballistic/attack_hand(mob/user)
@@ -100,8 +99,8 @@
to_chat(user, "You unscrew [suppressed] from [src].")
user.put_in_hands(suppressed)
fire_sound = S.oldsound
- w_class = S.initial_w_class
- suppressed = 0
+ w_class -= S.w_class
+ suppressed = null
update_icon()
return
..()
@@ -137,13 +136,27 @@
boolets += magazine.ammo_count()
return boolets
+#define BRAINS_BLOWN_THROW_RANGE 3
+#define BRAINS_BLOWN_THROW_SPEED 1
/obj/item/gun/ballistic/suicide_act(mob/user)
- if (chambered && chambered.BB && can_trigger_gun(user) && !chambered.BB.nodamage)
+ var/obj/item/organ/brain/B = user.getorganslot("brain")
+ if (B && chambered && chambered.BB && can_trigger_gun(user) && !chambered.BB.nodamage)
user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!")
sleep(25)
if(user.is_holding(src))
+ var/turf/T = get_turf(user)
process_fire(user, user, 0, zone_override = "head")
user.visible_message("[user] blows [user.p_their()] brain[user.p_s()] out with [src]!")
+ var/turf/target = get_ranged_target_turf(user, turn(user.dir, 180), BRAINS_BLOWN_THROW_RANGE)
+ B.Remove(user)
+ B.forceMove(T)
+ var/datum/dna/user_dna
+ if(iscarbon(user))
+ var/mob/living/carbon/C = user
+ user_dna = C.dna
+ B.add_blood(user_dna)
+ var/datum/callback/gibspawner = CALLBACK(GLOBAL_PROC, /proc/spawn_atom_to_turf, /obj/effect/gibspawner/generic, B, 1, FALSE, list(user_dna))
+ B.throw_at(target, BRAINS_BLOWN_THROW_RANGE, BRAINS_BLOWN_THROW_SPEED, callback=gibspawner)
return(BRUTELOSS)
else
user.visible_message("[user] panics and starts choking to death!")
@@ -152,8 +165,8 @@
user.visible_message("[user] is pretending to blow [user.p_their()] brain[user.p_s()] out with [src]! It looks like [user.p_theyre()] trying to commit suicide!")
playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
return (OXYLOSS)
-
-
+#undef BRAINS_BLOWN_THROW_SPEED
+#undef BRAINS_BLOWN_THROW_RANGE
/obj/item/gun/ballistic/proc/sawoff(mob/user)
if(sawn_state == SAWN_OFF)
@@ -195,9 +208,8 @@
desc = "A universal syndicate small-arms suppressor for maximum espionage."
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "suppressor"
- w_class = WEIGHT_CLASS_SMALL
+ w_class = WEIGHT_CLASS_TINY
var/oldsound = null
- var/initial_w_class = null
/obj/item/suppressor/specialoffer
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index 5388bf8e0a..7fc37b8c56 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -3,7 +3,7 @@
w_class = WEIGHT_CLASS_NORMAL
var/alarmed = 0
var/select = 1
- can_suppress = 1
+ can_suppress = TRUE
burst_size = 3
fire_delay = 2
actions_types = list(/datum/action/item_action/toggle_firemode)
@@ -119,7 +119,7 @@
item_state = "arg"
mag_type = /obj/item/ammo_box/magazine/wt550m9
fire_delay = 2
- can_suppress = 0
+ can_suppress = FALSE
burst_size = 0
actions_types = list()
@@ -143,7 +143,7 @@
origin_tech = "combat=5;materials=2;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/m556
fire_sound = 'sound/weapons/gunshot_smg.ogg'
- can_suppress = 0
+ can_suppress = FALSE
var/obj/item/gun/ballistic/revolver/grenadelauncher/underbarrel
burst_size = 3
fire_delay = 2
@@ -217,7 +217,7 @@
origin_tech = "combat=5;materials=1;syndicate=3"
mag_type = /obj/item/ammo_box/magazine/tommygunm45
fire_sound = 'sound/weapons/gunshot_smg.ogg'
- can_suppress = 0
+ can_suppress = FALSE
burst_size = 4
fire_delay = 1
@@ -230,7 +230,7 @@
origin_tech = "combat=6;engineering=4"
mag_type = /obj/item/ammo_box/magazine/m556
fire_sound = 'sound/weapons/gunshot_smg.ogg'
- can_suppress = 0
+ can_suppress = FALSE
burst_size = 3
fire_delay = 1
@@ -246,7 +246,7 @@
origin_tech = "combat=6;materials=4;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/m12g
fire_sound = 'sound/weapons/gunshot.ogg'
- can_suppress = 0
+ can_suppress = FALSE
burst_size = 1
fire_delay = 0
pin = /obj/item/device/firing_pin/implant/pindicate
@@ -286,7 +286,7 @@
weapon_weight = WEAPON_HEAVY
fire_sound = 'sound/weapons/gunshot_smg.ogg'
var/cover_open = FALSE
- can_suppress = 0
+ can_suppress = FALSE
burst_size = 3
fire_delay = 1
pin = /obj/item/device/firing_pin/implant/pindicate
@@ -362,8 +362,8 @@
fire_delay = 40
burst_size = 1
origin_tech = "combat=7"
- can_unsuppress = 1
- can_suppress = 1
+ can_unsuppress = TRUE
+ can_suppress = TRUE
w_class = WEIGHT_CLASS_NORMAL
zoomable = TRUE
zoom_amt = 7 //Long range, enough to see in front of you, but no tiles behind you.
@@ -384,11 +384,6 @@
pin = /obj/item/device/firing_pin/implant/pindicate
origin_tech = "combat=7;syndicate=6"
-/obj/item/gun/ballistic/automatic/sniper_rifle/gang
- name = "black market sniper rifle"
- desc = "A long ranged weapon that does significant damage. It is well worn from years of service."
- mag_type = /obj/item/ammo_box/magazine/sniper_rounds/gang
-
// Old Semi-Auto Rifle //
/obj/item/gun/ballistic/automatic/surplus
@@ -401,8 +396,8 @@
mag_type = /obj/item/ammo_box/magazine/m10mm/rifle
fire_delay = 30
burst_size = 1
- can_unsuppress = 1
- can_suppress = 1
+ can_unsuppress = TRUE
+ can_suppress = TRUE
w_class = WEIGHT_CLASS_HUGE
slot_flags = SLOT_BACK
actions_types = list()
@@ -423,11 +418,11 @@
item_state = "arg"
mag_type = /obj/item/ammo_box/magazine/recharge
fire_delay = 2
- can_suppress = 0
+ can_suppress = FALSE
burst_size = 0
actions_types = list()
fire_sound = 'sound/weapons/laser.ogg'
- casing_ejector = 0
+ casing_ejector = FALSE
/obj/item/gun/ballistic/automatic/laser/update_icon()
..()
diff --git a/code/modules/projectiles/guns/ballistic/laser_gatling.dm b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
index b73c1b7242..9621c5294d 100644
--- a/code/modules/projectiles/guns/ballistic/laser_gatling.dm
+++ b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
@@ -109,12 +109,12 @@
weapon_weight = WEAPON_HEAVY
fire_sound = 'sound/weapons/laser.ogg'
mag_type = /obj/item/ammo_box/magazine/internal/minigun
- casing_ejector = 0
+ casing_ejector = FALSE
flags_2 = SLOWS_WHILE_IN_HAND_2
var/obj/item/minigunpack/ammo_pack
/obj/item/gun/ballistic/minigun/Initialize()
- if(istype(loc, /obj/item/minigunpack)) //We should spawn inside a ammo pack so let's use that one.
+ if(istype(loc, /obj/item/minigunpack)) //We should spawn inside an ammo pack so let's use that one.
ammo_pack = loc
else
return INITIALIZE_HINT_QDEL //No pack, no gun
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index 6d700e4307..a32d78bb2e 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -40,7 +40,7 @@
burst_size = 1
fire_delay = 0
actions_types = list()
- casing_ejector = 0
+ casing_ejector = FALSE
/obj/item/gun/ballistic/automatic/gyropistol/update_icon()
..()
@@ -54,14 +54,14 @@
w_class = WEIGHT_CLASS_BULKY
origin_tech = "combat=4;engineering=4"
force = 10
- can_suppress = 0
+ can_suppress = FALSE
mag_type = /obj/item/ammo_box/magazine/internal/speargun
fire_sound = 'sound/weapons/grenadelaunch.ogg'
burst_size = 1
fire_delay = 0
select = 0
actions_types = list()
- casing_ejector = 0
+ casing_ejector = FALSE
/obj/item/gun/ballistic/automatic/speargun/update_icon()
return
@@ -84,12 +84,12 @@
mag_type = /obj/item/ammo_box/magazine/internal/rocketlauncher
fire_sound = 'sound/weapons/rocketlaunch.ogg'
w_class = WEIGHT_CLASS_BULKY
- can_suppress = 0
+ can_suppress = FALSE
burst_size = 1
fire_delay = 0
select = 0
actions_types = list()
- casing_ejector = 0
+ casing_ejector = FALSE
weapon_weight = WEAPON_HEAVY
/obj/item/gun/ballistic/automatic/atlauncher/attack_self()
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index c460a24fcf..06bb452b0b 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -5,7 +5,7 @@
w_class = WEIGHT_CLASS_SMALL
origin_tech = "combat=3;materials=2;syndicate=4"
mag_type = /obj/item/ammo_box/magazine/m10mm
- can_suppress = 1
+ can_suppress = TRUE
burst_size = 1
fire_delay = 0
actions_types = list()
@@ -21,7 +21,7 @@
icon_state = "m1911"
w_class = WEIGHT_CLASS_NORMAL
mag_type = /obj/item/ammo_box/magazine/m45
- can_suppress = 0
+ can_suppress = FALSE
/obj/item/gun/ballistic/automatic/pistol/deagle
name = "desert eagle"
@@ -29,7 +29,7 @@
icon_state = "deagle"
force = 14
mag_type = /obj/item/ammo_box/magazine/m50
- can_suppress = 0
+ can_suppress = FALSE
/obj/item/gun/ballistic/automatic/pistol/deagle/update_icon()
..()
@@ -57,7 +57,7 @@
w_class = WEIGHT_CLASS_SMALL
origin_tech = "combat=3;materials=2;syndicate=3"
mag_type = /obj/item/ammo_box/magazine/pistolm9mm
- can_suppress = 0
+ can_suppress = FALSE
burst_size = 3
fire_delay = 2
actions_types = list(/datum/action/item_action/toggle_firemode)
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index d31f661336..44bada2771 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -4,7 +4,7 @@
icon_state = "revolver"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder
origin_tech = "combat=3;materials=2"
- casing_ejector = 0
+ casing_ejector = FALSE
/obj/item/gun/ballistic/revolver/Initialize()
. = ..()
@@ -159,7 +159,7 @@
desc = "An old model of revolver that originated in Russia. Able to be suppressed. Uses 7.62x38mmR ammo."
icon_state = "nagant"
origin_tech = "combat=3"
- can_suppress = 1
+ can_suppress = TRUE
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev762
@@ -270,7 +270,7 @@
"Dark Red Finish" = "dshotgun-d",
"Ash" = "dshotgun-f",
"Faded Grey" = "dshotgun-g",
- "Maple" = "dshotgun-1",
+ "Maple" = "dshotgun-l",
"Rosewood" = "dshotgun-p"
)
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 9e220b12b8..71bdce7f28 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -9,7 +9,7 @@
slot_flags = SLOT_BACK
origin_tech = "combat=4;materials=2"
mag_type = /obj/item/ammo_box/magazine/internal/shot
- casing_ejector = 0
+ casing_ejector = FALSE
var/recentpump = 0 // to prevent spammage
weapon_weight = WEAPON_MEDIUM
diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm
index 3ddd6375b2..c251a791d0 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -12,7 +12,7 @@
can_suppress = TRUE
clumsy_check = 0
needs_permit = 0
- casing_ejector = 0
+ casing_ejector = FALSE
/obj/item/gun/ballistic/automatic/toy/unrestricted
pin = /obj/item/device/firing_pin
@@ -55,7 +55,7 @@
mag_type = /obj/item/ammo_box/magazine/internal/shot/toy
clumsy_check = 0
needs_permit = 0
- casing_ejector = 0
+ casing_ejector = FALSE
can_suppress = FALSE
/obj/item/gun/ballistic/shotgun/toy/process_chamber(empty_chamber = 0)
@@ -84,7 +84,7 @@
can_suppress = TRUE
needs_permit = 0
mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
- casing_ejector = 0
+ casing_ejector = FALSE
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted //Use this for actual toys
pin = /obj/item/device/firing_pin
@@ -100,7 +100,7 @@
can_suppress = FALSE
needs_permit = 0
mag_type = /obj/item/ammo_box/magazine/toy/m762/riot
- casing_ejector = 0
+ casing_ejector = FALSE
/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted //Use this for actual toys
pin = /obj/item/device/firing_pin
diff --git a/code/modules/projectiles/guns/beam_rifle.dm b/code/modules/projectiles/guns/beam_rifle.dm
index 32f366f136..93e8ab6799 100644
--- a/code/modules/projectiles/guns/beam_rifle.dm
+++ b/code/modules/projectiles/guns/beam_rifle.dm
@@ -35,10 +35,10 @@
canMouseDown = TRUE
pin = null
var/aiming = FALSE
- var/aiming_time = 7
- var/aiming_time_fire_threshold = 2
- var/aiming_time_left = 7
- var/aiming_time_increase_user_movement = 3
+ var/aiming_time = 12
+ var/aiming_time_fire_threshold = 5
+ var/aiming_time_left = 12
+ var/aiming_time_increase_user_movement = 6
var/scoped_slow = 1
var/aiming_time_increase_angle_multiplier = 0.3
@@ -63,6 +63,8 @@
var/projectile_setting_pierce = TRUE
var/delay = 65
var/lastfire = 0
+
+ var/lastprocess = 0
//ZOOMING
var/zoom_current_view_increase = 0
@@ -246,9 +248,9 @@
return
check_user()
handle_zooming()
- if(aiming_time_left > 0)
- aiming_time_left--
- aiming_beam(TRUE)
+ aiming_time_left = min(0, aiming_time_left - (world.time - lastprocess))
+ aiming_beam(TRUE)
+ lastprocess = world.time
/obj/item/gun/energy/beam_rifle/proc/check_user(automatic_cleanup = TRUE)
if(!istype(current_user) || !isturf(current_user.loc) || !(src in current_user.held_items) || current_user.incapacitated()) //Doesn't work if you're not holding it!
@@ -678,7 +680,7 @@
pixel_x = pixel_x_offset
pixel_y = pixel_y_offset
else
- animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)), flags_1 = ANIMATION_END_NOW)
+ animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)), flags = ANIMATION_END_NOW)
old_pixel_x = pixel_x_offset
old_pixel_y = pixel_y_offset
if(can_hit_target(original, permutated))
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 0eb6a7137d..96777a050a 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -534,7 +534,7 @@
/obj/item/borg/upgrade/modkit/tracer/adjustable
name = "adjustable tracer bolts"
- desc = "Causes kinetic accelerator bolts to have a adjustable-colored tracer trail and explosion. Use in-hand to change color."
+ desc = "Causes kinetic accelerator bolts to have an adjustable-colored tracer trail and explosion. Use in-hand to change color."
/obj/item/borg/upgrade/modkit/tracer/adjustable/attack_self(mob/user)
bolt_color = input(user,"Choose Color") as color
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index fa7540315e..9e91275c4f 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -90,7 +90,7 @@
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL=2000)
origin_tech = "combat=4;magnets=4;syndicate=5"
- suppressed = 1
+ suppressed = TRUE
ammo_type = list(/obj/item/ammo_casing/energy/bolt)
weapon_weight = WEAPON_LIGHT
unique_rename = 0
@@ -115,7 +115,7 @@
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=4000)
origin_tech = "combat=4;magnets=4;syndicate=2"
- suppressed = 0
+ suppressed = null
ammo_type = list(/obj/item/ammo_casing/energy/bolt/large)
pin = null
diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm
index 0d0cbeae10..f79b59fe7d 100644
--- a/code/modules/projectiles/guns/syringe_gun.dm
+++ b/code/modules/projectiles/guns/syringe_gun.dm
@@ -76,8 +76,8 @@
w_class = WEIGHT_CLASS_SMALL
origin_tech = "combat=2;syndicate=2;biotech=3"
force = 2 //Also very weak because it's smaller
- suppressed = 1 //Softer fire sound
- can_unsuppress = 0 //Permanently silenced
+ suppressed = TRUE //Softer fire sound
+ can_unsuppress = FALSE //Permanently silenced
/obj/item/gun/syringe/dna
name = "modified syringe gun"
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 527d02e52a..e18ac0ab5c 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -13,7 +13,7 @@
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/def_zone = "" //Aiming at
var/mob/firer = null//Who shot it
- var/suppressed = 0 //Attack message
+ var/suppressed = FALSE //Attack message
var/yo = null
var/xo = null
var/current = null
@@ -324,7 +324,6 @@
//Split Y+Pixel_Y up into list(Y, Pixel_Y)
var/list/screen_loc_Y = splittext(screen_loc_params[2],":")
- // to_chat(world, "X: [screen_loc_X[1]] PixelX: [screen_loc_X[2]] / Y: [screen_loc_Y[1]] PixelY: [screen_loc_Y[2]]")
var/x = text2num(screen_loc_X[1]) * 32 + text2num(screen_loc_X[2]) - 32
var/y = text2num(screen_loc_Y[1]) * 32 + text2num(screen_loc_Y[2]) - 32
@@ -333,9 +332,7 @@
var/ox = round(screenview/2) - user.client.pixel_x //"origin" x
var/oy = round(screenview/2) - user.client.pixel_y //"origin" y
- // to_chat(world, "Pixel position: [x] [y]")
angle = Atan2(y - oy, x - ox)
- // to_chat(world, "Angle: [angle]")
return list(angle, p_x, p_y)
/obj/item/projectile/Crossed(atom/movable/AM) //A mob moving on a tile with a projectile is hit by it.
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 844a8a4662..d1d7b50cf5 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -77,7 +77,7 @@
if(isturf(target) || istype(target, /obj/structure/))
target.ex_act(EXPLODE_HEAVY)
-/obj/item/projectile/beam/pulse/shot
+/obj/item/projectile/beam/pulse/shotgun
damage = 40
/obj/item/projectile/beam/pulse/heavy
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index d11fa850c2..6f4ae50243 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -3,105 +3,238 @@
icon_state = "bullet"
damage = 60
damage_type = BRUTE
- nodamage = 0
+ nodamage = FALSE
flag = "bullet"
hitsound_wall = "ricochet"
impact_effect_type = /obj/effect/temp_visual/impact_effect
-/obj/item/projectile/bullet/weakbullet //beanbag, heavy stamina damage
- damage = 5
- stamina = 80
-
-/obj/item/projectile/bullet/weakbullet2 //detective revolver instastuns, but multiple shots are better for keeping punks down
- damage = 15
- knockdown = 30
- stamina = 50
-
-/obj/item/projectile/bullet/weakbullet3
- damage = 20
-
-/obj/item/projectile/bullet/toxinbullet
- damage = 15
- damage_type = TOX
-
-/obj/item/projectile/bullet/incendiary/firebullet
- damage = 10
-
-/obj/item/projectile/bullet/armourpiercing
- damage = 15
- armour_penetration = 40
-
-/obj/item/projectile/bullet/pellet
- name = "pellet"
- damage = 12.5
-
/obj/item/projectile/bullet/pellet/Range()
..()
damage += -0.75
if(damage < 0)
qdel(src)
-/obj/item/projectile/bullet/pellet/weak
- damage = 6
-
-/obj/item/projectile/bullet/pellet/weak/New()
- range = rand(1, 8)
- ..()
-
-/obj/item/projectile/bullet/pellet/weak/on_range()
- do_sparks(1, TRUE, src)
- ..()
-
-/obj/item/projectile/bullet/pellet/overload
- damage = 3
-
-/obj/item/projectile/bullet/pellet/overload/New()
- range = rand(1, 10)
- ..()
-
-/obj/item/projectile/bullet/pellet/overload/on_hit(atom/target, blocked = FALSE)
- ..()
- explosion(target, 0, 0, 2)
-
-/obj/item/projectile/bullet/pellet/overload/on_range()
- explosion(src, 0, 0, 2)
- do_sparks(3, TRUE, src)
- ..()
-
-/obj/item/projectile/bullet/midbullet
+/obj/item/projectile/bullet/incendiary
damage = 20
- stamina = 65 //two round bursts from the c20r knocks people down
+ var/fire_stacks = 4
+/obj/item/projectile/bullet/incendiary/on_hit(atom/target, blocked = FALSE)
+ . = ..()
+ if(iscarbon(target))
+ var/mob/living/carbon/M = target
+ M.adjust_fire_stacks(fire_stacks)
+ M.IgniteMob()
-/obj/item/projectile/bullet/midbullet2
- damage = 25
+/obj/item/projectile/bullet/incendiary/Move()
+ . = ..()
+ var/turf/location = get_turf(src)
+ if(location)
+ new /obj/effect/hotspot(location)
+ location.hotspot_expose(700, 50, 1)
-/obj/item/projectile/bullet/midbullet3
+// .357 (Syndie Revolver)
+
+/obj/item/projectile/bullet/a357
+ name = ".357 bullet"
+ damage = 60
+
+// 7.62 (Nagant Rifle)
+
+/obj/item/projectile/bullet/a762
+ name = "7.62 bullet"
+ damage = 60
+
+/obj/item/projectile/bullet/a762_enchanted
+ name = "enchanted 7.62 bullet"
+ damage = 5
+ stamina = 80
+
+// 7.62x38mmR (Nagant Revolver)
+
+/obj/item/projectile/bullet/n762
+ name = "7.62x38mmR bullet"
+ damage = 60
+
+// .50AE (Desert Eagle)
+
+/obj/item/projectile/bullet/a50AE
+ name = ".50AE bullet"
+ damage = 60
+
+// .38 (Detective's Gun)
+
+/obj/item/projectile/bullet/c38
+ name = ".38 bullet"
+ damage = 15
+ knockdown = 30
+ stamina = 50
+
+// 10mm (Stechkin)
+
+/obj/item/projectile/bullet/c10mm
+ name = "10mm bullet"
damage = 30
-/obj/item/projectile/bullet/midbullet3/hp
- damage = 40
- armour_penetration = -50
-
-/obj/item/projectile/bullet/midbullet3/ap
+/obj/item/projectile/bullet/c10mm_ap
+ name = "10mm armor-piercing bullet"
damage = 27
armour_penetration = 40
-/obj/item/projectile/bullet/midbullet3/fire/on_hit(atom/target, blocked = FALSE)
- if(..(target, blocked))
- var/mob/living/M = target
- M.adjust_fire_stacks(1)
- M.IgniteMob()
+/obj/item/projectile/bullet/c10mm_hp
+ name = "10mm hollow-point bullet"
+ damage = 40
+ armour_penetration = -50
-/obj/item/projectile/bullet/heavybullet
+/obj/item/projectile/bullet/incendiary/c10mm
+ name = "10mm incendiary bullet"
+ damage = 15
+ fire_stacks = 2
+
+// 9mm (Stechkin APS)
+
+/obj/item/projectile/bullet/c9mm
+ name = "9mm bullet"
+ damage = 20
+
+/obj/item/projectile/bullet/c9mm_ap
+ name = "9mm armor-piercing bullet"
+ damage = 15
+ armour_penetration = 40
+
+/obj/item/projectile/bullet/incendiary/c9mm
+ name = "9mm incendiary bullet"
+ damage = 10
+ fire_stacks = 1
+
+// 4.6x30mm (Autorifles)
+
+/obj/item/projectile/bullet/c46x30mm
+ desc = "4.6x30mm bullet"
+ damage = 20
+
+/obj/item/projectile/bullet/c46x30mm_ap
+ name = "4.6x30mm armor-piercing bullet"
+ damage = 15
+ armour_penetration = 40
+
+/obj/item/projectile/bullet/incendiary/c46x30mm
+ name = "4.6x30mm incendiary bullet"
+ damage = 10
+ fire_stacks = 1
+
+// .45 (M1911)
+
+/obj/item/projectile/bullet/c45
+ name = ".45 bullet"
+ damage = 20
+ stamina = 65
+
+/obj/item/projectile/bullet/c45_nostamina
+ name = ".45 bullet"
+ damage = 20
+
+// 5.56mm (M-90gl Carbine)
+
+/obj/item/projectile/bullet/a556
+ name = "5.56mm bullet"
damage = 35
-/obj/item/projectile/bullet/rpellet
- damage = 3
- stamina = 25
+// 40mm (Grenade Launcher
-/obj/item/projectile/bullet/stunshot //taser slugs for shotguns, nothing special
- name = "stunshot"
+/obj/item/projectile/bullet/a40mm
+ name ="40mm grenade"
+ desc = "USE A WEEL GUN"
+ icon_state= "bolter"
+ damage = 60
+
+/obj/item/projectile/bullet/a40mm/on_hit(atom/target, blocked = FALSE)
+ ..()
+ explosion(target, -1, 0, 2, 1, 0, flame_range = 3)
+ return TRUE
+
+// .50 (Sniper)
+
+/obj/item/projectile/bullet/p50
+ name =".50 bullet"
+ speed = 0 //360 alwaysscope.
+ damage = 70
+ knockdown = 100
+ dismemberment = 50
+ armour_penetration = 50
+ var/breakthings = TRUE
+
+/obj/item/projectile/bullet/p50/on_hit(atom/target, blocked = 0)
+ if((blocked != 100) && (!ismob(target) && breakthings))
+ target.ex_act(rand(1,2))
+ return ..()
+
+/obj/item/projectile/bullet/p50/soporific
+ name =".50 soporific bullet"
+ armour_penetration = 0
+ nodamage = TRUE
+ dismemberment = 0
+ knockdown = 0
+ breakthings = FALSE
+
+/obj/item/projectile/bullet/p50/soporific/on_hit(atom/target, blocked = FALSE)
+ if((blocked != 100) && isliving(target))
+ var/mob/living/L = target
+ L.Sleeping(400)
+ return ..()
+
+/obj/item/projectile/bullet/p50/penetrator
+ name =".50 penetrator bullet"
+ icon_state = "gauss"
+ name = "penetrator round"
+ damage = 60
+ forcedodge = TRUE
+ dismemberment = 0 //It goes through you cleanly.
+ knockdown = 0
+ breakthings = FALSE
+
+// 1.95x129mm (SAW)
+
+/obj/item/projectile/bullet/mm195x129
+ name = "1.95x129mm bullet"
+ damage = 45
+ armour_penetration = 5
+
+/obj/item/projectile/bullet/mm195x129_ap
+ name = "1.95x129mm armor-piercing bullet"
+ damage = 40
+ armour_penetration = 75
+
+/obj/item/projectile/bullet/mm195x129_hp
+ name = "1.95x129mm hollow-point bullet"
+ damage = 60
+ armour_penetration = -60
+
+/obj/item/projectile/bullet/incendiary/mm195x129
+ name = "1.95x129mm incendiary bullet"
+ damage = 15
+ fire_stacks = 3
+
+// Shotgun
+
+/obj/item/projectile/bullet/shotgun_slug
+ name = "12g shotgun slug"
+ damage = 60
+
+/obj/item/projectile/bullet/shotgun_beanbag
+ name = "beanbag slug"
+ damage = 5
+ stamina = 80
+
+/obj/item/projectile/bullet/incendiary/shotgun
+ name = "incendiary slug"
+ damage = 20
+
+/obj/item/projectile/bullet/incendiary/shotgun/dragonsbreath
+ name = "dragonsbreath pellet"
+ damage = 5
+
+/obj/item/projectile/bullet/shotgun_stunslug
+ name = "stunslug"
damage = 5
knockdown = 100
stutter = 5
@@ -110,47 +243,90 @@
icon_state = "spark"
color = "#FFFF00"
-/obj/item/projectile/bullet/incendiary/on_hit(atom/target, blocked = FALSE)
- . = ..()
- if(iscarbon(target))
- var/mob/living/carbon/M = target
- M.adjust_fire_stacks(4)
- M.IgniteMob()
-
-
-/obj/item/projectile/bullet/incendiary/shell
- name = "incendiary slug"
- damage = 20
-
-/obj/item/projectile/bullet/incendiary/shell/Move()
- ..()
- var/turf/location = get_turf(src)
- if(location)
- new /obj/effect/hotspot(location)
- location.hotspot_expose(700, 50, 1)
-
-/obj/item/projectile/bullet/incendiary/shell/dragonsbreath
- name = "dragonsbreath round"
- damage = 5
-
-
-/obj/item/projectile/bullet/meteorshot
- name = "meteor"
+/obj/item/projectile/bullet/shotgun_meteorslug
+ name = "meteorslug"
icon = 'icons/obj/meteor.dmi'
icon_state = "dust"
- damage = 30
- knockdown = 160
+ damage = 20
+ knockdown = 80
hitsound = 'sound/effects/meteorimpact.ogg'
-/obj/item/projectile/bullet/meteorshot/weak
- damage = 10
- knockdown = 80
+/obj/item/projectile/bullet/shotgun_meteorslug/on_hit(atom/target, blocked = FALSE)
+ . = ..()
+ if(ismovableatom(target))
+ var/atom/movable/M = target
+ var/atom/throw_target = get_edge_target_turf(M, get_dir(src, get_step_away(M, src)))
+ M.throw_at(throw_target, 3, 2)
+
+/obj/item/projectile/bullet/shotgun_meteorslug/Initialize()
+ . = ..()
+ SpinAnimation()
+
+/obj/item/projectile/bullet/shotgun_frag12
+ name ="frag12 slug"
+ damage = 25
+ knockdown = 50
+
+/obj/item/projectile/bullet/shotgun_frag12/on_hit(atom/target, blocked = FALSE)
+ ..()
+ explosion(target, -1, 0, 1)
+ return TRUE
+
+/obj/item/projectile/bullet/pellet/shotgun_buckshot
+ name = "buckshot pellet"
+ damage = 12.5
+
+/obj/item/projectile/bullet/pellet/shotgun_rubbershot
+ damage = 3
+ stamina = 25
+
+/obj/item/projectile/bullet/pellet/shotgun_improvised
+ damage = 6
+
+/obj/item/projectile/bullet/pellet/shotgun_improvised/Initialize()
+ . = ..()
+ range = rand(1, 8)
+
+/obj/item/projectile/bullet/pellet/shotgun_improvised/on_range()
+ do_sparks(1, TRUE, src)
+ ..()
+
+// Scattershot
+
+/obj/item/projectile/bullet/scattershot
+ damage = 20
+ stamina = 65
+
+// LMD (exosuits)
+
+/obj/item/projectile/bullet/lmg
+ damage = 20
+
+// Turrets
+
+/obj/item/projectile/bullet/manned_turret
+ damage = 20
+
+/obj/item/projectile/bullet/syndicate_turret
+ damage = 20
+
+// FNX-99 (Mechs)
+
+/obj/item/projectile/bullet/incendiary/fnx99
+ damage = 20
+
+// C3D (Borgs)
+
+/obj/item/projectile/bullet/c3d
+ damage = 20
+
+// Honker
/obj/item/projectile/bullet/honker
damage = 0
knockdown = 60
- forcedodge = 1
- nodamage = 1
+ forcedodge = TRUE
+ nodamage = TRUE
hitsound = 'sound/items/bikehorn.ogg'
icon = 'icons/obj/hydroponics/harvest.dmi'
icon_state = "banana"
@@ -160,17 +336,7 @@
..()
SpinAnimation()
-/obj/item/projectile/bullet/meteorshot/on_hit(atom/target, blocked = FALSE)
- . = ..()
- if(ismovableatom(target))
- var/atom/movable/M = target
- var/atom/throw_target = get_edge_target_turf(M, get_dir(src, get_step_away(M, src)))
- M.throw_at(throw_target, 3, 2)
-
-/obj/item/projectile/bullet/meteorshot/New()
- ..()
- SpinAnimation()
-
+// Mime
/obj/item/projectile/bullet/mime
damage = 20
@@ -181,6 +347,7 @@
var/mob/living/carbon/M = target
M.silent = max(M.silent, 10)
+// Darts
/obj/item/projectile/bullet/dart
name = "dart"
@@ -210,7 +377,7 @@
..(target, blocked)
reagents.set_reacting(TRUE)
reagents.handle_reactions()
- return 1
+ return TRUE
/obj/item/projectile/bullet/dart/metalfoam/New()
..()
@@ -223,18 +390,7 @@
name = "syringe"
icon_state = "syringeproj"
-/obj/item/projectile/bullet/neurotoxin
- name = "neurotoxin spit"
- icon_state = "neurotoxin"
- damage = 5
- damage_type = TOX
- knockdown = 100
-
-/obj/item/projectile/bullet/neurotoxin/on_hit(atom/target, blocked = FALSE)
- if(isalien(target))
- knockdown = 0
- nodamage = 1
- . = ..() // Execute the rest of the code.
+// DNA injector
/obj/item/projectile/bullet/dnainjector
name = "\improper DNA injector"
@@ -261,121 +417,3 @@
QDEL_NULL(injector)
return ..()
-//// SNIPER BULLETS
-
-/obj/item/projectile/bullet/sniper
- speed = 0 //360 alwaysscope.
- damage = 70
- knockdown = 100
- dismemberment = 50
- armour_penetration = 50
- var/breakthings = TRUE
-
-/obj/item/projectile/bullet/sniper/on_hit(atom/target, blocked = FALSE)
- if((blocked != 100) && (!ismob(target) && breakthings))
- target.ex_act(rand(1,2))
- return ..()
-
-/obj/item/projectile/bullet/sniper/gang
- damage = 55
- knockdown = 20
- dismemberment = 15
- armour_penetration = 25
-
-/obj/item/projectile/bullet/sniper/gang/sleeper
- nodamage = 1
- knockdown = 0
- dismemberment = 0
- breakthings = FALSE
-
-/obj/item/projectile/bullet/sniper/gang/sleeper/on_hit(atom/target, blocked = FALSE)
- if((blocked != 100) && isliving(target))
- var/mob/living/L = target
- L.blur_eyes(8)
- if(L.staminaloss >= 40)
- L.Sleeping(400)
- else
- L.adjustStaminaLoss(55)
- return 1
-
-/obj/item/projectile/bullet/sniper/soporific
- armour_penetration = 0
- nodamage = 1
- dismemberment = 0
- knockdown = 0
- breakthings = FALSE
-
-/obj/item/projectile/bullet/sniper/soporific/on_hit(atom/target, blocked = FALSE)
- if((blocked != 100) && isliving(target))
- var/mob/living/L = target
- L.Sleeping(400)
- return ..()
-
-
-/obj/item/projectile/bullet/sniper/haemorrhage
- armour_penetration = 15
- damage = 15
- dismemberment = 0
- knockdown = 0
- breakthings = FALSE
-
-/obj/item/projectile/bullet/sniper/haemorrhage/on_hit(atom/target, blocked = FALSE)
- if((blocked != 100) && iscarbon(target))
- var/mob/living/carbon/C = target
- C.bleed(100)
- return ..()
-
-
-/obj/item/projectile/bullet/sniper/penetrator
- icon_state = "gauss"
- name = "penetrator round"
- damage = 60
- forcedodge = 1
- dismemberment = 0 //It goes through you cleanly.
- knockdown = 0
- breakthings = FALSE
-
-
-
-//// SAW BULLETS
-
-
-/obj/item/projectile/bullet/saw
- damage = 45
- armour_penetration = 5
-
-/obj/item/projectile/bullet/saw/bleeding
- damage = 20
- armour_penetration = 0
-
-/obj/item/projectile/bullet/saw/bleeding/on_hit(atom/target, blocked = FALSE)
- . = ..()
- if((blocked != 100) && iscarbon(target))
- var/mob/living/carbon/C = target
- C.bleed(35)
-
-/obj/item/projectile/bullet/saw/hollow
- damage = 60
- armour_penetration = -60
-
-/obj/item/projectile/bullet/saw/ap
- damage = 40
- armour_penetration = 75
-
-/obj/item/projectile/bullet/saw/incen
- damage = 7
- armour_penetration = 0
-
-/obj/item/projectile/bullet/saw/incen/Move()
- ..()
- var/turf/location = get_turf(src)
- if(location)
- new /obj/effect/hotspot(location)
- location.hotspot_expose(700, 50, 1)
-
-/obj/item/projectile/bullet/saw/incen/on_hit(atom/target, blocked = FALSE)
- . = ..()
- if(iscarbon(target))
- var/mob/living/carbon/M = target
- M.adjust_fire_stacks(3)
- M.IgniteMob()
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index f9f7686a46..79a3d51eec 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -32,17 +32,6 @@
explosion(target, -1, 0, 2)
return 1
-/obj/item/projectile/bullet/a40mm
- name ="40mm grenade"
- desc = "USE A WEEL GUN"
- icon_state= "bolter"
- damage = 60
-
-/obj/item/projectile/bullet/a40mm/on_hit(atom/target, blocked = FALSE)
- ..()
- explosion(target, -1, 0, 2, 1, 0, flame_range = 3)
- return 1
-
/obj/item/projectile/bullet/a84mm
name ="anti-armour rocket"
desc = "USE A WEEL GUN"
@@ -184,16 +173,6 @@
qdel(src)
gun.create_portal(src, get_turf(src))
-/obj/item/projectile/bullet/frag12
- name ="explosive slug"
- damage = 25
- knockdown = 50
-
-/obj/item/projectile/bullet/frag12/on_hit(atom/target, blocked = FALSE)
- ..()
- explosion(target, -1, 0, 1)
- return 1
-
/obj/item/projectile/plasma
name = "plasma blast"
icon_state = "plasmacutter"
@@ -616,3 +595,19 @@
/obj/item/projectile/hallucination/death/hal_apply_effect()
new /datum/hallucination/death(hal_target, TRUE)
+
+// Neurotoxin
+
+/obj/item/projectile/bullet/neurotoxin
+ name = "neurotoxin spit"
+ icon_state = "neurotoxin"
+ damage = 5
+ damage_type = TOX
+ knockdown = 100
+
+/obj/item/projectile/bullet/neurotoxin/on_hit(atom/target, blocked = FALSE)
+ if(isalien(target))
+ knockdown = 0
+ nodamage = TRUE
+ return ..()
+
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 6ef7d778b6..9bcd909faf 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -566,6 +566,8 @@
my_atom.on_reagent_change()
if(!no_react)
handle_reactions()
+ if(isliving(my_atom))
+ R.on_mob_add(my_atom)
return TRUE
else
@@ -669,7 +671,6 @@
for(var/reagent in cached_reagents)
var/datum/reagent/R = reagent
if(R.id == reagent_id)
- //to_chat(world, "proffering a data-carrying reagent ([reagent_id])")
return R.data
/datum/reagents/proc/set_data(reagent_id, new_data)
@@ -677,7 +678,6 @@
for(var/reagent in cached_reagents)
var/datum/reagent/R = reagent
if(R.id == reagent_id)
- //to_chat(world, "reagent data set ([reagent_id])")
R.data = new_data
/datum/reagents/proc/copy_data(datum/reagent/current_reagent)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 538ae996ea..ec4a1f58f8 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -112,8 +112,8 @@
data["maxEnergy"] = cell.maxcharge * powerefficiency
data["isBeakerLoaded"] = beaker ? 1 : 0
- var beakerContents[0]
- var beakerCurrentVolume = 0
+ var/beakerContents[0]
+ var/beakerCurrentVolume = 0
if(beaker && beaker.reagents && beaker.reagents.reagent_list.len)
for(var/datum/reagent/R in beaker.reagents.reagent_list)
beakerContents.Add(list(list("name" = R.name, "volume" = R.volume))) // list in a list because Byond merges the first list...
@@ -129,7 +129,7 @@
data["beakerMaxVolume"] = null
data["beakerTransferAmounts"] = null
- var chemicals[0]
+ var/chemicals[0]
var/is_hallucinating = FALSE
if(user.hallucinating())
is_hallucinating = TRUE
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index ce1f469f8d..abe58cb79d 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -10,11 +10,11 @@
circuit = /obj/item/circuitboard/machine/chem_heater
var/obj/item/reagent_containers/beaker = null
var/target_temperature = 300
- var/heater_coefficient = 0.10
+ var/heater_coefficient = 0.1
var/on = FALSE
/obj/machinery/chem_heater/RefreshParts()
- heater_coefficient = 0.10
+ heater_coefficient = 0.1
for(var/obj/item/stock_parts/micro_laser/M in component_parts)
heater_coefficient *= M.rating
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 802e4c70ca..c6a01bc45f 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -133,13 +133,13 @@
data["pillBotMaxContent"] = bottle.storage_slots
- var beakerContents[0]
+ var/beakerContents[0]
if(beaker)
for(var/datum/reagent/R in beaker.reagents.reagent_list)
beakerContents.Add(list(list("name" = R.name, "id" = R.id, "volume" = R.volume))) // list in a list because Byond merges the first list...
data["beakerContents"] = beakerContents
- var bufferContents[0]
+ var/bufferContents[0]
if(reagents.total_volume)
for(var/datum/reagent/N in reagents.reagent_list)
bufferContents.Add(list(list("name" = N.name, "id" = N.id, "volume" = N.volume))) // ^
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index bc98badc51..342e2154f8 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -58,6 +58,10 @@
holder.remove_reagent(src.id, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears.
return
+// Called when this reagent is first added to a mob
+/datum/reagent/proc/on_mob_add(mob/M)
+ return
+
// Called when this reagent is removed while inside a mob
/datum/reagent/proc/on_mob_delete(mob/M)
return
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 5e3bf0f749..c114f7017b 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -69,7 +69,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
for(var/s in C.surgeries)
var/datum/surgery/S = s
- S.success_multiplier = max(0.10*power_multiplier, S.success_multiplier)
+ S.success_multiplier = max(0.1*power_multiplier, S.success_multiplier)
// +10% success propability on each step, useful while operating in less-than-perfect conditions
return ..()
@@ -470,6 +470,13 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Bloody Mary"
glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
+/datum/reagent/consumable/ethanol/bloody_mary/on_mob_life(mob/living/M)
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ if(C.blood_volume < BLOOD_VOLUME_NORMAL)
+ C.blood_volume = min(BLOOD_VOLUME_NORMAL, C.blood_volume + 3) //Bloody Mary quickly restores blood loss.
+ ..()
+
/datum/reagent/consumable/ethanol/brave_bull
name = "Brave Bull"
id = "bravebull"
@@ -480,16 +487,18 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "bravebullglass"
glass_name = "Brave Bull"
glass_desc = "Tequila and Coffee liqueur, brought together in a mouthwatering mixture. Drink up."
+ var/tough_text
-/datum/reagent/consumable/ethanol/brave_bull/on_mob_life(mob/living/M)
- if(M.maxHealth == initial(M.maxHealth)) //Brave Bull makes you sturdier, and thus capable of withstanding a tiny bit more punishment.
- M.maxHealth += 5
- M.health += 5
- return ..()
+/datum/reagent/consumable/ethanol/brave_bull/on_mob_add(mob/living/M)
+ tough_text = pick("brawny", "tenacious", "tough", "hardy", "sturdy") //Tuff stuff
+ to_chat(M, "You feel [tough_text]!")
+ M.maxHealth += 10 //Brave Bull makes you sturdier, and thus capable of withstanding a tiny bit more punishment.
+ M.health += 10
/datum/reagent/consumable/ethanol/brave_bull/on_mob_delete(mob/living/M)
- if(M.maxHealth != initial(M.maxHealth))
- M.maxHealth = initial(M.maxHealth)
+ to_chat(M, "You no longer feel [tough_text].")
+ M.maxHealth -= 10
+ M.health = min(M.health - 10, M.maxHealth) //This can indeed crit you if you're alive solely based on alchol ingestion
/datum/reagent/consumable/ethanol/tequila_sunrise
name = "Tequila Sunrise"
@@ -501,6 +510,23 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "tequilasunriseglass"
glass_name = "tequila Sunrise"
glass_desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
+ var/obj/effect/light_holder
+
+/datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_add(mob/living/M)
+ to_chat(M, "You feel gentle warmth spread through your body!")
+ light_holder = new(M)
+ light_holder.set_light(3, 0.7, "#FFCC00") //Tequila Sunrise makes you radiate dim light, like a sunrise!
+
+/datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_life(mob/living/M)
+ if(QDELETED(light_holder))
+ M.reagents.del_reagent("tequilasunrise") //If we lost our light object somehow, remove the reagent
+ else if(light_holder.loc != M)
+ light_holder.forceMove(M)
+ return ..()
+
+/datum/reagent/consumable/ethanol/tequila_sunrise/on_mob_delete(mob/living/M)
+ to_chat(M, "The warmth in your body fades.")
+ QDEL_NULL(light_holder)
/datum/reagent/consumable/ethanol/toxins_special
name = "Toxins Special"
@@ -556,6 +582,21 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_icon_state = "manlydorfglass"
glass_name = "The Manly Dorf"
glass_desc = "A manly concoction made from Ale and Beer. Intended for true men only."
+ var/dorf_mode
+
+/datum/reagent/consumable/ethanol/manly_dorf/on_mob_add(mob/living/M)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(H.dna.check_mutation(DWARFISM))
+ to_chat(H, "Now THAT is MANLY!")
+ boozepwr = 5 //We've had worse in the mines
+ dorf_mode = TRUE
+
+/datum/reagent/consumable/ethanol/manly_dorf/on_mob_life(mob/living/M)
+ if(dorf_mode)
+ M.adjustBruteLoss(-2)
+ M.adjustFireLoss(-2)
+ return ..()
/datum/reagent/consumable/ethanol/longislandicedtea
name = "Long Island Iced Tea"
@@ -592,6 +633,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Kahlua, Irish Cream, and cognac. You will get bombed."
shot_glass_icon_state = "b52glass"
+/datum/reagent/consumable/ethanol/b52/on_mob_add(mob/living/M)
+ playsound(M, 'sound/effects/explosion_distant.ogg', 100, FALSE)
+
/datum/reagent/consumable/ethanol/irishcoffee
name = "Irish Coffee"
id = "irishcoffee"
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 57a7f3445d..ab9d95582b 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -353,7 +353,7 @@
var/mob/living/carbon/C = M
for(var/s in C.surgeries)
var/datum/surgery/S = s
- S.success_multiplier = max(0.10, S.success_multiplier)
+ S.success_multiplier = max(0.1, S.success_multiplier)
// +10% success propability on each step, useful while operating in less-than-perfect conditions
if(show_message)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index ffc24882fd..6e02cc5696 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -112,7 +112,7 @@
/datum/reagent/water
name = "Water"
id = "water"
- description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen."
+ description = "An ubiquitous chemical substance that is composed of hydrogen and oxygen."
color = "#AAAAAA77" // rgb: 170, 170, 170, 77 (alpha)
taste_description = "water"
var/cooling_temperature = 2
@@ -160,8 +160,8 @@
cube.Expand()
// Dehydrated carp
- else if(istype(O, /obj/item/toy/carpplushie/dehy_carp))
- var/obj/item/toy/carpplushie/dehy_carp/dehy = O
+ else if(istype(O, /obj/item/toy/plush/carpplushie/dehy_carp))
+ var/obj/item/toy/plush/carpplushie/dehy_carp/dehy = O
dehy.Swell() // Makes a carp
else if(istype(O, /obj/item/stack/sheet/hairlesshide))
@@ -797,7 +797,7 @@
var/mob/living/carbon/C = M
for(var/s in C.surgeries)
var/datum/surgery/S = s
- S.success_multiplier = max(0.20, S.success_multiplier)
+ S.success_multiplier = max(0.2, S.success_multiplier)
// +20% success propability on each step, useful while operating in less-than-perfect conditions
..()
@@ -1081,7 +1081,7 @@
/datum/reagent/foaming_agent// Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually.
name = "Foaming agent"
id = "foaming_agent"
- description = "A agent that yields metallic foam when mixed with light metal and a strong acid."
+ description = "An agent that yields metallic foam when mixed with light metal and a strong acid."
reagent_state = SOLID
color = "#664B63" // rgb: 102, 75, 99
taste_description = "metal"
@@ -1089,7 +1089,7 @@
/datum/reagent/smart_foaming_agent //Smart foaming agent. Functions similarly to metal foam, but conforms to walls.
name = "Smart foaming agent"
id = "smart_foaming_agent"
- description = "A agent that yields metallic foam which conforms to area boundaries when mixed with light metal and a strong acid."
+ description = "An agent that yields metallic foam which conforms to area boundaries when mixed with light metal and a strong acid."
reagent_state = SOLID
color = "#664B63" // rgb: 102, 75, 99
taste_description = "metal"
@@ -1576,13 +1576,13 @@
/datum/reagent/magillitis
name = "Magillitis"
id = "magillitis"
- description = "An experimental serum which causes rapid muscular growth in basic primates. Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
+ description = "An experimental serum which causes rapid muscular growth in Hominidae. Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
reagent_state = LIQUID
color = "#00f041"
/datum/reagent/magillitis/on_mob_life(mob/living/carbon/M)
..()
- if(ismonkey(M) && current_cycle >= 10)
+ if((ismonkey(M) || ishuman(M)) && current_cycle >= 10)
return M.gorillize()
/datum/reagent/growthserum
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index d0dadc271e..fd7d5750f1 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -831,7 +831,7 @@
/datum/reagent/toxin/acid/fluacid
name = "Fluorosulfuric acid"
id = "facid"
- description = "Fluorosulfuric acid is a an extremely corrosive chemical substance."
+ description = "Fluorosulfuric acid is an extremely corrosive chemical substance."
color = "#5050FF"
toxpwr = 2
acidpwr = 42.0
diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm
index ba106e8cd3..9321595a8d 100644
--- a/code/modules/reagents/reagent_containers/patch.dm
+++ b/code/modules/reagents/reagent_containers/patch.dm
@@ -13,6 +13,14 @@
/obj/item/reagent_containers/pill/patch/afterattack(obj/target, mob/user , proximity)
return // thanks inheritance again
+/obj/item/reagent_containers/pill/patch/attack(mob/living/L, mob/user)
+ if(ishuman(L))
+ var/obj/item/bodypart/affecting = L.get_bodypart(check_zone(user.zone_selected))
+ if(affecting.status != BODYPART_ORGANIC)
+ to_chat(user, "Medicine won't work on a robotic limb!")
+ return
+ ..()
+
/obj/item/reagent_containers/pill/patch/canconsume(mob/eater, mob/user)
if(!iscarbon(eater))
return 0
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 1364766f44..67d15f7240 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -175,4 +175,5 @@
desc = "A dispenser of low-potency virus mutagenic."
icon_state = "virus_food"
anchored = TRUE
+ density = FALSE
reagent_id = "virusfood"
\ No newline at end of file
diff --git a/code/modules/recycling/disposal-structures.dm b/code/modules/recycling/disposal-structures.dm
index 9015320c56..acb89f4bee 100644
--- a/code/modules/recycling/disposal-structures.dm
+++ b/code/modules/recycling/disposal-structures.dm
@@ -97,7 +97,7 @@
return null
// merge two holder objects
-// used when a a holder meets a stuck holder
+// used when a holder meets a stuck holder
/obj/structure/disposalholder/proc/merge(obj/structure/disposalholder/other)
for(var/atom/movable/AM in other)
AM.loc = src // move everything in other holder to this one
diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index ad2345afe5..f9a2c0d63c 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -11,7 +11,6 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
container_type = OPENCONTAINER_1
circuit = /obj/item/circuitboard/machine/circuit_imprinter
- var/datum/material_container/materials
var/efficiency_coeff
var/list/categories = list(
@@ -29,20 +28,18 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
)
/obj/machinery/r_n_d/circuit_imprinter/Initialize()
- materials = new(src, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE))
+ AddComponent(/datum/component/material_container, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE),
+ FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready))
create_reagents(0)
return ..()
-/obj/machinery/r_n_d/circuit_imprinter/Destroy()
- QDEL_NULL(materials)
- return ..()
-
/obj/machinery/r_n_d/circuit_imprinter/RefreshParts()
reagents.maximum_volume = 0
for(var/obj/item/reagent_containers/glass/G in component_parts)
reagents.maximum_volume += G.volume
G.reagents.trans_to(src, G.reagents.total_volume)
+ GET_COMPONENT(materials, /datum/component/material_container)
materials.max_amount = 0
for(var/obj/item/stock_parts/matter_bin/M in component_parts)
materials.max_amount += M.rating * 75000
@@ -59,6 +56,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
/obj/machinery/r_n_d/circuit_imprinter/proc/check_mat(datum/design/being_built, M) // now returns how many times the item can be built with the material
var/list/all_materials = being_built.reagents_list + being_built.materials
+ GET_COMPONENT(materials, /datum/component/material_container)
var/A = materials.amount(M)
if(!A)
A = reagents.get_reagent_amount(M)
@@ -69,6 +67,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
/obj/machinery/r_n_d/circuit_imprinter/on_deconstruction()
for(var/obj/item/reagent_containers/glass/G in component_parts)
reagents.trans_to(G, G.reagents.maximum_volume)
+ GET_COMPONENT(materials, /datum/component/material_container)
materials.retrieve_all()
..()
@@ -77,52 +76,20 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
linked_console.linked_imprinter = null
..()
-/obj/machinery/r_n_d/circuit_imprinter/Insert_Item(obj/item/O, mob/user)
-
- if(istype(O, /obj/item/stack/sheet))
- . = 1
- if(!is_insertion_ready(user))
+/obj/machinery/r_n_d/circuit_imprinter/ComponentActivated(datum/component/C)
+ ..()
+ if(istype(C, /datum/component/material_container))
+ var/datum/component/material_container/M = C
+ if(!M.last_insert_success)
return
- var/sheet_material = materials.get_item_material_amount(O)
- if(!sheet_material)
- return
-
- if(!materials.has_space(sheet_material))
- to_chat(user, "The [src.name]'s material bin is full! Please remove material before adding more.")
- return 1
-
- var/obj/item/stack/sheet/stack = O
- var/amount = round(input("How many sheets do you want to add?") as num)//No decimals
- if(!in_range(src, stack) || !user.Adjacent(src))
- return
- var/amount_inserted = materials.insert_stack(O,amount)
- if(!amount_inserted)
- return 1
+ var/lit = M.last_inserted_type
+ var/stack_name
+ if(ispath(lit, /obj/item/ore/bluespace_crystal))
+ stack_name = "bluespace"
+ use_power(MINERAL_MATERIAL_AMOUNT / 10)
else
- use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount_inserted/10)))
- to_chat(user, "You add [amount_inserted] sheets to the [src.name].")
- updateUsrDialog()
-
- else if(istype(O, /obj/item/ore/bluespace_crystal)) //Bluespace crystals can be either a stack or an item
- . = 1
- if(!is_insertion_ready(user))
- return
- var/bs_material = materials.get_item_material_amount(O)
- if(!bs_material)
- return
-
- if(!materials.has_space(bs_material))
- to_chat(user, "The [src.name]'s material bin is full! Please remove material before adding more.")
- return 1
-
- materials.insert_item(O)
- use_power(MINERAL_MATERIAL_AMOUNT/10)
- to_chat(user, "You add [O] to the [src.name].")
- qdel(O)
- updateUsrDialog()
-
- else if(user.a_intent != INTENT_HARM)
- to_chat(user, "You cannot insert this item into the [name]!")
- return 1
- else
- return 0
\ No newline at end of file
+ var/obj/item/stack/S = lit
+ stack_name = initial(S.name)
+ use_power(max(1000, (MINERAL_MATERIAL_AMOUNT * M.last_amount_inserted / 10)))
+ add_overlay("protolathe_[stack_name]")
+ addtimer(CALLBACK(src, /atom/proc/cut_overlay, "protolathe_[stack_name]"), 10)
diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm
index 66a892754d..acce047aad 100644
--- a/code/modules/research/designs/AI_module_designs.dm
+++ b/code/modules/research/designs/AI_module_designs.dm
@@ -104,7 +104,7 @@
/datum/design/board/asimov
name = "Core Module Design (Asimov)"
- desc = "Allows for the construction of a Asimov AI Core Module."
+ desc = "Allows for the construction of an Asimov AI Core Module."
id = "asimov_module"
req_tech = list("programming" = 3, "materials" = 5)
materials = list(MAT_GLASS = 1000, MAT_DIAMOND = 100)
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index a03b8c8127..89adfe8edc 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -203,13 +203,6 @@
materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_GLASS = 1000)
build_path = /obj/item/ammo_box/magazine/wt550m9/wtic
-/datum/design/mag_oldsmg/tx_mag
- name = "WT-550 Auto Gun Uranium Magazine (4.6x30mm TX)"
- desc = "A 20 round uranium tipped magazine for the out of date security WT-550 Auto Rifle"
- id = "mag_oldsmg_tx"
- materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000)
- build_path = /obj/item/ammo_box/magazine/wt550m9/wttx
-
/datum/design/stunshell
name = "Stun Shell"
desc = "A stunning shell for a shotgun."
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index cbbb73652b..4d8938b1b8 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -418,8 +418,9 @@
if(exp == SCANTYPE_OBLITERATE)
visible_message("[exp_on] activates the crushing mechanism, [exp_on] is destroyed!")
if(linked_console.linked_lathe)
+ GET_COMPONENT_FROM(linked_materials, /datum/component/material_container, linked_console.linked_lathe)
for(var/material in exp_on.materials)
- linked_console.linked_lathe.materials.insert_amount( min((linked_console.linked_lathe.materials.max_amount - linked_console.linked_lathe.materials.total_amount), (exp_on.materials[material])), material)
+ linked_materials.insert_amount( min((linked_materials.max_amount - linked_materials.total_amount), (exp_on.materials[material])), material)
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message("[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!")
new /obj/item/stack/sheet/plasteel(get_turf(pick(oview(1,src))))
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index 7a18a5e630..88c902a70d 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -14,7 +14,6 @@ Note: Must be placed west/left of and R&D console to function.
container_type = OPENCONTAINER_1
circuit = /obj/item/circuitboard/machine/protolathe
- var/datum/material_container/materials
var/efficiency_coeff
var/list/categories = list(
@@ -34,11 +33,9 @@ Note: Must be placed west/left of and R&D console to function.
/obj/machinery/r_n_d/protolathe/Initialize()
create_reagents(0)
- materials = new(src, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE))
- return ..()
-
-/obj/machinery/r_n_d/protolathe/Destroy()
- QDEL_NULL(materials)
+ AddComponent(/datum/component/material_container,
+ list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE),
+ FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready))
return ..()
/obj/machinery/r_n_d/protolathe/RefreshParts()
@@ -47,6 +44,7 @@ Note: Must be placed west/left of and R&D console to function.
reagents.maximum_volume += G.volume
G.reagents.trans_to(src, G.reagents.total_volume)
+ GET_COMPONENT(materials, /datum/component/material_container)
materials.max_amount = 0
for(var/obj/item/stock_parts/matter_bin/M in component_parts)
materials.max_amount += M.rating * 75000
@@ -59,6 +57,7 @@ Note: Must be placed west/left of and R&D console to function.
/obj/machinery/r_n_d/protolathe/proc/check_mat(datum/design/being_built, M) // now returns how many times the item can be built with the material
var/list/all_materials = being_built.reagents_list + being_built.materials
+ GET_COMPONENT(materials, /datum/component/material_container)
var/A = materials.amount(M)
if(!A)
A = reagents.get_reagent_amount(M)
@@ -69,6 +68,7 @@ Note: Must be placed west/left of and R&D console to function.
/obj/machinery/r_n_d/protolathe/on_deconstruction()
for(var/obj/item/reagent_containers/glass/G in component_parts)
reagents.trans_to(G, G.reagents.maximum_volume)
+ GET_COMPONENT(materials, /datum/component/material_container)
materials.retrieve_all()
..()
@@ -77,63 +77,20 @@ Note: Must be placed west/left of and R&D console to function.
linked_console.linked_lathe = null
..()
-/obj/machinery/r_n_d/protolathe/Insert_Item(obj/item/O, mob/user)
-
- if(istype(O, /obj/item/stack/sheet))
- . = 1
- if(!is_insertion_ready(user))
+/obj/machinery/r_n_d/protolathe/ComponentActivated(datum/component/C)
+ ..()
+ if(istype(C, /datum/component/material_container))
+ var/datum/component/material_container/M = C
+ if(!M.last_insert_success)
return
- var/sheet_material = materials.get_item_material_amount(O)
- if(!sheet_material)
- return
-
- if(!materials.has_space(sheet_material))
- to_chat(user, "The [src.name]'s material bin is full! Please remove material before adding more.")
- return 1
-
- var/obj/item/stack/sheet/stack = O
- var/amount = round(input("How many sheets do you want to add?") as num)//No decimals
- if(!in_range(src, stack) || !user.Adjacent(src))
- return
- var/amount_inserted = materials.insert_stack(O,amount)
- if(!amount_inserted)
- return 1
+ var/lit = M.last_inserted_type
+ var/stack_name
+ if(ispath(lit, /obj/item/ore/bluespace_crystal))
+ stack_name = "bluespace"
+ use_power(MINERAL_MATERIAL_AMOUNT / 10)
else
- var/stack_name = stack.name
- busy = TRUE
- use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount_inserted/10)))
- to_chat(user, "You add [amount_inserted] sheets to the [src.name].")
- add_overlay("protolathe_[stack_name]")
- sleep(10)
- cut_overlay("protolathe_[stack_name]")
- busy = FALSE
- updateUsrDialog()
-
- else if(istype(O, /obj/item/ore/bluespace_crystal)) //Bluespace crystals can be either a stack or an item
- . = 1
- if(!is_insertion_ready(user))
- return
- var/bs_material = materials.get_item_material_amount(O)
- if(!bs_material)
- return
-
- if(!materials.has_space(bs_material))
- to_chat(user, "The [src.name]'s material bin is full! Please remove material before adding more.")
- return 1
-
- materials.insert_item(O)
- busy = TRUE
- use_power(MINERAL_MATERIAL_AMOUNT/10)
- to_chat(user, "You add [O] to the [src.name].")
- qdel(O)
- add_overlay("protolathe_bluespace")
- sleep(10)
- cut_overlay("protolathe_bluespace")
- busy = FALSE
- updateUsrDialog()
-
- else if(user.a_intent != INTENT_HARM)
- to_chat(user, "You cannot insert this item into the [name]!")
- return 1
- else
- return 0
+ var/obj/item/stack/S = lit
+ stack_name = initial(S.name)
+ use_power(max(1000, (MINERAL_MATERIAL_AMOUNT * M.last_amount_inserted / 10)))
+ add_overlay("protolathe_[stack_name]")
+ addtimer(CALLBACK(src, /atom/proc/cut_overlay, "protolathe_[stack_name]"), 10)
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 2f60e280ec..ee2cba39fd 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -169,6 +169,15 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(href_list["menu"]) //Switches menu screens. Converts a sent text string into a number. Saves a LOT of code.
var/temp_screen = text2num(href_list["menu"])
screen = temp_screen
+
+
+ var/datum/component/material_container/linked_materials
+ if(linked_lathe)
+ linked_materials = linked_lathe.GetComponent(/datum/component/material_container)
+
+ var/datum/component/material_container/imprinter_materials
+ if(linked_imprinter)
+ imprinter_materials = linked_imprinter.GetComponent(/datum/component/material_container)
if(href_list["category"])
selected_category = href_list["category"]
@@ -315,7 +324,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(linked_lathe) //Also sends salvaged materials to a linked protolathe, if any.
for(var/material in linked_destroy.loaded_item.materials)
- linked_lathe.materials.insert_amount(min((linked_lathe.materials.max_amount - linked_lathe.materials.total_amount), (linked_destroy.loaded_item.materials[material]*(linked_destroy.decon_mod/10))), material)
+ linked_materials.insert_amount(min((linked_materials.max_amount - linked_materials.total_amount), (linked_destroy.loaded_item.materials[material]*(linked_destroy.decon_mod/10))), material)
SSblackbox.add_details("item_deconstructed","[linked_destroy.loaded_item.type]")
linked_destroy.loaded_item = null
for(var/obj/I in linked_destroy.contents)
@@ -421,7 +430,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
for(var/MAT in being_built.materials)
efficient_mats[MAT] = being_built.materials[MAT]*coeff
- if(!linked_lathe.materials.has_materials(efficient_mats, amount))
+ if(!linked_materials.has_materials(efficient_mats, amount))
linked_lathe.say("Not enough materials to complete prototype.")
enough_materials = 0
g2g = 0
@@ -433,7 +442,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
g2g = 0
if(enough_materials)
- linked_lathe.materials.use_amount(efficient_mats, amount)
+ linked_materials.use_amount(efficient_mats, amount)
for(var/R in being_built.reagents_list)
linked_lathe.reagents.remove_reagent(R, being_built.reagents_list[R]*coeff)
@@ -497,7 +506,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
for(var/MAT in being_built.materials)
efficient_mats[MAT] = being_built.materials[MAT]/coeff
- if(!linked_imprinter.materials.has_materials(efficient_mats))
+ if(!imprinter_materials.has_materials(efficient_mats))
linked_imprinter.say("Not enough materials to complete prototype.")
enough_materials = 0
g2g = 0
@@ -509,7 +518,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
g2g = 0
if(enough_materials)
- linked_imprinter.materials.use_amount(efficient_mats)
+ imprinter_materials.use_amount(efficient_mats)
for(var/R in being_built.reagents_list)
linked_imprinter.reagents.remove_reagent(R, being_built.reagents_list[R]/coeff)
@@ -536,7 +545,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
linked_lathe.reagents.clear_reagents()
else if(href_list["ejectsheet"] && linked_lathe) //Causes the protolathe to eject a sheet of material
- linked_lathe.materials.retrieve_sheets(text2num(href_list["eject_amt"]), href_list["ejectsheet"])
+ linked_materials.retrieve_sheets(text2num(href_list["eject_amt"]), href_list["ejectsheet"])
//Circuit Imprinter Materials
else if(href_list["disposeI"] && linked_imprinter) //Causes the circuit imprinter to dispose of a single reagent (all of it)
@@ -546,7 +555,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
linked_imprinter.reagents.clear_reagents()
else if(href_list["imprinter_ejectsheet"] && linked_imprinter) //Causes the imprinter to eject a sheet of material
- linked_imprinter.materials.retrieve_sheets(text2num(href_list["eject_amt"]), href_list["imprinter_ejectsheet"])
+ imprinter_materials.retrieve_sheets(text2num(href_list["eject_amt"]), href_list["imprinter_ejectsheet"])
else if(href_list["find_device"]) //The R&D console looks for devices nearby to link up with.
@@ -634,6 +643,14 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(linked_imprinter == null)
screen = 4.0
+
+ var/datum/component/material_container/linked_materials
+ if(linked_lathe)
+ linked_materials = linked_lathe.GetComponent(/datum/component/material_container)
+
+ var/datum/component/material_container/imprinter_materials
+ if(linked_imprinter)
+ imprinter_materials = linked_imprinter.GetComponent(/datum/component/material_container)
switch(screen)
//////////////////////R&D CONSOLE SCREENS//////////////////
@@ -823,7 +840,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "Material Storage"
dat += "Chemical Storage"
dat += " Protolathe Menu:"
- dat += " Material Amount: [linked_lathe.materials.total_amount] / [linked_lathe.materials.max_amount] "
+ dat += " Material Amount: [linked_materials.total_amount] / [linked_materials.max_amount] "
dat += " Chemical Volume: [linked_lathe.reagents.total_volume] / [linked_lathe.reagents.maximum_volume] "
dat += "
|