Stored Material:
")
var/any = FALSE
for(var/M in materials.materials)
@@ -166,7 +169,6 @@ GLOBAL_LIST_EMPTY(silo_access_logs)
return TRUE
else if(href_list["ejectsheet"])
var/datum/material/eject_sheet = locate(href_list["ejectsheet"])
- var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
var/count = materials.retrieve_sheets(text2num(href_list["eject_amt"]), eject_sheet, drop_location())
var/list/matlist = list()
matlist[eject_sheet] = SHEET_MATERIAL_AMOUNT * count
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index 366791c6a01..1635c5c2fa3 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -101,7 +101,12 @@
/obj/machinery/mineral/stacking_machine/Initialize(mapload)
. = ..()
proximity_monitor = new(src, 1)
- materials = AddComponent(/datum/component/remote_materials, "stacking", mapload, FALSE, (mapload && force_connect))
+ materials = AddComponent(
+ /datum/component/remote_materials, \
+ mapload, \
+ FALSE, \
+ (mapload && force_connect) \
+ )
/obj/machinery/mineral/stacking_machine/Destroy()
if(console)
diff --git a/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm b/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm
index ff0b37692bd..8c211151123 100644
--- a/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/adult/adult_update_icons.dm
@@ -67,7 +67,7 @@
if(handcuffed)
var/mutable_appearance/handcuff_overlay = mutable_appearance(dmi_file, cuff_icon, -HANDCUFF_LAYER)
- if(handcuffed.blocks_emissive)
+ if(handcuffed.blocks_emissive != EMISSIVE_BLOCK_NONE)
handcuff_overlay += emissive_blocker(handcuff_overlay.icon, handcuff_overlay.icon_state, src, alpha = handcuff_overlay.alpha)
overlays_standing[HANDCUFF_LAYER] = handcuff_overlay
@@ -86,7 +86,7 @@
if(!itm_state)
itm_state = l_hand.icon_state
var/mutable_appearance/l_hand_item = mutable_appearance(alt_inhands_file, "[itm_state][caste]_l", -HANDS_LAYER)
- if(l_hand.blocks_emissive)
+ if(l_hand.blocks_emissive != EMISSIVE_BLOCK_NONE)
l_hand_item.overlays += emissive_blocker(l_hand_item.icon, l_hand_item.icon_state, src, alpha = l_hand_item.alpha)
hands += l_hand_item
@@ -96,7 +96,7 @@
if(!itm_state)
itm_state = r_hand.icon_state
var/mutable_appearance/r_hand_item = mutable_appearance(alt_inhands_file, "[itm_state][caste]_r", -HANDS_LAYER)
- if(r_hand.blocks_emissive)
+ if(r_hand.blocks_emissive != EMISSIVE_BLOCK_NONE)
r_hand_item.overlays += emissive_blocker(r_hand_item.icon, r_hand_item.icon_state, src, alpha = r_hand_item.alpha)
hands += r_hand_item
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 99e63a54d4a..ef684ed5444 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -66,14 +66,17 @@
else
mode() // Activate held item
-/mob/living/carbon/attackby(obj/item/I, mob/living/user, params)
+/mob/living/carbon/attackby(obj/item/item, mob/living/user, params)
if(!all_wounds || !(!user.combat_mode || user == src))
return ..()
+ if(can_perform_surgery(user, params))
+ return TRUE
+
for(var/i in shuffle(all_wounds))
- var/datum/wound/W = i
- if(W.try_treating(I, user))
- return 1
+ var/datum/wound/wound = i
+ if(wound.try_treating(item, user))
+ return TRUE
return ..()
diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm
index aee3cde3bcc..ba3df70da4c 100644
--- a/code/modules/mob/living/carbon/carbon_update_icons.dm
+++ b/code/modules/mob/living/carbon/carbon_update_icons.dm
@@ -433,7 +433,7 @@
remove_overlay(HANDCUFF_LAYER)
if(handcuffed && !(handcuffed.item_flags & ABSTRACT)) //SKYRAT EDIT ADDED !(handcuffed.item_flags & ABSTRACT)
var/mutable_appearance/handcuff_overlay = mutable_appearance('icons/mob/simple/mob.dmi', "handcuff1", -HANDCUFF_LAYER)
- if(handcuffed.blocks_emissive)
+ if(handcuffed.blocks_emissive != EMISSIVE_BLOCK_NONE)
handcuff_overlay.overlays += emissive_blocker(handcuff_overlay.icon, handcuff_overlay.icon_state, src, alpha = handcuff_overlay.alpha)
overlays_standing[HANDCUFF_LAYER] = handcuff_overlay
@@ -477,7 +477,7 @@
RETURN_TYPE(/list)
. = list()
- if(blocks_emissive)
+ if(blocks_emissive != EMISSIVE_BLOCK_NONE)
. += emissive_blocker(standing.icon, standing.icon_state, src, alpha = standing.alpha)
SEND_SIGNAL(src, COMSIG_ITEM_GET_WORN_OVERLAYS, ., standing, isinhands, icon_file)
diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
index f65d36cfe87..1bda071b63b 100644
--- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -11,6 +11,7 @@
TRAIT_RADIMMUNE,
TRAIT_RESISTCOLD,
TRAIT_NOBLOOD,
+ TRAIT_NO_DNA_COPY,
TRAIT_NO_TRANSFORMATION_STING,
)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 1681da45859..3810618c624 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -389,7 +389,7 @@
if(iscarbon(L))
var/mob/living/carbon/C = L
if(HAS_TRAIT(src, TRAIT_STRONG_GRABBER))
- C.grippedby(src)
+ C.grabbedby(src)
update_pull_movespeed()
@@ -989,6 +989,22 @@
if(body_position == LYING_DOWN && !buckled && prob(getBruteLoss()*200/maxHealth))
makeTrail(newloc, T, old_direction)
+/**
+ * Called by mob/living attackby()
+ * Checks if there's active surgery on the mob that can be continued with the item
+ */
+/mob/living/proc/can_perform_surgery(mob/living/user, params)
+ for(var/datum/surgery/operations as anything in surgeries)
+ if(user.combat_mode)
+ break
+ if(IS_IN_INVALID_SURGICAL_POSITION(src, operations))
+ continue
+ if(!(operations.surgery_flags & SURGERY_SELF_OPERABLE) && (user == src))
+ continue
+ var/list/modifiers = params2list(params)
+ if(operations.next_step(user, modifiers))
+ return TRUE
+ return FALSE
///Called by mob Move() when the lying_angle is different than zero, to better visually simulate crawling.
/mob/living/proc/lying_angle_on_movement(direct)
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index df5a648b69f..d5e1c03be4a 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -206,10 +206,12 @@
/// Is this mob allowed to be buckled/unbuckled to/from things?
var/can_buckle_to = TRUE
- ///The y amount a mob's sprite should be offset due to the current position they're in (e.g. lying down moves your sprite down)
- var/body_position_pixel_x_offset = 0
///The x amount a mob's sprite should be offset due to the current position they're in
+ var/body_position_pixel_x_offset = 0
+ ///The y amount a mob's sprite should be offset due to the current position they're in or size (e.g. lying down moves your sprite down)
var/body_position_pixel_y_offset = 0
+ ///The height offset of a mob's maptext due to their current size.
+ var/body_maptext_height_offset = 0
/// FOV view that is applied from either nativeness or traits
var/fov_view
diff --git a/code/modules/mob/living/living_update_icons.dm b/code/modules/mob/living/living_update_icons.dm
index c82c30d92b3..0da1480de54 100644
--- a/code/modules/mob/living/living_update_icons.dm
+++ b/code/modules/mob/living/living_update_icons.dm
@@ -18,6 +18,10 @@
changed = TRUE
ntransform.Scale(resize)
current_size *= resize
+ //Update the height of the maptext according to the size of the mob so they don't overlap.
+ var/old_maptext_offset = body_maptext_height_offset
+ body_maptext_height_offset = initial(maptext_height) * (current_size - 1)
+ maptext_height += body_maptext_height_offset - old_maptext_offset
//Update final_pixel_y so our mob doesn't go out of the southern bounds of the tile when standing
if(!lying_angle || !rotate_on_lying) //But not if the mob has been rotated.
//Make sure the body position y offset is also updated
diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm
index dafd0f95cd3..efd53cdb14e 100644
--- a/code/modules/mob/living/silicon/robot/robot_model.dm
+++ b/code/modules/mob/living/silicon/robot/robot_model.dm
@@ -897,11 +897,14 @@
/obj/item/surgicaldrill,
/obj/item/scalpel,
/obj/item/melee/energy/sword/cyborg/saw,
+ /obj/item/bonesetter,
+ /obj/item/blood_filter,
/obj/item/roller/robo,
/obj/item/crowbar/cyborg,
/obj/item/extinguisher/mini,
/obj/item/pinpointer/syndicate_cyborg,
/obj/item/stack/medical/gauze,
+ /obj/item/stack/medical/bone_gel,
/obj/item/gun/medbeam,
/obj/item/borg/apparatus/organ_storage,
)
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index f8277895ffc..2fec84385b2 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -233,7 +233,7 @@ GLOBAL_LIST_INIT(animatable_blacklist, list(/obj/structure/table, /obj/structure
projectiletype = initial(M.projectile_type)
if(istype(G, /obj/item/gun/ballistic))
Pewgun = G
- var/obj/item/ammo_box/magazine/M = Pewgun.mag_type
+ var/obj/item/ammo_box/magazine/M = Pewgun.spawn_magazine_type
casingtype = initial(M.ammo_type)
if(istype(G, /obj/item/gun/energy))
Zapgun = G
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index a97683ca59f..fab4b2a6b0f 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -726,10 +726,22 @@
COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON = PROC_REF(on_atom_initialized_on),
)
var/datum/component/connect_loc_behalf/connector
+ var/datum/component/material_container/container
/obj/item/mod/module/recycler/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/material_container, accepted_mats, 50 * SHEET_MATERIAL_AMOUNT, MATCONTAINER_EXAMINE|MATCONTAINER_NO_INSERT, _after_retrieve=CALLBACK(src, PROC_REF(attempt_insert_storage)))
+ container = AddComponent( \
+ /datum/component/material_container, \
+ accepted_mats, 50 * SHEET_MATERIAL_AMOUNT, \
+ MATCONTAINER_EXAMINE|MATCONTAINER_NO_INSERT, \
+ container_signals = list( \
+ COMSIG_MATCONTAINER_SHEETS_RETRIVED = TYPE_PROC_REF(/obj/item/mod/module/recycler, InsertSheets) \
+ ) \
+ )
+
+/obj/item/mod/module/recycler/Destroy()
+ container = null
+ return ..()
/obj/item/mod/module/recycler/on_activation()
. = ..()
@@ -747,6 +759,7 @@
/obj/item/mod/module/recycler/proc/on_wearer_moved(datum/source, atom/old_loc, dir, forced)
SIGNAL_HANDLER
+
for(var/obj/item/item in mod.wearer.loc)
if(!is_type_in_list(item, allowed_item_types))
return
@@ -754,12 +767,14 @@
/obj/item/mod/module/recycler/proc/on_obj_entered(atom/new_loc, atom/movable/arrived, atom/old_loc)
SIGNAL_HANDLER
+
if(!is_type_in_list(arrived, allowed_item_types))
return
insert_trash(arrived)
/obj/item/mod/module/recycler/proc/on_atom_initialized_on(atom/loc, atom/new_atom)
SIGNAL_HANDLER
+
if(!is_type_in_list(new_atom, allowed_item_types))
return
//Give the new atom the time to fully initialize and maybe live if the wearer moves away.
@@ -770,7 +785,6 @@
insert_trash(new_atom)
/obj/item/mod/module/recycler/proc/insert_trash(obj/item/item)
- var/datum/component/material_container/container = GetComponent(/datum/component/material_container)
var/retrieved = container.insert_item(item, multiplier = efficiency, breakdown_flags = BREAKDOWN_FLAGS_RECYCLER)
if(retrieved == MATERIAL_INSERT_ITEM_NO_MATS) //even if it doesn't have any material to give, trash is trash.
qdel(item)
@@ -787,7 +801,6 @@
dispense(target)
/obj/item/mod/module/recycler/proc/dispense(atom/target)
- var/datum/component/material_container/container = GetComponent(/datum/component/material_container)
if(container.retrieve_all(target))
balloon_alert(mod.wearer, "material dispensed")
playsound(src, 'sound/machines/microwave/microwave-end.ogg', 50, TRUE)
@@ -795,6 +808,11 @@
balloon_alert(mod.wearer, "not enough material")
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE)
+/obj/item/mod/module/recycler/proc/InsertSheets(obj/item/recycler, obj/item/stack/sheets)
+ SIGNAL_HANDLER
+
+ attempt_insert_storage(sheets)
+
/obj/item/mod/module/recycler/proc/attempt_insert_storage(obj/item/to_drop)
if(!isturf(to_drop.loc) && !to_drop.loc.atom_storage?.attempt_insert(to_drop, mod.wearer, override = TRUE))
to_drop.forceMove(to_drop.loc.drop_location())
@@ -815,7 +833,6 @@
var/required_amount = SHEET_MATERIAL_AMOUNT*12.5
/obj/item/mod/module/recycler/donk/dispense(atom/target)
- var/datum/component/material_container/container = GetComponent(/datum/component/material_container)
if(!container.use_amount_mat(required_amount, /datum/material/iron))
balloon_alert(mod.wearer, "not enough material")
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE)
diff --git a/code/modules/modular_computers/file_system/programs/jobmanagement.dm b/code/modules/modular_computers/file_system/programs/jobmanagement.dm
index d3c0423ce1c..973dbf3c764 100644
--- a/code/modules/modular_computers/file_system/programs/jobmanagement.dm
+++ b/code/modules/modular_computers/file_system/programs/jobmanagement.dm
@@ -14,21 +14,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
program_icon = "address-book"
var/change_position_cooldown = 30
- ///Jobs blacklisted from having their slots edited.
- var/static/list/blacklisted = list(
- JOB_CAPTAIN,
- JOB_HEAD_OF_PERSONNEL,
- JOB_HEAD_OF_SECURITY,
- JOB_RESEARCH_DIRECTOR,
- JOB_CLOWN, // SKYRAT EDIT ADD START
- JOB_BLUESHIELD,
- JOB_NT_REP, // SKYRAT EDIT ADD END
- JOB_CHIEF_ENGINEER,
- JOB_CHIEF_MEDICAL_OFFICER,
- JOB_AI,
- JOB_CYBORG,
- JOB_ASSISTANT,
- )
//The scaling factor of max total positions in relation to the total amount of people on board the station in %
var/max_relative_positions = 30 //30%: Seems reasonable, limit of 6 @ 20 players
@@ -43,14 +28,20 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
/datum/computer_file/program/job_management/proc/can_edit_job(datum/job/job)
- if(!job || !(job.job_flags & JOB_CREW_MEMBER) || (job.title in blacklisted) || job.veteran_only) //SKYRAT EDIT CHAGNE
+ if(!istype(job))
return FALSE
+ if(!(job.job_flags & JOB_CREW_MEMBER))
+ return FALSE
+ if(job.job_flags & JOB_CANNOT_OPEN_SLOTS)
+ return FALSE
+ // SKYRAT EDIT ADDITION START
+ if(job.veteran_only)
+ return FALSE
+ // SKYRAT EDIT ADDITION END
return TRUE
/datum/computer_file/program/job_management/proc/can_open_job(datum/job/job)
- if(!can_edit_job(job))
- return FALSE
if((job.total_positions <= length(GLOB.player_list) * (max_relative_positions / 100)))
var/delta = (world.time / 10) - GLOB.time_last_changed_position
if((change_position_cooldown < delta) || (opened_positions[job.title] < 0))
@@ -59,8 +50,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
/datum/computer_file/program/job_management/proc/can_close_job(datum/job/job)
- if(!can_edit_job(job))
- return FALSE
if(job.total_positions > length(GLOB.player_list) * (max_relative_positions / 100))
var/delta = (world.time / 10) - GLOB.time_last_changed_position
if((change_position_cooldown < delta) || (opened_positions[job.title] > 0))
@@ -77,7 +66,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
if("PRG_open_job")
var/edit_job_target = params["target"]
var/datum/job/j = SSjob.GetJob(edit_job_target)
- if(!j || !can_open_job(j))
+ if(!can_edit_job(j) || !can_open_job(j))
return TRUE
if(opened_positions[edit_job_target] >= 0)
GLOB.time_last_changed_position = world.time / 10
@@ -89,7 +78,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
if("PRG_close_job")
var/edit_job_target = params["target"]
var/datum/job/j = SSjob.GetJob(edit_job_target)
- if(!j || !can_close_job(j))
+ if(!can_edit_job(j) || !can_close_job(j))
return TRUE
//Allow instant closing without cooldown if a position has been opened before
if(opened_positions[edit_job_target] <= 0)
@@ -102,7 +91,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
if("PRG_priority")
var/priority_target = params["target"]
var/datum/job/j = SSjob.GetJob(priority_target)
- if(!j || !can_edit_job(j))
+ if(!can_edit_job(j))
return TRUE
if(j.total_positions <= j.current_positions)
return TRUE
@@ -130,7 +119,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
var/list/pos = list()
var/list/priority = list()
for(var/datum/job/job as anything in SSjob.joinable_occupations)
- if(job.title in blacklisted)
+ if(!can_edit_job(job))
continue
if(job in SSjob.prioritized_jobs)
priority += job.title
@@ -147,4 +136,3 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
var/delta = round(change_position_cooldown - ((world.time / 10) - GLOB.time_last_changed_position), 1)
data["cooldown"] = delta < 0 ? 0 : delta
return data
-
diff --git a/code/modules/power/lighting/light_mapping_helpers.dm b/code/modules/power/lighting/light_mapping_helpers.dm
index 89b04ed6812..a2171c8897c 100644
--- a/code/modules/power/lighting/light_mapping_helpers.dm
+++ b/code/modules/power/lighting/light_mapping_helpers.dm
@@ -16,6 +16,10 @@
/obj/machinery/light/warm/no_nightlight
nightshift_allowed = FALSE
+/obj/machinery/light/warm/dim
+ nightshift_allowed = FALSE
+ bulb_power = 0.6
+
/obj/machinery/light/cold
bulb_colour = LIGHT_COLOR_FAINT_BLUE
nightshift_light_color = LIGHT_COLOR_FAINT_BLUE
@@ -23,6 +27,10 @@
/obj/machinery/light/cold/no_nightlight
nightshift_allowed = FALSE
+/obj/machinery/light/cold/dim
+ nightshift_allowed = FALSE
+ bulb_power = 0.6
+
/obj/machinery/light/red
bulb_colour = "#FF3232"
nightshift_allowed = FALSE
@@ -108,12 +116,18 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/warm, 0)
// ---- No nightlight warm light tubes
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/warm/no_nightlight, 0)
+// ---- Dim warm light tubes
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/warm/dim, 0)
+
// ---- Cold light tubes
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/cold, 0)
// ---- No nightlight cold light tubes
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/cold/no_nightlight, 0)
+// ---- Dim cold light tubes
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/cold/dim, 0)
+
// ---- Red tubes
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/red, 0)
diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm
index 4edd7d79d66..ac24b109913 100644
--- a/code/modules/power/powernet.dm
+++ b/code/modules/power/powernet.dm
@@ -95,13 +95,7 @@
newavail = 0
/datum/powernet/proc/get_electrocute_damage()
- //SKYRAT EDIT BEGIN: Declamps burn damage w/ new effects. Original code: return clamp(20 + round(avail/25000), 20, 195) + rand(-5,5)
- if(avail >= 1000 && avail <= 15000)
- return round(avail/45000) + rand(-30,2) //Slight buff. Weaker electrical currents are somewhat mitigated.
- if(avail >= 15000)
- return round(avail/15000) + rand(-5,10) //You're dead.
- if(avail >= 20000)
- return round(avail/10000) + rand(0,20) //You're VERY dead.
- //SKYRAT EDIT END
+ if(avail >= 1000)
+ return clamp(20 + round(avail/25000), 20, 195) + rand(-5,5)
else
return 0
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 0cc80fa45a3..e39ed1ece03 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -47,10 +47,12 @@
///Whether our gun clicks when it approaches an empty magazine/chamber
var/click_on_low_ammo = TRUE
- ///Whether the gun will spawn loaded with a magazine
+ /// What type (includes subtypes) of magazine will this gun accept being put into it
+ var/obj/item/ammo_box/magazine/accepted_magazine_type = /obj/item/ammo_box/magazine/m10mm
+ /// Whether the gun will spawn loaded with a magazine
var/spawnwithmagazine = TRUE
- ///Compatible magazines with the gun
- var/obj/item/ammo_box/magazine/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info
+ /// Change this if the gun should spawn with a different magazine type to what accepted_magazine_type defines. Will create errors if not a type or subtype of accepted magazine.
+ var/obj/item/ammo_box/magazine/spawn_magazine_type
///Whether the sprite has a visible magazine or not
var/mag_display = TRUE
///Whether the sprite has a visible ammo display or not
@@ -130,12 +132,16 @@
/obj/item/gun/ballistic/Initialize(mapload)
. = ..()
+ if(!spawn_magazine_type)
+ spawn_magazine_type = accepted_magazine_type
if (!spawnwithmagazine)
bolt_locked = TRUE
update_appearance()
return
if (!magazine)
- magazine = new mag_type(src)
+ magazine = new spawn_magazine_type(src)
+ if(!istype(magazine, accepted_magazine_type))
+ CRASH("[src] spawned with a magazine type that isn't allowed by its accepted_magazine_type!")
if(bolt_type == BOLT_TYPE_STANDARD || internal_magazine) //Internal magazines shouldn't get magazine + 1.
chamber_round()
else
@@ -151,7 +157,7 @@
AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_notes_ballistic))
/obj/item/gun/ballistic/fire_sounds()
- var/max_ammo = magazine?.max_ammo || initial(mag_type.max_ammo)
+ var/max_ammo = magazine?.max_ammo || initial(spawn_magazine_type.max_ammo)
var/current_ammo = get_ammo()
var/frequency_to_use = sin((90 / max_ammo) * current_ammo)
var/click_frequency_to_use = 1 - frequency_to_use * 0.75
@@ -303,7 +309,7 @@
///Handles all the logic needed for magazine insertion
/obj/item/gun/ballistic/proc/insert_magazine(mob/user, obj/item/ammo_box/magazine/AM, display_message = TRUE)
- if(!istype(AM, mag_type))
+ if(!istype(AM, accepted_magazine_type))
balloon_alert(user, "[AM.name] doesn't fit!")
return FALSE
if(user.transferItemToLoc(AM, src))
@@ -702,9 +708,9 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
if(magazine)
magazine.top_off()
else
- if(!mag_type)
+ if(!spawn_magazine_type)
return
- magazine = new mag_type(src)
+ magazine = new spawn_magazine_type(src)
chamber_round()
update_appearance()
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index 74305fb811d..16b1b787366 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -53,7 +53,7 @@
actions_types = list()
mag_display = TRUE
empty_indicator = TRUE
- mag_type = /obj/item/ammo_box/magazine/smgm9mm
+ accepted_magazine_type = /obj/item/ammo_box/magazine/smgm9mm
pin = null
bolt_type = BOLT_TYPE_LOCKING
show_bolt_icon = FALSE
@@ -71,7 +71,7 @@
icon_state = "c20r"
inhand_icon_state = "c20r"
selector_switch_icon = TRUE
- mag_type = /obj/item/ammo_box/magazine/smgm45
+ accepted_magazine_type = /obj/item/ammo_box/magazine/smgm45
fire_delay = 2
burst_size = 3
pin = /obj/item/firing_pin/implant/pindicate
@@ -104,7 +104,7 @@
icon_state = "wt550"
w_class = WEIGHT_CLASS_BULKY
inhand_icon_state = "arg"
- mag_type = /obj/item/ammo_box/magazine/wt550m9
+ accepted_magazine_type = /obj/item/ammo_box/magazine/wt550m9
fire_delay = 2
can_suppress = FALSE
burst_size = 1
@@ -125,7 +125,7 @@
desc = "An ancient 9mm submachine gun pattern updated and simplified to lower costs, though perhaps simplified too much."
icon_state = "plastikov"
inhand_icon_state = "plastikov"
- mag_type = /obj/item/ammo_box/magazine/plastikov9mm
+ accepted_magazine_type = /obj/item/ammo_box/magazine/plastikov9mm
burst_size = 5
spread = 25
can_suppress = FALSE
@@ -139,7 +139,7 @@
name = "\improper Type U3 Uzi"
desc = "A lightweight, burst-fire submachine gun, for when you really want someone dead. Uses 9mm rounds."
icon_state = "miniuzi"
- mag_type = /obj/item/ammo_box/magazine/uzim9mm
+ accepted_magazine_type = /obj/item/ammo_box/magazine/uzim9mm
burst_size = 2
bolt_type = BOLT_TYPE_OPEN
show_bolt_icon = FALSE
@@ -154,7 +154,7 @@
w_class = WEIGHT_CLASS_BULKY
inhand_icon_state = "m90"
selector_switch_icon = TRUE
- mag_type = /obj/item/ammo_box/magazine/m556
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m556
can_suppress = FALSE
var/obj/item/gun/ballistic/revolver/grenadelauncher/underbarrel
burst_size = 3
@@ -210,7 +210,7 @@
selector_switch_icon = TRUE
w_class = WEIGHT_CLASS_BULKY
slot_flags = 0
- mag_type = /obj/item/ammo_box/magazine/tommygunm45
+ accepted_magazine_type = /obj/item/ammo_box/magazine/tommygunm45
can_suppress = FALSE
burst_size = 1
actions_types = list()
@@ -229,7 +229,7 @@
icon_state = "arg"
inhand_icon_state = "arg"
slot_flags = 0
- mag_type = /obj/item/ammo_box/magazine/m556
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m556
can_suppress = FALSE
burst_size = 3
fire_delay = 1
@@ -244,7 +244,7 @@
base_icon_state = "l6"
w_class = WEIGHT_CLASS_HUGE
slot_flags = 0
- mag_type = /obj/item/ammo_box/magazine/mm712x82
+ accepted_magazine_type = /obj/item/ammo_box/magazine/mm712x82
weapon_weight = WEAPON_HEAVY
burst_size = 1
actions_types = list()
@@ -314,7 +314,7 @@
..()
/obj/item/gun/ballistic/automatic/l6_saw/attackby(obj/item/A, mob/user, params)
- if(!cover_open && istype(A, mag_type))
+ if(!cover_open && istype(A, accepted_magazine_type))
balloon_alert(user, "open the cover!")
return
..()
@@ -332,7 +332,7 @@
inhand_y_dimension = 64
worn_icon_state = null
weapon_weight = WEAPON_HEAVY
- mag_type = /obj/item/ammo_box/magazine/m10mm/rifle
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m10mm/rifle
fire_delay = 30
burst_size = 1
can_unsuppress = TRUE
@@ -350,7 +350,7 @@
icon_state = "oldrifle"
w_class = WEIGHT_CLASS_BULKY
inhand_icon_state = "arg"
- mag_type = /obj/item/ammo_box/magazine/recharge
+ accepted_magazine_type = /obj/item/ammo_box/magazine/recharge
empty_indicator = TRUE
fire_delay = 2
can_suppress = FALSE
diff --git a/code/modules/projectiles/guns/ballistic/bows/_bow.dm b/code/modules/projectiles/guns/ballistic/bows/_bow.dm
index 6d560804368..dc20a502592 100644
--- a/code/modules/projectiles/guns/ballistic/bows/_bow.dm
+++ b/code/modules/projectiles/guns/ballistic/bows/_bow.dm
@@ -10,7 +10,7 @@
base_icon_state = "bow"
load_sound = 'sound/weapons/gun/general/ballistic_click.ogg'
fire_sound = 'sound/weapons/gun/bow/bow_fire.ogg'
- mag_type = /obj/item/ammo_box/magazine/internal/bow
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/bow
force = 15
pinless = TRUE
attack_verb_continuous = list("whipped", "cracked")
diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_types.dm b/code/modules/projectiles/guns/ballistic/bows/bow_types.dm
index 2acdb20d454..355ed3575a8 100644
--- a/code/modules/projectiles/guns/ballistic/bows/bow_types.dm
+++ b/code/modules/projectiles/guns/ballistic/bows/bow_types.dm
@@ -14,7 +14,7 @@
worn_icon_state = "holybow"
slot_flags = ITEM_SLOT_BACK
obj_flags = UNIQUE_RENAME
- mag_type = /obj/item/ammo_box/magazine/internal/bow/holy
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/bow/holy
/obj/item/ammo_box/magazine/internal/bow/holy
name = "divine bowstring"
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index be81a0bfdab..82282d2efe6 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -6,7 +6,7 @@
name = "grenade launcher"
icon_state = "dshotgun_sawn"
inhand_icon_state = "gun"
- mag_type = /obj/item/ammo_box/magazine/internal/grenadelauncher
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/grenadelauncher
fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg'
w_class = WEIGHT_CLASS_NORMAL
pin = /obj/item/firing_pin/implant/pindicate
@@ -25,7 +25,7 @@
name = "multi grenade launcher"
icon = 'icons/mob/mecha_equipment.dmi'
icon_state = "mecha_grenadelnchr"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/grenademulti
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/grenademulti
pin = /obj/item/firing_pin
/obj/item/gun/ballistic/revolver/grenadelauncher/cyborg/attack_self()
@@ -36,7 +36,7 @@
desc = "A prototype pistol designed to fire self propelled rockets."
icon_state = "gyropistol"
fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg'
- mag_type = /obj/item/ammo_box/magazine/m75
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m75
burst_size = 1
fire_delay = 0
casing_ejector = FALSE
@@ -47,7 +47,7 @@
A sticker near the cheek rest reads, \"ENSURE AREA BEHIND IS CLEAR BEFORE FIRING\""
icon_state = "rocketlauncher"
inhand_icon_state = "rocketlauncher"
- mag_type = /obj/item/ammo_box/magazine/internal/rocketlauncher
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/rocketlauncher
fire_sound = 'sound/weapons/gun/general/rocket_launch.ogg'
w_class = WEIGHT_CLASS_BULKY
can_suppress = FALSE
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index 83d172d73b2..220df569ecb 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -4,7 +4,7 @@
desc = "A small, easily concealable 9x25mm Mk.12 handgun. Has a threaded barrel for suppressors." // SKYRAT EDIT: Calibre rename
icon_state = "pistol"
w_class = WEIGHT_CLASS_SMALL
- mag_type = /obj/item/ammo_box/magazine/m9mm
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m9mm
can_suppress = TRUE
burst_size = 1
fire_delay = 0
@@ -29,7 +29,7 @@
spawnwithmagazine = FALSE
/obj/item/gun/ballistic/automatic/pistol/fire_mag
- mag_type = /obj/item/ammo_box/magazine/m9mm/fire
+ spawn_magazine_type = /obj/item/ammo_box/magazine/m9mm/fire
/obj/item/gun/ballistic/automatic/pistol/suppressed/Initialize(mapload)
. = ..()
@@ -40,7 +40,7 @@
name = "\improper Ansem pistol"
desc = "The spiritual successor of the Makarov, or maybe someone just dropped their gun in a bucket of paint. The gun is chambered in 10mm."
icon_state = "pistol_evil"
- mag_type = /obj/item/ammo_box/magazine/m10mm
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m10mm
empty_indicator = TRUE
suppressor_x_offset = 12
@@ -49,7 +49,7 @@
desc = "A classic .45 handgun with a small magazine capacity."
icon_state = "m1911"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/m45
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m45
can_suppress = FALSE
fire_sound = 'sound/weapons/gun/pistol/shot_alt.ogg'
rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
@@ -64,7 +64,7 @@
desc = "A robust .50 AE handgun."
icon_state = "deagle"
force = 14
- mag_type = /obj/item/ammo_box/magazine/m50
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m50
can_suppress = FALSE
mag_display = TRUE
fire_sound = 'sound/weapons/gun/rifle/shot.ogg'
@@ -95,7 +95,7 @@
burst_size = 2
fire_delay = 1
projectile_damage_multiplier = 1.25
- mag_type = /obj/item/ammo_box/magazine/r10mm
+ accepted_magazine_type = /obj/item/ammo_box/magazine/r10mm
actions_types = list(/datum/action/item_action/toggle_firemode)
obj_flags = UNIQUE_RENAME // if you did the sidequest, you get the customization
@@ -107,7 +107,7 @@
desc = "A modernized reproduction of an old Soviet machine pistol. It fires quickly, but kicks like a mule. Uses 9mm ammo. Has a threaded barrel for suppressors." //SKYRAT EDIT
icon_state = "aps"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/m9mm_aps
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m9mm_aps
can_suppress = TRUE
burst_size = 3
fire_delay = 3 //SKYRAT EDIT - Original: 1
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 16d2408be02..f77288f9b24 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -2,7 +2,7 @@
name = "\improper .357 revolver"
desc = "A suspicious revolver. Uses .357 ammo."
icon_state = "revolver"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder
fire_sound = 'sound/weapons/gun/revolver/shot_alt.ogg'
load_sound = 'sound/weapons/gun/revolver/load_bullet.ogg'
eject_sound = 'sound/weapons/gun/revolver/empty.ogg'
@@ -100,7 +100,7 @@
/obj/item/gun/ballistic/revolver/c38
name = "\improper .38 revolver"
desc = "A classic, if not outdated, lethal firearm. Uses .38 Special rounds."
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
icon_state = "c38"
fire_sound = 'sound/weapons/gun/revolver/shot.ogg'
@@ -154,7 +154,7 @@
icon_state = "nagant"
can_suppress = TRUE
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev762
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev762
// A gun to play Russian Roulette!
@@ -164,7 +164,7 @@
name = "\improper Russian revolver"
desc = "A Russian-made revolver for drinking games. Uses .357 ammo, and has a mechanism requiring you to spin the chamber before each trigger pull."
icon_state = "russianrevolver"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357
var/spun = FALSE
hidden_chambered = TRUE //Cheater.
gun_flags = NOT_A_REAL_GUN
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 28e5e7dc1d4..04e78453b22 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -10,7 +10,7 @@
w_class = WEIGHT_CLASS_BULKY
inhand_icon_state = "moistnugget"
worn_icon_state = "moistnugget"
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction
bolt_wording = "bolt"
bolt_type = BOLT_TYPE_LOCKING
semi_auto = FALSE
@@ -58,7 +58,7 @@
icon_state = "moistnugget"
inhand_icon_state = "moistnugget"
slot_flags = ITEM_SLOT_BACK
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction
can_bayonet = TRUE
knife_x_offset = 37
knife_y_offset = 14
@@ -131,7 +131,7 @@
inhand_y_dimension = 32
inhand_icon_state = "speargun"
worn_icon_state = "speargun"
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction/harpoon
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/harpoon
fire_sound = 'sound/weapons/gun/sniper/shot.ogg'
can_be_sawn_off = FALSE
@@ -147,7 +147,7 @@
Tiger Co-op assassins, cryo-frozen Space Russians, and security personnel with \
little care for professional conduct while making 'arrests' point blank in the back of the head \
until the gun clicks. EXTREMELY moist."
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction/surplus
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/surplus
can_jam = TRUE
/obj/item/gun/ballistic/rifle/boltaction/prime
@@ -178,7 +178,7 @@
inhand_x_dimension = 64
inhand_y_dimension = 64
fire_sound = 'sound/weapons/gun/sniper/shot.ogg'
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun
initial_caliber = CALIBER_SHOTGUN
alternative_caliber = CALIBER_A762
initial_fire_sound = 'sound/weapons/gun/sniper/shot.ogg'
@@ -199,7 +199,7 @@
icon_state = "musket_prime"
inhand_icon_state = "musket_prime"
worn_icon_state = "musket_prime"
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun/prime
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun/prime
projectile_damage_multiplier = 1
/// MAGICAL BOLT ACTIONS + ARCANE BARRAGE? ///
@@ -208,7 +208,7 @@
name = "enchanted bolt action rifle"
desc = "Careful not to lose your head."
var/guns_left = 30
- mag_type = /obj/item/ammo_box/magazine/internal/enchanted
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/enchanted
can_be_sawn_off = FALSE
/obj/item/gun/ballistic/rifle/enchanted/dropped()
@@ -258,7 +258,7 @@
rack_sound = 'sound/weapons/gun/sniper/rack.ogg'
suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
recoil = 2
- mag_type = /obj/item/ammo_box/magazine/sniper_rounds
+ accepted_magazine_type = /obj/item/ammo_box/magazine/sniper_rounds
internal_magazine = FALSE
w_class = WEIGHT_CLASS_NORMAL
slot_flags = ITEM_SLOT_BACK
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 626de9fe2c5..654acc12ad4 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -16,7 +16,7 @@
force = 10
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
- mag_type = /obj/item/ammo_box/magazine/internal/shot
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot
semi_auto = FALSE
internal_magazine = TRUE
casing_ejector = FALSE
@@ -34,7 +34,7 @@
. = 1
/obj/item/gun/ballistic/shotgun/lethal
- mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/lethal
// RIOT SHOTGUN //
@@ -44,7 +44,7 @@
icon_state = "riotshotgun"
inhand_icon_state = "shotgun"
fire_delay = 8
- mag_type = /obj/item/ammo_box/magazine/internal/shot/riot
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/riot
sawn_desc = "Come with me if you want to live."
can_be_sawn_off = TRUE
@@ -60,7 +60,7 @@
icon_state = "cshotgun"
inhand_icon_state = "shotgun_combat"
fire_delay = 5
- mag_type = /obj/item/ammo_box/magazine/internal/shot/com
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/com
w_class = WEIGHT_CLASS_HUGE
//Dual Feed Shotgun
@@ -77,7 +77,7 @@
worn_icon_state = "cshotgun"
w_class = WEIGHT_CLASS_HUGE
semi_auto = TRUE
- mag_type = /obj/item/ammo_box/magazine/internal/shot/tube
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/tube
/// If defined, the secondary tube is this type, if you want different shell loads
var/alt_mag_type
/// If TRUE, we're drawing from the alternate_magazine
@@ -96,7 +96,7 @@
/obj/item/gun/ballistic/shotgun/automatic/dual_tube/Initialize(mapload)
. = ..()
- alt_mag_type = alt_mag_type || mag_type
+ alt_mag_type = alt_mag_type || spawn_magazine_type
alternate_magazine = new alt_mag_type(src)
/obj/item/gun/ballistic/shotgun/automatic/dual_tube/Destroy()
@@ -139,7 +139,7 @@
inhand_y_dimension = 32
projectile_damage_multiplier = 1.2
weapon_weight = WEAPON_MEDIUM
- mag_type = /obj/item/ammo_box/magazine/m12g
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m12g
can_suppress = FALSE
burst_size = 1
fire_delay = 10 //Skyrat edit - Original: 0
@@ -160,7 +160,7 @@
/obj/item/gun/ballistic/shotgun/bulldog/Initialize(mapload)
. = ..()
- secondary_magazine_type = secondary_magazine_type || mag_type
+ secondary_magazine_type = secondary_magazine_type || spawn_magazine_type
secondary_magazine = new secondary_magazine_type(src)
update_appearance()
@@ -259,7 +259,7 @@
force = 10
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
- mag_type = /obj/item/ammo_box/magazine/internal/shot/dual
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/dual
sawn_desc = "Omar's coming!"
obj_flags = UNIQUE_RENAME
rack_sound_volume = 0
@@ -289,13 +289,13 @@
name = "hunting shotgun"
desc = "A hunting shotgun used by the wealthy to hunt \"game\"."
sawn_desc = "A sawn-off hunting shotgun. In its new state, it's remarkably less effective at hunting... anything."
- mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/slugs
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/dual/slugs
/obj/item/gun/ballistic/shotgun/doublebarrel/breacherslug
name = "breaching shotgun"
desc = "A normal double-barrel shotgun that has been rechambered to fit breaching shells. Useful in breaching airlocks and windows, not much else."
sawn_desc = "A sawn-off breaching shotgun, making for a more compact configuration while still having the same capability as before."
- mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/breacherslug
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/dual/breacherslug
/obj/item/gun/ballistic/shotgun/hook
name = "hook modified sawn-off shotgun"
@@ -306,7 +306,7 @@
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
inhand_x_dimension = 32
inhand_y_dimension = 32
- mag_type = /obj/item/ammo_box/magazine/internal/shot/bounty
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/bounty
weapon_weight = WEAPON_MEDIUM
semi_auto = TRUE
flags_1 = CONDUCT_1
diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm
index bd0c75e34b7..237d7cbbb10 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -4,7 +4,7 @@
icon_state = "saber"
selector_switch_icon = TRUE
inhand_icon_state = "gun"
- mag_type = /obj/item/ammo_box/magazine/toy/smg
+ accepted_magazine_type = /obj/item/ammo_box/magazine/toy/smg
fire_sound = 'sound/items/syringeproj.ogg'
force = 0
throwforce = 0
@@ -21,12 +21,12 @@
/obj/item/gun/ballistic/automatic/pistol/toy
name = "foam force pistol"
desc = "A small, easily concealable toy handgun. Ages 8 and up."
- mag_type = /obj/item/ammo_box/magazine/toy/pistol
+ accepted_magazine_type = /obj/item/ammo_box/magazine/toy/pistol
fire_sound = 'sound/items/syringeproj.ogg'
gun_flags = TOY_FIREARM_OVERLAY | NOT_A_REAL_GUN
/obj/item/gun/ballistic/automatic/pistol/toy/riot
- mag_type = /obj/item/ammo_box/magazine/toy/pistol/riot
+ spawn_magazine_type = /obj/item/ammo_box/magazine/toy/pistol/riot
/obj/item/gun/ballistic/automatic/pistol/riot/Initialize(mapload)
magazine = new /obj/item/ammo_box/magazine/toy/pistol/riot(src)
@@ -37,7 +37,7 @@
desc = "A toy shotgun with wood furniture and a four-shell capacity underneath. Ages 8 and up."
force = 0
throwforce = 0
- mag_type = /obj/item/ammo_box/magazine/internal/shot/toy
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/toy
fire_sound = 'sound/items/syringeproj.ogg'
clumsy_check = FALSE
item_flags = NONE
@@ -67,7 +67,7 @@
inhand_y_dimension = 32
worn_icon_state = "gun"
worn_icon = null
- mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow
fire_sound = 'sound/items/syringeproj.ogg'
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
@@ -78,17 +78,18 @@
desc = "A bullpup three-round burst toy SMG, designated 'C-20r'. Ages 8 and up."
can_suppress = TRUE
item_flags = NONE
- mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
+ accepted_magazine_type = /obj/item/ammo_box/magazine/toy/smgm45
+ spawn_magazine_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
casing_ejector = FALSE
clumsy_check = FALSE
gun_flags = TOY_FIREARM_OVERLAY | NOT_A_REAL_GUN
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted //Use this for actual toys
pin = /obj/item/firing_pin
- mag_type = /obj/item/ammo_box/magazine/toy/smgm45
+ spawn_magazine_type = /obj/item/ammo_box/magazine/toy/smgm45
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot
- mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
+ spawn_magazine_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
/obj/item/gun/ballistic/automatic/l6_saw/toy //This is the syndicate variant with syndicate firing pin and riot darts.
name = "donksoft LMG"
@@ -96,14 +97,15 @@
fire_sound = 'sound/items/syringeproj.ogg'
can_suppress = FALSE
item_flags = NONE
- mag_type = /obj/item/ammo_box/magazine/toy/m762/riot
+ accepted_magazine_type = /obj/item/ammo_box/magazine/toy/m762
+ spawn_magazine_type = /obj/item/ammo_box/magazine/toy/m762/riot
casing_ejector = FALSE
clumsy_check = FALSE
gun_flags = TOY_FIREARM_OVERLAY | NOT_A_REAL_GUN
/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted //Use this for actual toys
pin = /obj/item/firing_pin
- mag_type = /obj/item/ammo_box/magazine/toy/m762
+ spawn_magazine_type = /obj/item/ammo_box/magazine/toy/m762
/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/riot
- mag_type = /obj/item/ammo_box/magazine/toy/m762/riot
+ spawn_magazine_type = /obj/item/ammo_box/magazine/toy/m762/riot
diff --git a/code/modules/religion/burdened/psyker.dm b/code/modules/religion/burdened/psyker.dm
index 57ca59c8808..b11705f284c 100644
--- a/code/modules/religion/burdened/psyker.dm
+++ b/code/modules/religion/burdened/psyker.dm
@@ -129,7 +129,7 @@
icon_state = "lucky"
force = 10
fire_sound = 'sound/weapons/gun/revolver/shot.ogg'
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/revchap
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/revchap
obj_flags = UNIQUE_RENAME
custom_materials = null
actions_types = list(/datum/action/item_action/pray_refill)
diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm
index 1725c1fa5f5..29615bb95dc 100644
--- a/code/modules/research/machinery/_production.dm
+++ b/code/modules/research/machinery/_production.dm
@@ -22,9 +22,6 @@
/// All designs in the techweb that can be fabricated by this machine, since the last update.
var/list/datum/design/cached_designs
- /// The department this fabricator is assigned to.
- var/department_tag = "Unassigned"
-
/// What color is this machine's stripe? Leave null to not have a stripe.
var/stripe_color = null
@@ -37,7 +34,6 @@
cached_designs = list()
materials = AddComponent(
/datum/component/remote_materials, \
- "lathe", \
mapload, \
mat_container_flags = BREAKDOWN_FLAGS_LATHE, \
)
@@ -121,27 +117,25 @@
ui.open()
/obj/machinery/rnd/production/ui_static_data(mob/user)
- var/list/data
- if(isnull(materials.mat_container))
- data = list()
- else
- data = materials.mat_container.ui_static_data()
+ var/list/data = materials.mat_container.ui_static_data()
var/list/designs = list()
var/datum/asset/spritesheet/research_designs/spritesheet = get_asset_datum(/datum/asset/spritesheet/research_designs)
var/size32x32 = "[spritesheet.name]32x32"
- var/max_multiplier
+ var/max_multiplier = INFINITY
var/coefficient
for(var/datum/design/design in cached_designs)
var/cost = list()
- coefficient = efficient_with(design.build_path) ? efficiency_coeff : 1
- for(var/datum/material/material in design.materials)
- cost[material.name] = design.materials[material] * coefficient
- max_multiplier = min(50, round(materials.mat_container.get_material_amount(material) / (design.materials[material] * coefficient)))
- var/icon_size = spritesheet.icon_size_id(design.id)
+ max_multiplier = INFINITY
+ coefficient = build_efficiency(design.build_path)
+ for(var/datum/material/mat in design.materials)
+ cost[mat.name] = OPTIMAL_COST(design.materials[mat] * coefficient)
+ max_multiplier = min(max_multiplier, 50, round(materials.mat_container.get_material_amount(mat) / cost[mat.name]))
+
+ var/icon_size = spritesheet.icon_size_id(design.id)
designs[design.id] = list(
"name" = design.name,
"desc" = design.get_description(),
@@ -161,7 +155,7 @@
/obj/machinery/rnd/production/ui_data(mob/user)
var/list/data = list()
- data["materials"] = materials.mat_container?.ui_data()
+ data["materials"] = materials.mat_container.ui_data()
data["onHold"] = materials.on_hold()
data["busy"] = busy
data["materialMaximum"] = materials.local_size
@@ -181,7 +175,7 @@
if("remove_mat")
var/datum/material/material = locate(params["ref"])
- if(!materials.can_hold_material(material))
+ if(!materials.mat_container.can_hold_material(material))
// I don't know who you are or what you want, but whatever it is,
// we don't have it.
return
@@ -223,14 +217,17 @@
return ..()
-/obj/machinery/rnd/production/proc/do_print(path, amount, list/matlist)
+/obj/machinery/rnd/production/proc/do_print(path, amount)
for(var/i in 1 to amount)
new path(get_turf(src))
SSblackbox.record_feedback("nested tally", "item_printed", amount, list("[type]", "[path]"))
-/obj/machinery/rnd/production/proc/efficient_with(path)
- return !ispath(path, /obj/item/stack/sheet) && !ispath(path, /obj/item/stack/ore/bluespace_crystal)
+/obj/machinery/rnd/production/proc/build_efficiency(path)
+ if(ispath(path, /obj/item/stack/sheet) || ispath(path, /obj/item/stack/ore/bluespace_crystal))
+ return 1
+ else
+ return efficiency_coeff
/obj/machinery/rnd/production/proc/user_try_print_id(design_id, print_quantity)
if(!design_id)
@@ -267,48 +264,62 @@
say("Mineral access is on hold, please contact the quartermaster.")
return FALSE
- var/power = active_power_usage
-
print_quantity = clamp(print_quantity, 1, 50)
+ var/coefficient = build_efficiency(design.build_path)
- for(var/material in design.materials)
- power += round(design.materials[material] * print_quantity / 35)
-
- power = min(active_power_usage, power)
- use_power(power)
-
- var/coefficient = efficient_with(design.build_path) ? efficiency_coeff : 1
- var/list/efficient_mats = list()
-
- for(var/material in design.materials)
- efficient_mats[material] = design.materials[material] * coefficient
-
- if(!materials.mat_container.has_materials(efficient_mats, print_quantity))
+ //check if sufficient materials/reagents are available
+ if(!materials.mat_container.has_materials(design.materials, coefficient, print_quantity))
say("Not enough materials to complete prototype[print_quantity > 1? "s" : ""].")
return FALSE
-
for(var/reagent in design.reagents_list)
if(!reagents.has_reagent(reagent, design.reagents_list[reagent] * print_quantity * coefficient))
say("Not enough reagents to complete prototype[print_quantity > 1? "s" : ""].")
return FALSE
- lathe_tax()
+ //use power
+ var/power = active_power_usage
+ for(var/material in design.materials)
+ power += round(design.materials[material] * print_quantity / 35)
+ power = min(active_power_usage, power)
+ use_power(power)
- materials.mat_container.use_materials(efficient_mats, print_quantity)
- materials.silo_log(src, "built", -print_quantity, "[design.name]", efficient_mats)
+ // Charge the lathe tax at least once per ten items.
+ // var/total_cost = LATHE_TAX * max(round(print_quantity / 10), 1) // BUBBED EDIT - LATHE TAX CONFIG
+ // if(!charges_tax)
+ // total_cost = 0
+ // if(isliving(usr))
+ // var/mob/living/user = usr
+ // var/obj/item/card/id/card = user.get_idcard(TRUE)
+ // if(!card && istype(user.pulling, /obj/item/card/id))
+ // card = user.pulling
+
+ // if(card && card.registered_account)
+ // var/datum/bank_account/our_acc = card.registered_account
+ // if(our_acc.account_job.departments_bitflags & allowed_department_flags)
+ // total_cost = 0 // We are not charging crew for printing their own supplies and equipment.
+ // if(attempt_charge(src, usr, total_cost) & COMPONENT_OBJ_CANCEL_CHARGE)
+ // say("Insufficient funds to complete prototype. Please present a holochip or valid ID card.")
+ // return FALSE
+ // if(iscyborg(usr))
+ // var/mob/living/silicon/robot/borg = usr
+ // if(!borg.cell)
+ // return FALSE
+ // borg.cell.use(SILICON_LATHE_TAX) // BUBBED EDIT - LATHE TAX CONFIG
+ lathe_tax() // BUBBER EDIT ADDITION - LATHE TAX CONFIG
+ //consume materials
+ materials.mat_container.use_materials(design.materials, coefficient, print_quantity)
+ materials.silo_log(src, "built", -print_quantity, "[design.name]", design.materials)
for(var/reagent in design.reagents_list)
reagents.remove_reagent(reagent, design.reagents_list[reagent] * print_quantity * coefficient)
-
+ //produce item
busy = TRUE
-
if(production_animation)
flick(production_animation, src)
-
var/time_coefficient = design.lathe_time_factor * efficiency_coeff
-
addtimer(CALLBACK(src, PROC_REF(reset_busy)), (30 * time_coefficient * print_quantity) ** 0.5)
- addtimer(CALLBACK(src, PROC_REF(do_print), design.build_path, print_quantity, efficient_mats), (32 * time_coefficient * print_quantity) ** 0.8)
+ addtimer(CALLBACK(src, PROC_REF(do_print), design.build_path, print_quantity), (32 * time_coefficient * print_quantity) ** 0.8)
+ update_static_data_for_all_viewers()
return TRUE
diff --git a/code/modules/research/machinery/departmental_circuit_imprinter.dm b/code/modules/research/machinery/departmental_circuit_imprinter.dm
index 7277c41d978..2f5a606d8a2 100644
--- a/code/modules/research/machinery/departmental_circuit_imprinter.dm
+++ b/code/modules/research/machinery/departmental_circuit_imprinter.dm
@@ -8,5 +8,4 @@
name = "department circuit imprinter (Science)"
circuit = /obj/item/circuitboard/machine/circuit_imprinter/department/science
allowed_department_flags = DEPARTMENT_BITFLAG_SCIENCE
- department_tag = "Science"
payment_department = ACCOUNT_SCI
diff --git a/code/modules/research/machinery/departmental_protolathe.dm b/code/modules/research/machinery/departmental_protolathe.dm
index 44f78564a1e..9fbaa28c953 100644
--- a/code/modules/research/machinery/departmental_protolathe.dm
+++ b/code/modules/research/machinery/departmental_protolathe.dm
@@ -7,7 +7,6 @@
/obj/machinery/rnd/production/protolathe/department/engineering
name = "department protolathe (Engineering)"
allowed_department_flags = DEPARTMENT_BITFLAG_ENGINEERING
- department_tag = "Engineering"
circuit = /obj/item/circuitboard/machine/protolathe/department/engineering
stripe_color = "#EFB341"
payment_department = ACCOUNT_ENG
@@ -19,7 +18,6 @@
/obj/machinery/rnd/production/protolathe/department/service
name = "department protolathe (Service)"
allowed_department_flags = DEPARTMENT_BITFLAG_SERVICE
- department_tag = "Service"
circuit = /obj/item/circuitboard/machine/protolathe/department/service
stripe_color = "#83ca41"
payment_department = ACCOUNT_SRV
@@ -27,7 +25,6 @@
/obj/machinery/rnd/production/protolathe/department/medical
name = "department protolathe (Medical)"
allowed_department_flags = DEPARTMENT_BITFLAG_MEDICAL
- department_tag = "Medical"
circuit = /obj/item/circuitboard/machine/protolathe/department/medical
stripe_color = "#52B4E9"
payment_department = ACCOUNT_MED
@@ -35,7 +32,6 @@
/obj/machinery/rnd/production/protolathe/department/cargo
name = "department protolathe (Cargo)"
allowed_department_flags = DEPARTMENT_BITFLAG_CARGO
- department_tag = "Cargo"
circuit = /obj/item/circuitboard/machine/protolathe/department/cargo
stripe_color = "#956929"
payment_department = ACCOUNT_CAR
@@ -43,7 +39,6 @@
/obj/machinery/rnd/production/protolathe/department/science
name = "department protolathe (Science)"
allowed_department_flags = DEPARTMENT_BITFLAG_SCIENCE
- department_tag = "Science"
circuit = /obj/item/circuitboard/machine/protolathe/department/science
stripe_color = "#D381C9"
payment_department = ACCOUNT_SCI
@@ -51,7 +46,6 @@
/obj/machinery/rnd/production/protolathe/department/security
name = "department protolathe (Security)"
allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY
- department_tag = "Security"
circuit = /obj/item/circuitboard/machine/protolathe/department/security
stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A"
payment_department = ACCOUNT_SEC
diff --git a/code/modules/research/machinery/departmental_techfab.dm b/code/modules/research/machinery/departmental_techfab.dm
index a7e03e355d0..339c98a6222 100644
--- a/code/modules/research/machinery/departmental_techfab.dm
+++ b/code/modules/research/machinery/departmental_techfab.dm
@@ -7,7 +7,6 @@
/obj/machinery/rnd/production/techfab/department/engineering
name = "department techfab (Engineering)"
allowed_department_flags = DEPARTMENT_BITFLAG_ENGINEERING
- department_tag = "Engineering"
circuit = /obj/item/circuitboard/machine/techfab/department/engineering
stripe_color = "#EFB341"
payment_department = ACCOUNT_ENG
@@ -15,7 +14,6 @@
/obj/machinery/rnd/production/techfab/department/service
name = "department techfab (Service)"
allowed_department_flags = DEPARTMENT_BITFLAG_SERVICE
- department_tag = "Service"
circuit = /obj/item/circuitboard/machine/techfab/department/service
stripe_color = "#83ca41"
payment_department = ACCOUNT_SRV
@@ -23,7 +21,6 @@
/obj/machinery/rnd/production/techfab/department/medical
name = "department techfab (Medical)"
allowed_department_flags = DEPARTMENT_BITFLAG_MEDICAL
- department_tag = "Medical"
circuit = /obj/item/circuitboard/machine/techfab/department/medical
stripe_color = "#52B4E9"
payment_department = ACCOUNT_MED
@@ -31,7 +28,6 @@
/obj/machinery/rnd/production/techfab/department/cargo
name = "department techfab (Cargo)"
allowed_department_flags = DEPARTMENT_BITFLAG_CARGO
- department_tag = "Cargo"
circuit = /obj/item/circuitboard/machine/techfab/department/cargo
stripe_color = "#956929"
payment_department = ACCOUNT_CAR
@@ -39,7 +35,6 @@
/obj/machinery/rnd/production/techfab/department/science
name = "department techfab (Science)"
allowed_department_flags = DEPARTMENT_BITFLAG_SCIENCE
- department_tag = "Science"
circuit = /obj/item/circuitboard/machine/techfab/department/science
stripe_color = "#D381C9"
payment_department = ACCOUNT_SCI
@@ -47,7 +42,6 @@
/obj/machinery/rnd/production/techfab/department/security
name = "department techfab (Security)"
allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY
- department_tag = "Security"
circuit = /obj/item/circuitboard/machine/techfab/department/security
stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A"
payment_department = ACCOUNT_SEC
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index 2cefde2e486..be805f8a092 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -978,7 +978,7 @@
// For some reason this was applied as an overlay on the aux image and limb image before.
// I am very sure that this is unnecessary, and i need to treat it as part of the return list
// to be able to mask it proper in case this limb is a leg.
- if(blocks_emissive)
+ if(blocks_emissive != EMISSIVE_BLOCK_NONE)
var/atom/location = loc || owner || src
var/mutable_appearance/limb_em_block = emissive_blocker(limb.icon, limb.icon_state, location, layer = limb.layer, alpha = limb.alpha)
limb_em_block.dir = image_dir
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index f8d052b3c82..1ab9cfb1821 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -216,7 +216,7 @@
if(eyes.overlay_ignore_lighting)
eye_left.overlays += emissive_appearance(eye_left.icon, eye_left.icon_state, src, alpha = eye_left.alpha)
eye_right.overlays += emissive_appearance(eye_right.icon, eye_right.icon_state, src, alpha = eye_right.alpha)
- else if(blocks_emissive)
+ else if(blocks_emissive != EMISSIVE_BLOCK_NONE)
var/atom/location = loc || owner || src
eye_left.overlays += emissive_blocker(eye_left.icon, eye_left.icon_state, location, alpha = eye_left.alpha)
eye_right.overlays += emissive_blocker(eye_right.icon, eye_right.icon_state, location, alpha = eye_right.alpha)
diff --git a/code/modules/surgery/bodyparts/head_hair_and_lips.dm b/code/modules/surgery/bodyparts/head_hair_and_lips.dm
index ea54ae4581a..a93eb88f9a7 100644
--- a/code/modules/surgery/bodyparts/head_hair_and_lips.dm
+++ b/code/modules/surgery/bodyparts/head_hair_and_lips.dm
@@ -91,7 +91,7 @@
var/image/lip_overlay = image('icons/mob/species/human/human_face.dmi', "lips_[lip_style]", -BODY_LAYER, image_dir)
lip_overlay.color = lip_color
//Emissive blocker
- if(blocks_emissive)
+ if(blocks_emissive != EMISSIVE_BLOCK_NONE)
lip_overlay.overlays += emissive_blocker(lip_overlay.icon, lip_overlay.icon_state, location, alpha = facial_hair_alpha)
//Offsets
worn_face_offset?.apply_offset(lip_overlay)
@@ -105,7 +105,7 @@
facial_hair_overlay = image(sprite_accessory.icon, sprite_accessory.icon_state, -HAIR_LAYER, image_dir)
facial_hair_overlay.alpha = facial_hair_alpha
//Emissive blocker
- if(blocks_emissive)
+ if(blocks_emissive != EMISSIVE_BLOCK_NONE)
facial_hair_overlay.overlays += emissive_blocker(facial_hair_overlay.icon, facial_hair_overlay.icon_state, location, alpha = facial_hair_alpha)
//Offsets
worn_face_offset?.apply_offset(facial_hair_overlay)
@@ -125,7 +125,7 @@
hair_overlay = image(sprite_accessory.icon, sprite_accessory.icon_state, -HAIR_LAYER, image_dir)
hair_overlay.alpha = hair_alpha
//Emissive blocker
- if(blocks_emissive)
+ if(blocks_emissive != EMISSIVE_BLOCK_NONE)
hair_overlay.overlays += emissive_blocker(hair_overlay.icon, hair_overlay.icon_state, location, alpha = hair_alpha)
//Offsets
// SKYRAT ADD - Hair offset
diff --git a/code/modules/unit_tests/crayons.dm b/code/modules/unit_tests/crayons.dm
index be7255fdaec..ca2dfc629d3 100644
--- a/code/modules/unit_tests/crayons.dm
+++ b/code/modules/unit_tests/crayons.dm
@@ -3,7 +3,7 @@
/datum/unit_test/crayon_naming/Run()
for(var/obj/item/toy/crayon/crayon_path as anything in typesof(/obj/item/toy/crayon))
- if(ispath(crayon_path, /obj/item/toy/crayon/spraycan))
+ if(is_path_in_list(crayon_path, list(/obj/item/toy/crayon/spraycan, /obj/item/toy/crayon)))
continue
var/obj/item/toy/crayon/real_crayon = new crayon_path
if(!findtext(initial(real_crayon.name),real_crayon.crayon_color))
diff --git a/code/modules/vehicles/mecha/mech_fabricator.dm b/code/modules/vehicles/mecha/mech_fabricator.dm
index d3aa604ef49..f6f54aae05d 100644
--- a/code/modules/vehicles/mecha/mech_fabricator.dm
+++ b/code/modules/vehicles/mecha/mech_fabricator.dm
@@ -55,7 +55,11 @@
/obj/machinery/mecha_part_fabricator/Initialize(mapload)
if(!CONFIG_GET(flag/no_default_techweb_link) && !stored_research)
connect_techweb(SSresearch.science_tech)
- rmat = AddComponent(/datum/component/remote_materials, "mechfab", mapload && link_on_init, mat_container_flags=BREAKDOWN_FLAGS_LATHE)
+ rmat = AddComponent( \
+ /datum/component/remote_materials, \
+ mapload && link_on_init, \
+ mat_container_flags = BREAKDOWN_FLAGS_LATHE \
+ )
cached_designs = list()
RefreshParts() //Recalculating local material sizes if the fab isn't linked
if(stored_research)
@@ -92,7 +96,7 @@
//maximum stocking amount (default 300000, 600000 at T4)
for(var/datum/stock_part/matter_bin/matter_bin in component_parts)
T += matter_bin.tier
- rmat.set_local_size(((100*SHEET_MATERIAL_AMOUNT) + (T * (25*SHEET_MATERIAL_AMOUNT))))
+ rmat.set_local_size(((100 * SHEET_MATERIAL_AMOUNT) + (T * (25 * SHEET_MATERIAL_AMOUNT))))
//resources adjustment coefficient (1 -> 0.85 -> 0.7 -> 0.55)
T = 1.15
@@ -173,34 +177,6 @@
desc = initial(desc)
process_queue = FALSE
-/**
- * Calculates resource/material costs for printing an item based on the machine's resource coefficient.
- *
- * Returns a list of k,v resources with their amounts.
- * * D - Design datum to calculate the modified resource cost of.
- */
-/obj/machinery/mecha_part_fabricator/proc/get_resources_w_coeff(datum/design/D)
- var/list/resources = list()
- for(var/R in D.materials)
- var/datum/material/M = R
- resources[M] = get_resource_cost_w_coeff(D, M)
- return resources
-
-/**
- * Checks if the Exofab has enough resources to print a given item.
- *
- * Returns FALSE if the design has no reagents used in its construction (?) or if there are insufficient resources.
- * Returns TRUE if there are sufficient resources to print the item.
- * * D - Design datum to calculate the modified resource cost of.
- */
-/obj/machinery/mecha_part_fabricator/proc/check_resources(datum/design/D)
- if(length(D.reagents_list)) // No reagents storage - no reagent designs.
- return FALSE
- var/datum/component/material_container/materials = rmat.mat_container
- if(materials.has_materials(get_resources_w_coeff(D)))
- return TRUE
- return FALSE
-
/**
* Attempts to build the next item in the build queue.
*
@@ -228,7 +204,7 @@
* * verbose - Whether the machine should use say() procs. Set to FALSE to disable the machine saying reasons for failure to build.
*/
/obj/machinery/mecha_part_fabricator/proc/build_part(datum/design/D, verbose = TRUE)
- if(!D)
+ if(!D || length(D.reagents_list))
return FALSE
var/datum/component/material_container/materials = rmat.mat_container
@@ -240,19 +216,16 @@
if(verbose)
say("Mineral access is on hold, please contact the quartermaster.")
return FALSE
- if(!check_resources(D))
+ if(!materials.has_materials(D.materials, component_coeff))
if(verbose)
say("Not enough resources. Processing stopped.")
return FALSE
- build_materials = get_resources_w_coeff(D)
-
- materials.use_materials(build_materials)
+ materials.use_materials(D.materials, component_coeff)
being_built = D
build_finish = world.time + get_construction_time_w_coeff(initial(D.construction_time))
build_start = world.time
desc = "It's building \a [D.name]."
-
rmat.silo_log(src, "built", -1, "[D.name]", build_materials)
return TRUE
@@ -339,17 +312,6 @@
queue.Cut(index,++index)
return TRUE
-/**
- * Calculates the coefficient-modified resource cost of a single material component of a design's recipe.
- *
- * Returns coefficient-modified resource cost for the given material component.
- * * D - Design datum to pull the resource cost from.
- * * resource - Material datum reference to the resource to calculate the cost of.
- * * roundto - Rounding value for round() proc
- */
-/obj/machinery/mecha_part_fabricator/proc/get_resource_cost_w_coeff(datum/design/D, datum/material/resource, roundto = 1)
- return round(D.materials[resource]*component_coeff, roundto)
-
/**
* Calculates the coefficient-modified build time of a design.
*
@@ -373,7 +335,8 @@
ui.open()
/obj/machinery/mecha_part_fabricator/ui_static_data(mob/user)
- var/list/data = list()
+ var/list/data = rmat.mat_container.ui_static_data()
+
var/list/designs = list()
var/datum/asset/spritesheet/research_designs/spritesheet = get_asset_datum(/datum/asset/spritesheet/research_designs)
@@ -381,12 +344,11 @@
for(var/datum/design/design in cached_designs)
var/cost = list()
-
- for(var/datum/material/material in design.materials)
- cost[material.name] = get_resource_cost_w_coeff(design, material)
+ var/list/materials = design["materials"]
+ for(var/datum/material/mat in materials)
+ cost[mat.name] = OPTIMAL_COST(materials[mat] * component_coeff)
var/icon_size = spritesheet.icon_size_id(design.id)
-
designs[design.id] = list(
"name" = design.name,
"desc" = design.get_description(),
@@ -404,7 +366,7 @@
/obj/machinery/mecha_part_fabricator/ui_data(mob/user)
var/list/data = list()
- data["materials"] = rmat.mat_container?.ui_data()
+ data["materials"] = rmat.mat_container.ui_data()
data["queue"] = list()
data["processing"] = process_queue
diff --git a/code/modules/wiremod/core/component_printer.dm b/code/modules/wiremod/core/component_printer.dm
index 7925f3b76ff..b0365fa0b14 100644
--- a/code/modules/wiremod/core/component_printer.dm
+++ b/code/modules/wiremod/core/component_printer.dm
@@ -17,6 +17,9 @@
/// The current unlocked circuit component designs. Used by integrated circuits to print off circuit components remotely.
var/list/current_unlocked_designs = list()
+ /// The efficiency of this machine
+ var/efficiency_coeff = 1
+
/obj/machinery/component_printer/Initialize(mapload)
. = ..()
if(!CONFIG_GET(flag/no_default_techweb_link) && !techweb)
@@ -24,7 +27,6 @@
materials = AddComponent( \
/datum/component/remote_materials, \
- "component_printer", \
mapload, \
mat_container_flags = BREAKDOWN_FLAGS_LATHE, \
)
@@ -74,18 +76,9 @@
get_asset_datum(/datum/asset/spritesheet/sheetmaterials)
)
-/obj/machinery/component_printer/proc/calculate_efficiency()
- var/rating = 0
+/obj/machinery/component_printer/RefreshParts()
+ . = ..()
- for(var/datum/stock_part/servo/servo in component_parts)
- ///we do -1 because normal manipulators rating of 1 gives us 1-1=0 i.e no decrement in cost
- rating += servo.tier-1
-
- ///linear interpolation between full cost i.e 1 & 1/8th the cost i.e 0.125
- ///we do it in 6 steps because maximum rating of 2 manipulators is 8 but -1 gives us 6
- var/coff = 1.0+((0.125-1.0)*(rating/6))
-
- ///copied from production.dm calculate_efficiency() proc
if(materials)
var/total_storage = 0
@@ -94,7 +87,17 @@
materials.set_local_size(total_storage)
- return coff
+ efficiency_coeff = 0
+
+ for(var/datum/stock_part/servo/servo in component_parts)
+ ///we do -1 because normal manipulators rating of 1 gives us 1-1=0 i.e no decrement in cost
+ efficiency_coeff += servo.tier-1
+
+ ///linear interpolation between full cost i.e 1 & 1/8th the cost i.e 0.125
+ ///we do it in 6 steps because maximum rating of 2 manipulators is 8 but -1 gives us 6
+ efficiency_coeff = 1.0+((0.125-1.0)*(efficiency_coeff / 6))
+
+ update_static_data_for_all_viewers()
/obj/machinery/component_printer/proc/print_component(typepath)
var/design_id = current_unlocked_designs[typepath]
@@ -106,8 +109,7 @@
if (materials.on_hold())
return
- var/efficiency_coeff = calculate_efficiency()
- if (!materials.mat_container?.has_materials(design.materials, efficiency_coeff))
+ if (!materials.mat_container.has_materials(design.materials, efficiency_coeff))
return
materials.mat_container.use_materials(design.materials, efficiency_coeff)
@@ -133,14 +135,12 @@
say("Mineral access is on hold, please contact the quartermaster.")
return TRUE
- var/efficiency_coeff = calculate_efficiency()
-
- if (!materials.mat_container?.has_materials(design.materials, efficiency_coeff))
+ if (!materials.mat_container.has_materials(design.materials, efficiency_coeff))
say("Not enough materials.")
return TRUE
balloon_alert_to_viewers("printed [design.name]")
- materials.mat_container?.use_materials(design.materials, efficiency_coeff)
+ materials.mat_container.use_materials(design.materials, efficiency_coeff)
materials.silo_log(src, "printed", -1, design.name, design.materials)
var/atom/printed_design = new design.build_path(drop_location())
printed_design.pixel_x = printed_design.base_pixel_x + rand(-5, 5)
@@ -163,12 +163,12 @@
return data
/obj/machinery/component_printer/ui_static_data(mob/user)
- var/list/data = list()
+ var/list/data = materials.mat_container.ui_static_data()
+
var/list/designs = list()
var/datum/asset/spritesheet/research_designs/spritesheet = get_asset_datum(/datum/asset/spritesheet/research_designs)
var/size32x32 = "[spritesheet.name]32x32"
- var/efficiency_coeff = calculate_efficiency()
// for (var/datum/design/component/component_design_type as anything in subtypesof(/datum/design/component))
for (var/researched_design_id in techweb.researched_designs)
@@ -176,12 +176,15 @@
if (!(design.build_type & COMPONENT_PRINTER))
continue
- var/icon_size = spritesheet.icon_size_id(design.id)
+ var/list/cost = list()
+ for(var/datum/material/mat in design.materials)
+ cost[mat.name] = OPTIMAL_COST(design.materials[mat] * efficiency_coeff)
+ var/icon_size = spritesheet.icon_size_id(design.id)
designs[researched_design_id] = list(
"name" = design.name,
"desc" = design.desc,
- "cost" = get_material_cost_data(design.materials, efficiency_coeff),
+ "cost" = cost,
"id" = researched_design_id,
"categories" = design.category,
"icon" = "[icon_size == size32x32 ? "" : "[icon_size] "][design.id]",
@@ -315,12 +318,13 @@
var/cost_per_component = 1000
+ var/efficiency_coeff = 1
+
/obj/machinery/module_duplicator/Initialize(mapload)
. = ..()
materials = AddComponent( \
/datum/component/remote_materials, \
- "module_duplicator", \
mapload, \
mat_container_flags = BREAKDOWN_FLAGS_LATHE, \
)
@@ -337,8 +341,9 @@
get_asset_datum(/datum/asset/spritesheet/research_designs)
)
-/obj/machinery/module_duplicator/proc/calculate_efficiency()
- ///copied from production.dm calculate_efficiency() proc
+/obj/machinery/module_duplicator/RefreshParts()
+ . = ..()
+
if(materials)
var/total_storage = 0
@@ -347,17 +352,17 @@
materials.set_local_size(total_storage)
- var/rating = 0
+ efficiency_coeff = 0
for(var/datum/stock_part/servo/servo in component_parts)
///we do -1 because normal manipulators rating of 1 gives us 1-1=0 i.e no decrement in cost
- rating += servo.tier - 1
+ efficiency_coeff += servo.tier - 1
///linear interpolation between full cost i.e 1 & 1/8th the cost i.e 0.125
///we do it in 6 steps because maximum rating of 2 manipulators is 8 but -1 gives us 6
- var/coff = 1.0 + ((0.125 - 1.0) * (rating/6))
+ efficiency_coeff = 1.0 + ((0.125 - 1.0) * (efficiency_coeff / 6))
- return coff
+ update_static_data_for_all_viewers()
/obj/machinery/module_duplicator/ui_act(action, list/params)
. = ..()
@@ -377,14 +382,12 @@
say("Mineral access is on hold, please contact the quartermaster.")
return TRUE
- var/efficiency_coeff = calculate_efficiency()
-
- if (!materials.mat_container?.has_materials(design["materials"], efficiency_coeff))
+ if (!materials.mat_container.has_materials(design["materials"], efficiency_coeff))
say("Not enough materials.")
return TRUE
balloon_alert_to_viewers("printed [design["name"]]")
- materials.mat_container?.use_materials(design["materials"], efficiency_coeff)
+ materials.mat_container.use_materials(design["materials"], efficiency_coeff)
materials.silo_log(src, "printed", -1, design["name"], design["materials"])
print_module(design)
if ("remove_mat")
@@ -481,19 +484,22 @@
return data
/obj/machinery/module_duplicator/ui_static_data(mob/user)
- var/list/data = list()
+ var/list/data = materials.mat_container.ui_static_data()
var/list/designs = list()
var/index = 1
-
- var/efficiency_coeff = calculate_efficiency()
-
for (var/list/design as anything in scanned_designs)
+
+ var/list/cost = list()
+ var/list/materials = design["materials"]
+ for(var/datum/material/mat in materials)
+ cost[mat.name] = OPTIMAL_COST(materials[mat] * efficiency_coeff)
+
designs["[index]"] = list(
"name" = design["name"],
"desc" = design["desc"],
- "cost" = get_material_cost_data(design["materials"], efficiency_coeff),
+ "cost" = cost,
"id" = "[index]",
"icon" = "integrated_circuit",
"categories" = list("/Saved Circuits"),
@@ -513,11 +519,3 @@
if(..())
return TRUE
return default_deconstruction_screwdriver(user, "module-fab-o", "module-fab-idle", tool)
-
-/obj/machinery/module_duplicator/proc/get_material_cost_data(list/materials, efficiency_coeff)
- var/list/data = list()
-
- for (var/datum/material/material_type as anything in materials)
- data[initial(material_type.name)] = materials[material_type] * efficiency_coeff
-
- return data
diff --git a/html/changelogs/AutoChangeLog-pr-21934.yml b/html/changelogs/AutoChangeLog-pr-21934.yml
deleted file mode 100644
index b0121595c98..00000000000
--- a/html/changelogs/AutoChangeLog-pr-21934.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - balance: "Base material costs for ammunition have been sharply reduced across the board, because a single 9mm casing or equivalent costing half a sheet was egregious. This mainly only applies to the ammo bench; lathe recipes are their own system and remain untouched."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22397.yml b/html/changelogs/AutoChangeLog-pr-22397.yml
deleted file mode 100644
index b00132485cf..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22397.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "LT3"
-delete-after: True
-changes:
- - bugfix: "Autotransfer calls votes based on actual round time, not server initialization time"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22400.yml b/html/changelogs/AutoChangeLog-pr-22400.yml
new file mode 100644
index 00000000000..f576c6edd70
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-22400.yml
@@ -0,0 +1,6 @@
+author: "Lunar248"
+delete-after: True
+changes:
+ - rscadd: "Completely revamps Freighter ghostrole, adding a new map, while trying to keep the spirit of the original."
+ - rscdel: "Removes the old Freighter map."
+ - bugfix: "Fixed the old area subtypes for the Freighter, and added new ones where they were missing before."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22623.yml b/html/changelogs/AutoChangeLog-pr-22623.yml
deleted file mode 100644
index 4cb9aed18bd..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22623.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - image: "walking on water will now immerse you in it... visually, at least."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22633.yml b/html/changelogs/AutoChangeLog-pr-22633.yml
deleted file mode 100644
index c44fd3ae275..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22633.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - qol: "The TTS and TTS Blips option is now one choiced preference."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22640.yml b/html/changelogs/AutoChangeLog-pr-22640.yml
deleted file mode 100644
index d21657b0957..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22640.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "vinylspiders"
-delete-after: True
-changes:
- - bugfix: "fixes a bug that was causing some types of ammo boxes to spawn empty"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22641.yml b/html/changelogs/AutoChangeLog-pr-22641.yml
deleted file mode 100644
index 455da43acba..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22641.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "vinylspiders"
-delete-after: True
-changes:
- - bugfix: "the pda item name will now match alt job titles"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22648.yml b/html/changelogs/AutoChangeLog-pr-22648.yml
deleted file mode 100644
index eea0388d161..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22648.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - rscadd: "Bounty pads can now be upgraded, to reduce the time until you can pick a new bounty"
- - rscadd: "Sunglasses can now be bought from cargo if you have security access."
- - balance: "Gripper gloves single-pack is now gorilla gloves singlepack"
- - rscdel: "Removed shady jims bounty"
- - qol: "Bounty pads can now be screwdrivered/crowbarred with left click like every other machine"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22649.yml b/html/changelogs/AutoChangeLog-pr-22649.yml
deleted file mode 100644
index 7b3b2fb7989..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22649.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "vinylspiders"
-delete-after: True
-changes:
- - bugfix: "the IRS have found their missing shuttle and will now be able to spawn properly. the station will have to find a new way to commit tax evasion from here on out"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22650.yml b/html/changelogs/AutoChangeLog-pr-22650.yml
deleted file mode 100644
index 57af4956cbe..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22650.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - balance: "Changes some cooldowns and upgrades of spells."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22652.yml b/html/changelogs/AutoChangeLog-pr-22652.yml
deleted file mode 100644
index 87d1a18262c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22652.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - balance: "the bee now can fly over the machines so its easy for him to go to the hydroponics machine"
- - bugfix: "player bees now will not be stuck inside the hive if he entered it, they can now leave it"
- - bugfix: "fixed a har deleted when the hive is deleted all the bees still have a refence to the hive now its fixed"
- - bugfix: "now when a player interacted with the bee hive the bees will now leave the hive to defend the hive (it was glitched)"
- - refactor: "the bees now are a basic insect."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22653.yml b/html/changelogs/AutoChangeLog-pr-22653.yml
deleted file mode 100644
index 709705981d3..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22653.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Thebleh"
-delete-after: True
-changes:
- - bugfix: "South Bronx Paradise Bars are once again the best weight loss aid on station"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22654.yml b/html/changelogs/AutoChangeLog-pr-22654.yml
deleted file mode 100644
index 3e2499a9b9b..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22654.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - bugfix: "Dish drive no longer spams the bar/kitchen/etc when its idle with empty messages."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22655.yml b/html/changelogs/AutoChangeLog-pr-22655.yml
deleted file mode 100644
index 1bd96a9f5a4..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22655.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - bugfix: "fixed possessed sword spirits summoned during destruction of the sword spawning in the error room. those fellas are in godmode, and y'all don't need an immortal spirit haunting your station, m'kay?"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22656.yml b/html/changelogs/AutoChangeLog-pr-22656.yml
deleted file mode 100644
index 28b9a7ceaa0..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22656.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - qol: "Ice cream vats now count as elevated surfaces for preventing germs from getting onto germ-sensitive items (food)."
- - qol: "Ice cream vats now dispense cones into your hands first, if possible."
- - bugfix: "Germ-sensitive items that fail to be placed in-hand now check for all elevated surfaces, not just tables."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22657.yml b/html/changelogs/AutoChangeLog-pr-22657.yml
deleted file mode 100644
index 01322e07a63..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22657.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - qol: "ID cards tooltips now show how to assign a new account."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22658.yml b/html/changelogs/AutoChangeLog-pr-22658.yml
deleted file mode 100644
index 176596185d8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22658.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - bugfix: "Removed duplicate and incorrect Yaki Imo recipe"
- - qol: "Swapped out the flour in Ælosterrmæsch with two dough slices, to avoid competing reactions while preparing or cooking"
- - spellcheck: "Chicken nugget will have a description in the craft menu, and fiesta skewers will have a description in general"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22659.yml b/html/changelogs/AutoChangeLog-pr-22659.yml
deleted file mode 100644
index 0853b41c698..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22659.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - image: "Railing ends now exist."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22660.yml b/html/changelogs/AutoChangeLog-pr-22660.yml
deleted file mode 100644
index aea3fc5b8cc..00000000000
--- a/html/changelogs/AutoChangeLog-pr-22660.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - rscdel: "removed floating light fixture from the Deltastation security hallway"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22687.yml b/html/changelogs/AutoChangeLog-pr-22687.yml
new file mode 100644
index 00000000000..ee99b8eb07c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-22687.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - bugfix: "Hulks cannot be aggressive grabbed by strong grabbers anymore"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22688.yml b/html/changelogs/AutoChangeLog-pr-22688.yml
new file mode 100644
index 00000000000..1dba0aab16b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-22688.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - admin: "Changing shuttle events now alerts admins"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22689.yml b/html/changelogs/AutoChangeLog-pr-22689.yml
new file mode 100644
index 00000000000..89906b59bc9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-22689.yml
@@ -0,0 +1,4 @@
+author: "LT3"
+delete-after: True
+changes:
+ - bugfix: "Consumables like bone gel will first be used for surgery before wounds"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22690.yml b/html/changelogs/AutoChangeLog-pr-22690.yml
new file mode 100644
index 00000000000..376fb595cb8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-22690.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - bugfix: "fixes mobs missing most of their emissive blockers"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22691.yml b/html/changelogs/AutoChangeLog-pr-22691.yml
new file mode 100644
index 00000000000..c2a2aa3a423
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-22691.yml
@@ -0,0 +1,4 @@
+author: "Senefi"
+delete-after: True
+changes:
+ - bugfix: "Wired MetaStation APCs that were not attached to the station's power grid at round start."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22692.yml b/html/changelogs/AutoChangeLog-pr-22692.yml
new file mode 100644
index 00000000000..0730fdd4164
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-22692.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - bugfix: "Mafia chaplains can now only use their seances on dead people now."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22693.yml b/html/changelogs/AutoChangeLog-pr-22693.yml
new file mode 100644
index 00000000000..732903c78c5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-22693.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - bugfix: "Fixed a rare bug that let you spam bluespace bodybags everywhere."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22694.yml b/html/changelogs/AutoChangeLog-pr-22694.yml
new file mode 100644
index 00000000000..e11d0e71640
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-22694.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - balance: "Huzzah! Interdyne Associates have finally upgraded their medborgs' firmware. They'll now have bonesetters and bonegel available!"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22695.yml b/html/changelogs/AutoChangeLog-pr-22695.yml
new file mode 100644
index 00000000000..76c8b0011a8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-22695.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - bugfix: "the height of runechat messages should now scale correctly with the current size variable of living mob."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22696.yml b/html/changelogs/AutoChangeLog-pr-22696.yml
new file mode 100644
index 00000000000..d78e1adedcd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-22696.yml
@@ -0,0 +1,5 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - qol: "Tactical medkits now can hold stuff it spawns with."
+ - bugfix: "Nukie Medical Bundle now spawns with premium tactical medkit as it should."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22698.yml b/html/changelogs/AutoChangeLog-pr-22698.yml
new file mode 100644
index 00000000000..cee2618b67b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-22698.yml
@@ -0,0 +1,4 @@
+author: "Licks-The-Crystal"
+delete-after: True
+changes:
+ - qol: "The \"Kidnap\" progression traitor objective now displays the number of telecrystals awarded for a successful live kidnapping."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-22699.yml b/html/changelogs/AutoChangeLog-pr-22699.yml
new file mode 100644
index 00000000000..a3aa8391d3a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-22699.yml
@@ -0,0 +1,9 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - balance: "Syndicate duffelbags can fit 2 extra bulky items, down from three."
+ - balance: "Reduced syndicate duffelbag's unzipped slowdown from '1' to '0.3', and set its zipping-up sped to 0.5, same as unzipping."
+ - rscadd: "Added the following items to the Syndicate Duffelbag bulky exception list: Greentext, mech removal tool, gibtonite, skub, golem shells, mech ammo. Roughly sorted the list by item category."
+ - bugfix: "Fixed the syndie surgery duffelbag having more items than it can hold by removing the redundant surgical drill (Upgraded cauteries can turn into one anyways)"
+ - qol: "Any storage item with a can_hold description can be examined twice to see what it can hold now."
+ - bugfix: "The parent crayon's name is 'crayon' to prevent any weirdness with things that show the parent type's name."
\ No newline at end of file
diff --git a/html/changelogs/archive/2023-07.yml b/html/changelogs/archive/2023-07.yml
index eaa9212c634..88ceaa6002b 100644
--- a/html/changelogs/archive/2023-07.yml
+++ b/html/changelogs/archive/2023-07.yml
@@ -1135,3 +1135,140 @@
straight through eachother as if they weren't even there.
- spellcheck: Added more variance to item throwing text.
- refactor: Mob density has been refactored
+2023-07-25:
+ Hatterhat:
+ - balance: Base material costs for ammunition have been sharply reduced across the
+ board, because a single 9mm casing or equivalent costing half a sheet was egregious.
+ This mainly only applies to the ammo bench; lathe recipes are their own system
+ and remain untouched.
+ LT3:
+ - bugfix: Autotransfer calls votes based on actual round time, not server initialization
+ time
+ SkyratBot:
+ - bugfix: Dish drive no longer spams the bar/kitchen/etc when its idle with empty
+ messages.
+ - qol: Ice cream vats now count as elevated surfaces for preventing germs from getting
+ onto germ-sensitive items (food).
+ - qol: Ice cream vats now dispense cones into your hands first, if possible.
+ - bugfix: Germ-sensitive items that fail to be placed in-hand now check for all
+ elevated surfaces, not just tables.
+ - image: Railing ends now exist.
+ - rscdel: removed floating light fixture from the Deltastation security hallway
+ - qol: ID cards tooltips now show how to assign a new account.
+ - image: walking on water will now immerse you in it... visually, at least.
+ - bugfix: fixed possessed sword spirits summoned during destruction of the sword
+ spawning in the error room. those fellas are in godmode, and y'all don't need
+ an immortal spirit haunting your station, m'kay?
+ - qol: The TTS and TTS Blips option is now one choiced preference.
+ - bugfix: Removed duplicate and incorrect Yaki Imo recipe
+ - qol: "Swapped out the flour in \xC6losterrm\xE6sch with two dough slices, to avoid\
+ \ competing reactions while preparing or cooking"
+ - spellcheck: Chicken nugget will have a description in the craft menu, and fiesta
+ skewers will have a description in general
+ - rscadd: Bounty pads can now be upgraded, to reduce the time until you can pick
+ a new bounty
+ - rscadd: Sunglasses can now be bought from cargo if you have security access.
+ - balance: Gripper gloves single-pack is now gorilla gloves singlepack
+ - rscdel: Removed shady jims bounty
+ - qol: Bounty pads can now be screwdrivered/crowbarred with left click like every
+ other machine
+ - balance: Changes some cooldowns and upgrades of spells.
+ - balance: the bee now can fly over the machines so its easy for him to go to the
+ hydroponics machine
+ - bugfix: player bees now will not be stuck inside the hive if he entered it, they
+ can now leave it
+ - bugfix: fixed a har deleted when the hive is deleted all the bees still have a
+ refence to the hive now its fixed
+ - bugfix: now when a player interacted with the bee hive the bees will now leave
+ the hive to defend the hive (it was glitched)
+ - refactor: the bees now are a basic insect.
+ Thebleh:
+ - bugfix: South Bronx Paradise Bars are once again the best weight loss aid on station
+ vinylspiders:
+ - bugfix: the IRS have found their missing shuttle and will now be able to spawn
+ properly. the station will have to find a new way to commit tax evasion from
+ here on out
+ - bugfix: the pda item name will now match alt job titles
+ - bugfix: fixes a bug that was causing some types of ammo boxes to spawn empty
+2023-07-26:
+ Cyprex:
+ - balance: Electric shocks from cables deal less damage.
+ GoldenAlpharex:
+ - qol: The mix of sugar and Bloody Mary used to make Bloodshot is now its own reagent,
+ called "Bloodshot Base", just to make it easier to ask for from Bartenders.
+ Hemophages beware, however, it doesn't contain enough blood-regenerating reagents
+ to appeal to the tumor on its own, so it won't be going through smoothly if
+ you try to drink it.
+ Hatterhat:
+ - bugfix: The security uniform no longer exposes your chest when all you did was
+ roll the sleeves up.
+ - bugfix: The security formal uniform no longer inherits altsprites from the base
+ uniform, since it didn't have any.
+ - spellcheck: The security uniform's description now mentions a Lopland belt buckle,
+ and not a Nanotrasen belt buckle.
+ LT3:
+ - bugfix: Random events and autotransfer subsystems should play nice with each other
+ again
+ Melbert:
+ - bugfix: Prisoner slots can no longer be controlled by Plexagon HR Core. (special
+ things to distributivgesetz)
+ - bugfix: HoPs can open more assistant job slots if a non-assistant job is the overflow
+ role
+ - code_imp: Dehardcode the HR core blacklist for jobs which cannot have more slots
+ opened by the HoP
+ Rhials:
+ - qol: Modifies the contents of some Mafia lockers. Go check 'em out!
+ Senefi:
+ - rscadd: Some Metastation Medbay lights have been moved and adjusted.
+ SkyratBot:
+ - bugfix: items can be printed from autolathe & protolathe when the exact material
+ amounts are present in them after upgrading
+ - bugfix: max printable amount now shows the correct value & updates when items
+ are printed, materials are removed in the autolathe & protolathe
+ - bugfix: component printer material bar is not greyed out when there are sufficient
+ materials to eject
+ - bugfix: rcd and other devices that uses the silo link upgrade now have the correct
+ material usages
+ - bugfix: silo hold actually works
+ - bugfix: machines using local storage to hold materials will eject it's materials
+ as sheets when deconstructed/destroyed
+ - refactor: Autolathe Material bars now display number of sheets available
+ - refactor: printing an item that does not have enough materials will fail silently
+ with no error messages
+ - refactor: Drone dispenser will eject sheets upon deconstruction
+ - refactor: all things that store materials will auto ejects its sheets(if there
+ is sufficient material) when destroyed
+ - refactor: inserting an item into the material container will display the units
+ consumed as sheets not absolute units
+ - refactor: removed x25 & x50 print buttons from the autolathe
+ - bugfix: Plasmaman DNA can no longer be stolen by changelings.
+ - spellcheck: Phobia warnings have the same glowy text now as they would in messages.
+ - bugfix: Crates no longer stun you when you climb onto them.
+ - balance: Mmmh, butter on a stick. Now for americanbots.
+ - refactor: The mag_type variable on guns has been split between accepted_magazine_type
+ and spawn_magazine_type, allowing weapons to safely spawn with subtypes of their
+ normal magazines without breaking the weapon
+ - bugfix: Several weapons that spawned with special magazines, the riot dart pre-loaded
+ donk pistol for example, will now be able to accept normal donksoft magazines
+ that don't spawn loaded with riot darts.
+ - bugfix: some fixes to spess IRS pirates.
+ - balance: IRS armor is now bulky
+ - bugfix: Makes radiation nebula space work on high-pop by applying the radiation
+ more directly
+ - balance: Internal nebula storm no longer gives 10 seconds of immunity and has
+ a very, very small chance to apply mutations
+ - balance: Rudes nebula rad immunity from 10 seconds to 6 seconds (shouldn't differ
+ too much since we use a different system now)
+ - spellcheck: Head of Personnel's roundstart text now says that they should answer
+ to the captain now instead of themselves.
+ jjpark-kb:
+ - balance: Reagent Imbuing (from forging) is strictly for ashwalkers & icecats
+ - balance: Forges can only be fully upgraded (legendary smiths) by ashwalkers &
+ icecats
+ - balance: Some of the forge upgrades have been moved around to accommodate reagent
+ imbuing being ashwalker/icecat only
+ oranges:
+ - balance: holodeck spawned banners no longer give the inspiration effects
+ vinylspiders:
+ - bugfix: fixes the nitrogen breather quirk not giving the correct lungs or spawning
+ the breathing dogtag
diff --git a/icons/hud/screen_alert.dmi b/icons/hud/screen_alert.dmi
index 78421d72472..7cc03330969 100755
Binary files a/icons/hud/screen_alert.dmi and b/icons/hud/screen_alert.dmi differ
diff --git a/modular_skyrat/master_files/code/controllers/subsystem/events.dm b/modular_skyrat/master_files/code/controllers/subsystem/events.dm
index 611cada85c7..e6e38564c68 100644
--- a/modular_skyrat/master_files/code/controllers/subsystem/events.dm
+++ b/modular_skyrat/master_files/code/controllers/subsystem/events.dm
@@ -1,9 +1,9 @@
/// Check if we have an upcoming transfer vote, or we're already evacuating.
/datum/controller/subsystem/events/checkEvent()
if(scheduled <= world.time)
- if(SSautotransfer.can_fire == TRUE && ((SSautotransfer.targettime - world.realtime) <= 15 MINUTES + CONFIG_GET(number/vote_period)))
+ if(SSautotransfer.can_fire == TRUE && ((SSautotransfer.targettime - REALTIMEOFDAY) <= 15 MINUTES + CONFIG_GET(number/vote_period)))
log_game("ICES: Event cancelled due to precondition check. Reason: Pending autotransfer vote.")
- log_game("ICES: Info: AT [(SSautotransfer.targettime - world.realtime)] | VP [(15 MINUTES + CONFIG_GET(number/vote_period))]")
+ log_game("ICES: Info: AT [(SSautotransfer.targettime - REALTIMEOFDAY)] | VP [(15 MINUTES + CONFIG_GET(number/vote_period))]")
message_admins("ICES: Event cancelled due to precondition check. Reason: Pending autotransfer vote.")
reschedule()
return
diff --git a/modular_skyrat/master_files/code/datums/quirks/neutral.dm b/modular_skyrat/master_files/code/datums/quirks/neutral.dm
index 9ecdf53d593..51d96c8fdbe 100644
--- a/modular_skyrat/master_files/code/datums/quirks/neutral.dm
+++ b/modular_skyrat/master_files/code/datums/quirks/neutral.dm
@@ -67,20 +67,22 @@
if (istype(current_lungs, lungs_typepath))
return
lungs_holding = current_lungs
- lungs_holding.organ_flags |= ORGAN_FROZEN
+ if(!isnull(lungs_holding))
+ lungs_holding.organ_flags |= ORGAN_FROZEN // stop decay on the old lungs
lungs_added = new lungs_typepath
- lungs_added.Insert(carbon_holder)
- lungs_holding.moveToNullspace()
+ lungs_added.Insert(carbon_holder, special = TRUE)
+ if(!isnull(lungs_holding))
+ lungs_holding.moveToNullspace() // save them for later
/datum/quirk/equipping/lungs/remove()
var/mob/living/carbon/carbon_holder = quirk_holder
- if (!istype(carbon_holder) || !lungs_holding)
+ if (!istype(carbon_holder) || !istype(lungs_holding))
return
var/obj/item/organ/internal/lungs/lungs = carbon_holder.get_organ_slot(ORGAN_SLOT_LUNGS)
if (lungs != lungs_added && lungs != lungs_holding)
qdel(lungs_holding)
return
- lungs_holding.Insert(carbon_holder, drop_if_replaced = FALSE)
+ lungs_holding.Insert(carbon_holder, special = TRUE, drop_if_replaced = FALSE)
lungs_holding.organ_flags &= ~ORGAN_FROZEN
/datum/quirk/equipping/lungs/on_equip_item(obj/item/equipped, success)
@@ -89,7 +91,7 @@
return
var/obj/item/clothing/accessory/breathing/acc = equipped
acc.breath_type = breath_type
- if (acc.can_attach_accessory(human_holder?.w_uniform))
+ if (acc.can_attach_accessory(human_holder?.w_uniform, human_holder))
acc.attach(human_holder.w_uniform, human_holder)
/obj/item/clothing/accessory/breathing
diff --git a/modular_skyrat/master_files/code/modules/jobs/job_types/clown.dm b/modular_skyrat/master_files/code/modules/jobs/job_types/clown.dm
index 893331f1d6e..bbc88c0b30a 100644
--- a/modular_skyrat/master_files/code/modules/jobs/job_types/clown.dm
+++ b/modular_skyrat/master_files/code/modules/jobs/job_types/clown.dm
@@ -1,2 +1,3 @@
/datum/job/clown
vox_outfit = /datum/outfit/vox/clown
+ job_flags = STATION_JOB_FLAGS | JOB_CANNOT_OPEN_SLOTS
diff --git a/modular_skyrat/modules/aesthetics/guns/code/guns.dm b/modular_skyrat/modules/aesthetics/guns/code/guns.dm
index 4edcc2f22b7..39344c29ad2 100644
--- a/modular_skyrat/modules/aesthetics/guns/code/guns.dm
+++ b/modular_skyrat/modules/aesthetics/guns/code/guns.dm
@@ -267,7 +267,7 @@
suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
recoil = 2
weapon_weight = WEAPON_HEAVY
- mag_type = /obj/item/ammo_box/magazine/sniper_rounds
+ accepted_magazine_type = /obj/item/ammo_box/magazine/sniper_rounds
fire_delay = 6 SECONDS
burst_size = 1
w_class = WEIGHT_CLASS_NORMAL
@@ -341,7 +341,7 @@
can_unsuppress = TRUE
recoil = 1.8
weapon_weight = WEAPON_HEAVY
- mag_type = /obj/item/ammo_box/magazine/sniper_rounds
+ accepted_magazine_type = /obj/item/ammo_box/magazine/sniper_rounds
fire_delay = 55 //Slightly smaller than standard sniper
burst_size = 1
slot_flags = ITEM_SLOT_BACK
@@ -381,12 +381,12 @@
icon_state = "bubba"
worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi'
worn_icon_state = "bubba"
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction/bubba
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/bubba
can_be_sawn_off = FALSE
/obj/item/gun/ballistic/rifle/boltaction/sporterized/empty
bolt_locked = TRUE // so the bolt starts visibly open
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction/bubba/empty
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/bubba/empty
/obj/item/ammo_box/magazine/internal/boltaction/bubba
name = "sportiv extended internal magazine"
@@ -411,7 +411,7 @@
fire_sound = 'sound/weapons/gun/pistol/shot_suppressed.ogg'
fire_delay = 5
fire_sound_volume = 90
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/ostwind/arg75
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/ostwind/arg75
/obj/item/gun/ballistic/automatic/ar/modular/model75/give_manufacturer_examine()
AddElement(/datum/element/manufacturer_examine, COMPANY_NANOTRASEN)
diff --git a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm b/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm
index 29857955e57..2b5ceef309d 100644
--- a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm
+++ b/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm
@@ -66,7 +66,14 @@
)
/obj/machinery/ammo_workbench/Initialize(mapload)
- AddComponent(/datum/component/material_container, SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], 200000, MATCONTAINER_EXAMINE, allowed_items = /obj/item/stack, _after_insert = CALLBACK(src, PROC_REF(AfterMaterialInsert)))
+ AddComponent( \
+ /datum/component/material_container, \
+ SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], \
+ 200000, \
+ MATCONTAINER_EXAMINE, \
+ allowed_items = /obj/item/stack, \
+ container_signals = list(COMSIG_MATCONTAINER_ITEM_CONSUMED = TYPE_PROC_REF(/obj/machinery/autolathe, AfterMaterialInsert)) \
+ )
. = ..()
set_wires(new /datum/wires/ammo_workbench(src))
diff --git a/modular_skyrat/modules/armaments/code/armament_entries.dm b/modular_skyrat/modules/armaments/code/armament_entries.dm
index cdb3dc77841..6b736ecacd9 100644
--- a/modular_skyrat/modules/armaments/code/armament_entries.dm
+++ b/modular_skyrat/modules/armaments/code/armament_entries.dm
@@ -114,7 +114,7 @@ SUBSYSTEM_DEF(armaments)
if(istype(test_item, /obj/item/gun/ballistic))
var/obj/item/gun/ballistic/ballistic_test = test_item
if(!ballistic_test.internal_magazine)
- magazine = ballistic_test.mag_type
+ magazine = ballistic_test.spawn_magazine_type
cached_base64 = icon2base64(getFlatIcon(test_item, no_anim = TRUE))
qdel(test_item)
diff --git a/modular_skyrat/modules/assault_operatives/code/armaments/assaultops_armament_station.dm b/modular_skyrat/modules/assault_operatives/code/armaments/assaultops_armament_station.dm
index 5925e2d7e2d..6356aa478b4 100644
--- a/modular_skyrat/modules/assault_operatives/code/armaments/assaultops_armament_station.dm
+++ b/modular_skyrat/modules/assault_operatives/code/armaments/assaultops_armament_station.dm
@@ -26,4 +26,4 @@
var/obj/item/storage/box/ammo_box/spawned_box = new(safe_drop_location)
spawned_box.name = "ammo box - [spawned_ballistic_gun.name]"
for(var/i in 1 to mags_to_spawn)
- new spawned_ballistic_gun.mag_type (spawned_box)
+ new spawned_ballistic_gun.spawn_magazine_type (spawned_box)
diff --git a/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm b/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm
index 86c9d392b79..357c25e02f9 100644
--- a/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm
+++ b/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm
@@ -32,7 +32,7 @@
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_rifle
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_rifle
fire_sound = 'modular_skyrat/modules/sec_haul/sound/sfrifle_fire.ogg'
can_suppress = TRUE
suppressor_x_offset = 4
@@ -87,7 +87,7 @@
w_class = WEIGHT_CLASS_NORMAL
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_smg
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_smg
fire_sound = 'modular_skyrat/modules/sec_haul/sound/smg_fire.ogg'
can_suppress = TRUE
burst_size = 1
@@ -142,7 +142,7 @@
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_shotgun
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_shotgun
fire_sound = 'modular_skyrat/modules/sec_haul/sound/shotgun_bm.ogg'
can_suppress = TRUE
suppressor_x_offset = 4
@@ -206,7 +206,7 @@
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING
internal_magazine = FALSE
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_sniper
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/assault_ops_sniper
fire_sound = 'modular_skyrat/modules/sec_haul/sound/sniper_fire.ogg'
can_suppress = TRUE
suppressor_x_offset = 6
diff --git a/modular_skyrat/modules/assault_operatives/code/vending_machine.dm b/modular_skyrat/modules/assault_operatives/code/vending_machine.dm
index c9da48b3281..fc7995f97d8 100644
--- a/modular_skyrat/modules/assault_operatives/code/vending_machine.dm
+++ b/modular_skyrat/modules/assault_operatives/code/vending_machine.dm
@@ -42,14 +42,14 @@
if(istype(object, /obj/item/gun/ballistic))
var/obj/item/gun/ballistic/gun = object
if(!gun.internal_magazine)
- products.Add(gun.mag_type)
+ products.Add(gun.spawn_magazine_type)
if(istype(object, /obj/item/storage))
var/obj/item/storage/storage = object
for(var/storage_item in storage.contents)
if(istype(storage_item, /obj/item/gun/ballistic))
var/obj/item/gun/ballistic/gun = storage_item
if(!gun.internal_magazine)
- products.Add(gun.mag_type)
+ products.Add(gun.spawn_magazine_type)
//Add our items to the list of products
build_inventory(products, product_records, FALSE)
diff --git a/modular_skyrat/modules/black_mesa/code/armaments/hecu_armament_station.dm b/modular_skyrat/modules/black_mesa/code/armaments/hecu_armament_station.dm
index 98dbdb595f2..e6839d93d26 100644
--- a/modular_skyrat/modules/black_mesa/code/armaments/hecu_armament_station.dm
+++ b/modular_skyrat/modules/black_mesa/code/armaments/hecu_armament_station.dm
@@ -21,4 +21,4 @@
var/obj/item/storage/box/ammo_box/spawned_box = new(safe_drop_location)
spawned_box.name = "ammo box - [spawned_ballistic_gun.name]"
for(var/i in 1 to mags_to_spawn)
- new spawned_ballistic_gun.mag_type (spawned_box)
+ new spawned_ballistic_gun.spawn_magazine_type (spawned_box)
diff --git a/modular_skyrat/modules/black_mesa/code/guns.dm b/modular_skyrat/modules/black_mesa/code/guns.dm
index ace57cb5186..0cd636a574a 100644
--- a/modular_skyrat/modules/black_mesa/code/guns.dm
+++ b/modular_skyrat/modules/black_mesa/code/guns.dm
@@ -3,7 +3,7 @@
desc = "A special laser beam sniper rifle designed by a certain now defunct research facility."
icon_state = "ctfmarksman"
inhand_icon_state = "ctfmarksman"
- mag_type = /obj/item/ammo_box/magazine/recharge/marksman
+ accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/marksman
force = 15
weapon_weight = WEAPON_HEAVY
fire_delay = 4 SECONDS
@@ -42,7 +42,7 @@
righthand_file ='modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
icon_state = "mp5"
inhand_icon_state = "mp5"
- mag_type = /obj/item/ammo_box/magazine/mp5
+ accepted_magazine_type = /obj/item/ammo_box/magazine/mp5
bolt_type = BOLT_TYPE_LOCKING
can_suppress = TRUE
fire_delay = 1.25
diff --git a/modular_skyrat/modules/black_mesa/code/m16_variations.dm b/modular_skyrat/modules/black_mesa/code/m16_variations.dm
index 0df517e498d..7b548db9035 100644
--- a/modular_skyrat/modules/black_mesa/code/m16_variations.dm
+++ b/modular_skyrat/modules/black_mesa/code/m16_variations.dm
@@ -11,7 +11,7 @@
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY
- mag_type = /obj/item/ammo_box/magazine/m16/vintage/oldarms
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m16/vintage/oldarms
fire_delay = 3.5
burst_size = 1
actions_types = list()
diff --git a/modular_skyrat/modules/blueshield/code/blueshield.dm b/modular_skyrat/modules/blueshield/code/blueshield.dm
index cd18ccea1b4..0e837566829 100644
--- a/modular_skyrat/modules/blueshield/code/blueshield.dm
+++ b/modular_skyrat/modules/blueshield/code/blueshield.dm
@@ -41,7 +41,7 @@
)
veteran_only = TRUE
- job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS
+ job_flags = STATION_JOB_FLAGS | JOB_CANNOT_OPEN_SLOTS
/datum/outfit/job/blueshield
name = "Blueshield"
diff --git a/modular_skyrat/modules/clock_cult/code/items/weaponry.dm b/modular_skyrat/modules/clock_cult/code/items/weaponry.dm
index e8ac131fc00..18a66e6f4be 100644
--- a/modular_skyrat/modules/clock_cult/code/items/weaponry.dm
+++ b/modular_skyrat/modules/clock_cult/code/items/weaponry.dm
@@ -156,7 +156,7 @@
inhand_icon_state = "clockwork_bow"
base_icon_state = "bow_clockwork"
force = 10
- mag_type = /obj/item/ammo_box/magazine/internal/bow/clockwork
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/bow/clockwork
/// Time between bolt recharges
var/recharge_time = 1.5 SECONDS
/// Typecache of valid turfs to have the weapon's special effect on
@@ -247,7 +247,7 @@
icon_state = "clockwork_rifle"
inhand_icon_state = "clockwork_rifle"
worn_icon_state = "clockwork_rifle"
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction/lionhunter/clockwork
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/lionhunter/clockwork
fire_sound = 'sound/weapons/gun/sniper/shot.ogg'
show_bolt_icon = FALSE
diff --git a/modular_skyrat/modules/company_imports/code/objects/nri_surplus/ak25.dm b/modular_skyrat/modules/company_imports/code/objects/nri_surplus/ak25.dm
index 46c3da110be..f94e0167a81 100644
--- a/modular_skyrat/modules/company_imports/code/objects/nri_surplus/ak25.dm
+++ b/modular_skyrat/modules/company_imports/code/objects/nri_surplus/ak25.dm
@@ -9,7 +9,7 @@
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY
- mag_type = /obj/item/ammo_box/magazine/ak25
+ accepted_magazine_type = /obj/item/ammo_box/magazine/ak25
can_suppress = FALSE
burst_size = 3
fire_delay = 2
diff --git a/modular_skyrat/modules/customization/modules/food_and_drinks/recipes/drinks_recipes.dm b/modular_skyrat/modules/customization/modules/food_and_drinks/recipes/drinks_recipes.dm
index 10ad32e59a6..636e0071c27 100644
--- a/modular_skyrat/modules/customization/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/modular_skyrat/modules/customization/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -188,9 +188,14 @@
required_reagents = list(/datum/reagent/consumable/catnip_tea = 1, /datum/reagent/consumable/milk = 1)
required_temp = 296 //Just above room temp (22.85'C)
+/datum/chemical_reaction/drink/bloodshot_base
+ results = list(/datum/reagent/consumable/ethanol/bloodshot_base = 2)
+ required_reagents = list(/datum/reagent/consumable/ethanol/bloody_mary = 1, /datum/reagent/consumable/sugar = 1)
+ reaction_tags = REACTION_TAG_DRINK | REACTION_TAG_EASY | REACTION_TAG_OTHER
+
/datum/chemical_reaction/drink/bloodshot
results = list(/datum/reagent/consumable/ethanol/bloodshot = 5)
- required_reagents = list(/datum/reagent/blood = 3, /datum/reagent/consumable/ethanol/bloody_mary = 1, /datum/reagent/consumable/sugar = 1)
+ required_reagents = list(/datum/reagent/blood = 3, /datum/reagent/consumable/ethanol/bloodshot_base = 2)
reaction_tags = REACTION_TAG_DRINK | REACTION_TAG_EASY | REACTION_TAG_OTHER
diff --git a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 33aa6413c75..25af43017e7 100644
--- a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -599,6 +599,15 @@
return ..()
+/datum/reagent/consumable/ethanol/bloodshot_base
+ name = "Bloodshot Base"
+ description = "The bootleg blend of nutrients and alcohol that goes into making Bloodshots. Doesn't taste too great on its own, for Hemophages at least."
+ color = "#c29ca1"
+ boozepwr = 25 // Still more concentrated than in Bloodshot.
+ taste_description = "nutritious mix with an alcoholic kick to it"
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+
+
/datum/reagent/consumable/ethanol/bloodshot
name = "Bloodshot"
description = "The history of the 'Bloodshot' is based in a mix of flavor-neutral chems devised to help deliver nutrients to a Hemophage's tumorous organs. Due to the expense of the real thing and the clinical nature of it, this liquor has been designed as a 'improvised' alternative; though, still tasting like a hangover cure. It smells like iron, giving a clue to the key ingredient."
diff --git a/modular_skyrat/modules/encounters/code/nri_raiders.dm b/modular_skyrat/modules/encounters/code/nri_raiders.dm
index c684e3f1b2a..73c94f1505e 100644
--- a/modular_skyrat/modules/encounters/code/nri_raiders.dm
+++ b/modular_skyrat/modules/encounters/code/nri_raiders.dm
@@ -291,7 +291,7 @@ GLOBAL_VAR(first_officer)
icon_state = "automag"
icon = 'modular_skyrat/modules/sec_haul/icons/guns/automag.dmi'
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/automag
+ accepted_magazine_type = /obj/item/ammo_box/magazine/automag
can_suppress = FALSE
fire_sound = 'modular_skyrat/modules/sec_haul/sound/automag.ogg'
rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
index 33df698074e..f38a497050b 100644
--- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
+++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
@@ -524,9 +524,11 @@
*/
//Officer
/obj/item/clothing/under/rank/security/officer
+ desc = "A tactical security uniform for officers, complete with a Lopland belt buckle."
icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
icon_state = "security_black"
+ alt_covers_chest = TRUE
uses_advanced_reskins = TRUE
unique_reskin = list(
"Black Variant" = list(
@@ -543,6 +545,9 @@
),
)
+/obj/item/clothing/under/rank/security/officer/formal
+ unique_reskin = null // prevents you from losing the unique sprite
+
//Warden
/obj/item/clothing/under/rank/security/warden
icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/akm.dm b/modular_skyrat/modules/gunsgalore/code/guns/akm.dm
index bb6472978cd..5de5eebe72d 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/akm.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/akm.dm
@@ -9,7 +9,7 @@
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY
- mag_type = /obj/item/ammo_box/magazine/akm
+ accepted_magazine_type = /obj/item/ammo_box/magazine/akm
can_suppress = FALSE
fire_delay = 2
actions_types = list()
@@ -95,7 +95,7 @@
desc = "A timeless human design of a carbine chambered in the NRI's 5.6mm ammo. The internal modifications made to the firearm in order to accommodate for non-military use made it incompatible with conventional munitions and gave it the inability to fire fully automatic. It's purpose-built to fire low-grade civilian ammo, anything stronger would obliterate the rifling and render the firearm useless."
icon_state = "akm_civ"
inhand_icon_state = "akm_civ"
- mag_type = /obj/item/ammo_box/magazine/akm/civvie
+ accepted_magazine_type = /obj/item/ammo_box/magazine/akm/civvie
fire_delay = 5
dual_wield_spread = 15
spread = 5
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/fg42.dm b/modular_skyrat/modules/gunsgalore/code/guns/fg42.dm
index 06dd791855d..341508acce3 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/fg42.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/fg42.dm
@@ -9,7 +9,7 @@
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY
- mag_type = /obj/item/ammo_box/magazine/fg42
+ accepted_magazine_type = /obj/item/ammo_box/magazine/fg42
can_suppress = FALSE
burst_size = 2
spread = 0
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/m16.dm b/modular_skyrat/modules/gunsgalore/code/guns/m16.dm
index 75e4a5fa144..2d154ddeeac 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/m16.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/m16.dm
@@ -11,7 +11,7 @@
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY
- mag_type = /obj/item/ammo_box/magazine/m16
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m16
can_suppress = FALSE
burst_size = 3
fire_delay = 2
@@ -64,7 +64,7 @@
icon_state = "m16_modern2"
inhand_icon_state = "m16"
worn_icon_state = "m16"
- mag_type = /obj/item/ammo_box/magazine/m16/patriot
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m16/patriot
burst_size = 4
fire_delay = 0.5
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm b/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm
index 87aef1ece58..3b876fea7c9 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm
@@ -17,7 +17,7 @@
slot_flags = ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_HUGE
spread = 15
- mag_type = /obj/item/ammo_box/magazine/mg34
+ accepted_magazine_type = /obj/item/ammo_box/magazine/mg34
can_suppress = FALSE
fire_delay = 1
bolt_type = BOLT_TYPE_OPEN
@@ -64,7 +64,7 @@
return ..()
/obj/item/gun/ballistic/automatic/mg34/attackby(obj/item/A, mob/user, params)
- if(!cover_open && istype(A, mag_type))
+ if(!cover_open && istype(A, accepted_magazine_type))
to_chat(user, span_warning("[src]'s dust cover prevents a magazine from being fit."))
return
..()
@@ -84,7 +84,7 @@
fire_delay = 0.04
burst_size = 5
spread = 5
- mag_type = /obj/item/ammo_box/magazine/mg34/packapunch
+ accepted_magazine_type = /obj/item/ammo_box/magazine/mg34/packapunch
/obj/item/ammo_box/magazine/mg34/packapunch
max_ammo = 999
@@ -111,7 +111,7 @@
fire_sound_volume = 100
fire_delay = 0.5
fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mg42_fire.ogg'
- mag_type = /obj/item/ammo_box/magazine/mg42
+ accepted_magazine_type = /obj/item/ammo_box/magazine/mg42
spread = SPREAD_UNDEPLOYED
/// If we are resting, the bipod is deployed.
var/bipod_deployed = FALSE
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/mp40.dm b/modular_skyrat/modules/gunsgalore/code/guns/mp40.dm
index 02fe35875c1..7f098b230f4 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/mp40.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/mp40.dm
@@ -9,7 +9,7 @@
worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
worn_icon_state = "mp40"
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
- mag_type = /obj/item/ammo_box/magazine/mp40
+ accepted_magazine_type = /obj/item/ammo_box/magazine/mp40
can_suppress = FALSE
burst_size = 1
fire_delay = 1.7
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/p90.dm b/modular_skyrat/modules/gunsgalore/code/guns/p90.dm
index 5d8b81ae2dd..311a78776ce 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/p90.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/p90.dm
@@ -9,7 +9,7 @@
worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
worn_icon_state = "p90"
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
- mag_type = /obj/item/ammo_box/magazine/p90
+ accepted_magazine_type = /obj/item/ammo_box/magazine/p90
can_suppress = FALSE
fire_delay = 1
fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/p90_fire.ogg'
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/pps.dm b/modular_skyrat/modules/gunsgalore/code/guns/pps.dm
index 756ae551959..16767f45df3 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/pps.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/pps.dm
@@ -7,7 +7,7 @@
righthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
inhand_icon_state = "pps"
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
- mag_type = /obj/item/ammo_box/magazine/pps
+ accepted_magazine_type = /obj/item/ammo_box/magazine/pps
can_suppress = FALSE
fire_delay = 3
worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi'
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/ppsh.dm b/modular_skyrat/modules/gunsgalore/code/guns/ppsh.dm
index cff87e32227..26baa571166 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/ppsh.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/ppsh.dm
@@ -10,7 +10,7 @@
worn_icon_state = "ppsh"
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_BULKY
- mag_type = /obj/item/ammo_box/magazine/ppsh
+ accepted_magazine_type = /obj/item/ammo_box/magazine/ppsh
can_suppress = FALSE
spread = 20
fire_delay = 0.5
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/scar.dm b/modular_skyrat/modules/gunsgalore/code/guns/scar.dm
index 62f6bbf6888..0fe3204a406 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/scar.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/scar.dm
@@ -11,7 +11,7 @@
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY
- mag_type = /obj/item/ammo_box/magazine/m16
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m16
can_suppress = FALSE
fire_delay = 1.90
fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/scar_fire.ogg'
diff --git a/modular_skyrat/modules/gunsgalore/code/guns/stg.dm b/modular_skyrat/modules/gunsgalore/code/guns/stg.dm
index d40828f78f0..d4fe1c9381f 100644
--- a/modular_skyrat/modules/gunsgalore/code/guns/stg.dm
+++ b/modular_skyrat/modules/gunsgalore/code/guns/stg.dm
@@ -11,7 +11,7 @@
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY
- mag_type = /obj/item/ammo_box/magazine/stg
+ accepted_magazine_type = /obj/item/ammo_box/magazine/stg
can_suppress = FALSE
fire_delay = 1.5
burst_size = 1
diff --git a/modular_skyrat/modules/mapping/code/areas/space.dm b/modular_skyrat/modules/mapping/code/areas/space.dm
index 7245aa6248e..583fbb8ef8c 100644
--- a/modular_skyrat/modules/mapping/code/areas/space.dm
+++ b/modular_skyrat/modules/mapping/code/areas/space.dm
@@ -232,31 +232,33 @@
/area/ruin/space/has_grav/cargodise_freighter/trauma
name = "Freighter Trauma Center"
- icon_state = "medbay1"
/area/ruin/space/has_grav/cargodise_freighter/utility
name = "Freighter Utility Room"
- icon_state = "engine"
/area/ruin/space/has_grav/cargodise_freighter/kitchen
name = "Freighter Kitchen"
- icon_state = "cafeteria"
/area/ruin/space/has_grav/cargodise_freighter/bridge
name = "Freighter Bridge"
- icon_state = "bridge"
/area/ruin/space/has_grav/cargodise_freighter/cargo
name = "Freighter Cargo Bay"
- icon_state = "cargo"
/area/ruin/space/has_grav/cargodise_freighter/mining
name = "Freighter Mining Office"
- icon_state = "cargo"
/area/ruin/space/has_grav/cargodise_freighter/quarters
name = "Freighter Crew Quarters"
- icon_state = "crew_quarters"
+
+/area/ruin/space/has_grav/cargodise_freighter/hydroponics
+ name = "Freighter Hydroponics"
+
+/area/ruin/space/has_grav/cargodise_freighter/vault
+ name = "Freighter Vault"
+
+/area/ruin/space/has_grav/cargodise_freighter/exterior
+ name = "Freighter Exterior"
// Skyrat's Space Hotel
diff --git a/modular_skyrat/modules/mapping/code/lockers/cargodiselost/cargodiselockers.dm b/modular_skyrat/modules/mapping/code/lockers/cargodiselost/cargodiselockers.dm
new file mode 100644
index 00000000000..838fca7db3a
--- /dev/null
+++ b/modular_skyrat/modules/mapping/code/lockers/cargodiselost/cargodiselockers.dm
@@ -0,0 +1,38 @@
+//Lockers used in cargodiselost.dmm
+
+//Ammo storage in freighter armoury
+/obj/structure/closet/freighterammo
+ name = "Ammo Storage"
+
+//Freighter QM's gear locker
+/obj/structure/closet/secure_closet/personal/cabinet/freighterboss
+ name = "Personal Closet"
+
+/obj/structure/closet/freighterammo/PopulateContents()
+ . = ..()
+
+ new /obj/item/ammo_box/magazine/akm(src)
+ new /obj/item/ammo_box/magazine/akm(src)
+ new /obj/item/ammo_box/magazine/akm(src)
+ new /obj/item/ammo_box/magazine/akm(src)
+ new /obj/item/ammo_box/magazine/multi_sprite/makarov(src)
+ new /obj/item/ammo_box/magazine/multi_sprite/makarov(src)
+ new /obj/item/ammo_box/a762(src)
+ new /obj/item/ammo_box/a762(src)
+ new /obj/item/ammo_box/a762(src)
+ new /obj/item/ammo_box/a762(src)
+
+/obj/structure/closet/secure_closet/personal/cabinet/freighterboss/PopulateContents()
+ . = ..()
+
+ new /obj/item/gun/ballistic/automatic/cfa_rifle(src)
+ new /obj/item/storage/bag/ammo(src)
+ new /obj/item/clothing/suit/armor/bulletproof(src)
+ new /obj/item/storage/belt/utility/syndicate(src)
+ new /obj/item/gps/mining(src)
+ new /obj/item/clothing/gloves/combat(src)
+ new /obj/item/storage/backpack/duffelbag/syndie(src)
+ new /obj/item/radio(src)
+ new /obj/item/ammo_box/magazine/cm68(src)
+ new /obj/item/ammo_box/magazine/cm68(src)
+ new /obj/item/ammo_box/magazine/cm68(src)
diff --git a/modular_skyrat/modules/marines/code/gear.dm b/modular_skyrat/modules/marines/code/gear.dm
index 4e6400d741b..3b533700993 100644
--- a/modular_skyrat/modules/marines/code/gear.dm
+++ b/modular_skyrat/modules/marines/code/gear.dm
@@ -15,7 +15,7 @@
can_bayonet = FALSE
mag_display = TRUE
mag_display_ammo = FALSE
- mag_type = /obj/item/ammo_box/magazine/m44a
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m44a
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BELT
@@ -68,7 +68,7 @@
name = "\improper M2 auto-shotgun underbarrel"
desc = "This shouldn't be heeere!"
can_suppress = FALSE
- mag_type = /obj/item/ammo_box/magazine/internal/shot/as2/ubsg
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/as2/ubsg
/obj/item/gun/ballistic/shotgun/automatic/as2/ubsg/give_gun_safeties()
return
diff --git a/modular_skyrat/modules/marines/code/smartgun.dm b/modular_skyrat/modules/marines/code/smartgun.dm
index a71de917a30..a31cf1a6bc0 100644
--- a/modular_skyrat/modules/marines/code/smartgun.dm
+++ b/modular_skyrat/modules/marines/code/smartgun.dm
@@ -17,7 +17,7 @@
slot_flags = ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_HUGE
spread = 18
- mag_type = /obj/item/ammo_box/magazine/smartgun_drum
+ accepted_magazine_type = /obj/item/ammo_box/magazine/smartgun_drum
can_suppress = FALSE
fire_delay = 0.15
bolt_type = BOLT_TYPE_OPEN
@@ -77,7 +77,7 @@
return ..()
/obj/item/gun/ballistic/automatic/smart_machine_gun/attackby(obj/item/attack_item, mob/user, params)
- if(!cover_open && istype(attack_item, mag_type))
+ if(!cover_open && istype(attack_item, accepted_magazine_type))
to_chat(user, span_warning("[src]'s dust cover prevents a magazine from being fit."))
return
..()
diff --git a/modular_skyrat/modules/modular_weapons/code/automatic.dm b/modular_skyrat/modules/modular_weapons/code/automatic.dm
index 7fc9c0211a6..e9ccae147c9 100644
--- a/modular_skyrat/modules/modular_weapons/code/automatic.dm
+++ b/modular_skyrat/modules/modular_weapons/code/automatic.dm
@@ -41,7 +41,7 @@
icon_state = "mp5"
inhand_icon_state = "arg"
selector_switch_icon = TRUE
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_wildcat
can_suppress = FALSE
fire_delay = 1.25
spread = 5
@@ -73,7 +73,7 @@
icon_state = "cfa-lynx"
inhand_icon_state = "arg"
selector_switch_icon = FALSE
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx
can_suppress = FALSE
fire_delay = 1.90 //Previously 0.5. Changed due to it being the Blueshield's default firearm.
spread = 2
diff --git a/modular_skyrat/modules/modular_weapons/code/pistol.dm b/modular_skyrat/modules/modular_weapons/code/pistol.dm
index 6783bd32c8d..7333fa60324 100644
--- a/modular_skyrat/modules/modular_weapons/code/pistol.dm
+++ b/modular_skyrat/modules/modular_weapons/code/pistol.dm
@@ -7,7 +7,7 @@
desc = "An easily-concealable pistol chambered for 4.2x30mm."
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/projectile.dmi'
icon_state = "cfa-snub"
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_snub
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_snub
can_suppress = TRUE
fire_sound_volume = 30
w_class = WEIGHT_CLASS_SMALL
@@ -26,7 +26,7 @@
desc = "A heavy-duty sidearm chambered in 12x27mm."
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/projectile.dmi'
icon_state = "cfa_ruby"
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_ruby
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_ruby
can_suppress = FALSE
fire_sound_volume = 120
w_class = WEIGHT_CLASS_NORMAL
diff --git a/modular_skyrat/modules/modular_weapons/code/revolver.dm b/modular_skyrat/modules/modular_weapons/code/revolver.dm
index 9bfc43ee6bc..669f874026f 100644
--- a/modular_skyrat/modules/modular_weapons/code/revolver.dm
+++ b/modular_skyrat/modules/modular_weapons/code/revolver.dm
@@ -10,7 +10,7 @@
desc = "A revolving rifle chambered in .38. "
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/guns/projectile40x32.dmi'
icon_state = "revolving-rifle"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38 //This is just a detective's revolver but it's too big for bags..
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38 //This is just a detective's revolver but it's too big for bags..
pixel_x = -4 // It's centred on a 40x32 pixel spritesheet.
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY // The entire purpose of this is that it's a bulky rifle instead of a revolver.
@@ -28,7 +28,7 @@
name = "\improper .45 revolving rifle"
desc = "A gold trimmed revolving rifle! It fires .45 bullets."
icon_state = "revolving-rifle-gold"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45 //Gold! We're using .45 because TG's 10mm does 40 damage, this does 30.
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45 //Gold! We're using .45 because TG's 10mm does 40 damage, this does 30.
w_class = WEIGHT_CLASS_BULKY
inhand_icon_state = "revolving_gold"
diff --git a/modular_skyrat/modules/modular_weapons/code/rifle.dm b/modular_skyrat/modules/modular_weapons/code/rifle.dm
index 858db39cd23..eb40dc20330 100644
--- a/modular_skyrat/modules/modular_weapons/code/rifle.dm
+++ b/modular_skyrat/modules/modular_weapons/code/rifle.dm
@@ -13,7 +13,7 @@
lefthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/inhands/weapons/64x_guns_left.dmi'
righthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/inhands/weapons/64x_guns_right.dmi'
worn_icon_state = "gun"
- mag_type = /obj/item/ammo_box/magazine/cm68
+ accepted_magazine_type = /obj/item/ammo_box/magazine/cm68
fire_delay = 5
can_suppress = FALSE
burst_size = 1
diff --git a/modular_skyrat/modules/moretraitoritems/code/ocelot_revolver.dm b/modular_skyrat/modules/moretraitoritems/code/ocelot_revolver.dm
index 70a1149dccb..84c9f6d697d 100644
--- a/modular_skyrat/modules/moretraitoritems/code/ocelot_revolver.dm
+++ b/modular_skyrat/modules/moretraitoritems/code/ocelot_revolver.dm
@@ -4,7 +4,7 @@
// this could probably be made funnier by reducing its damage multiplier but also making it so that every fired bullet has the wacky ricochets
// but that's a different plate of cookies for a different glass of milk
icon_state = "c38_panther"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder
/obj/item/ammo_casing/a357/peacemaker
name = ".357 Peacemaker bullet casing"
diff --git a/modular_skyrat/modules/nanotrasen_rep/code/m45a5.dm b/modular_skyrat/modules/nanotrasen_rep/code/m45a5.dm
index 634ea2e9872..8d14eab2b2f 100644
--- a/modular_skyrat/modules/nanotrasen_rep/code/m45a5.dm
+++ b/modular_skyrat/modules/nanotrasen_rep/code/m45a5.dm
@@ -6,7 +6,7 @@
icon = 'modular_skyrat/modules/blueshield/icons/M45A5.dmi'
icon_state = "m45a5"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/m45a5
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m45a5
can_suppress = FALSE
fire_delay = 4.25 //Originally 1.75 which was unintentionally extremely fast.
fire_sound_volume = 60
diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm
index f396d5f2f1d..cf43df0bc2c 100644
--- a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm
+++ b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm
@@ -38,7 +38,7 @@
)
veteran_only = TRUE
- job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS
+ job_flags = STATION_JOB_FLAGS | JOB_BOLD_SELECT_TEXT | JOB_CANNOT_OPEN_SLOTS
/datum/outfit/job/nanotrasen_consultant
name = "Nanotrasen Consultant"
diff --git a/modular_skyrat/modules/novaya_ert/code/automatic.dm b/modular_skyrat/modules/novaya_ert/code/automatic.dm
index a7a808026a5..a3ed2765279 100644
--- a/modular_skyrat/modules/novaya_ert/code/automatic.dm
+++ b/modular_skyrat/modules/novaya_ert/code/automatic.dm
@@ -12,7 +12,7 @@
icon_state = "nri_smg"
inhand_icon_state = "nri_smg"
w_class = WEIGHT_CLASS_BULKY
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/cfa_lynx
fire_delay = 1
burst_size = 5
dual_wield_spread = 5
@@ -32,7 +32,7 @@
'PATRIOT DEFENSE SYSTEMS' is inscribed on the receiver, indicating it's been made with a plasteel printer."
icon = 'modular_skyrat/modules/novaya_ert/icons/pistol.dmi'
w_class = WEIGHT_CLASS_SMALL
- mag_type = /obj/item/ammo_box/magazine/m9mm_aps
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m9mm_aps
burst_size = 3
fire_delay = 3
diff --git a/modular_skyrat/modules/novaya_ert/code/surplus_weapons.dm b/modular_skyrat/modules/novaya_ert/code/surplus_weapons.dm
index abaa310dcc0..5e40743aa8e 100644
--- a/modular_skyrat/modules/novaya_ert/code/surplus_weapons.dm
+++ b/modular_skyrat/modules/novaya_ert/code/surplus_weapons.dm
@@ -69,7 +69,7 @@
/obj/item/gun/ballistic/revolver/cin_shotgun_revolver
name = "\improper Tkach 'Ya-Sui' 12 GA revolver"
desc = "An outdated sidearm rarely seen in use by some members of the CIN. A revolver type design with a three shell cylinder. That's right, shell, this one shoots twelve guage."
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev12ga
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/rev12ga
recoil = SAWN_OFF_RECOIL
weapon_weight = WEAPON_HEAVY
icon = 'modular_skyrat/modules/novaya_ert/icons/surplus_guns/guns_32.dmi'
@@ -122,7 +122,7 @@
w_class = WEIGHT_CLASS_HUGE
slot_flags = ITEM_SLOT_BACK
- mag_type = /obj/item/ammo_box/magazine/cin_amr
+ accepted_magazine_type = /obj/item/ammo_box/magazine/cin_amr
can_suppress = FALSE
can_bayonet = FALSE
diff --git a/modular_skyrat/modules/projectiles/code/guns/misc/m6pdw.dm b/modular_skyrat/modules/projectiles/code/guns/misc/m6pdw.dm
index 244870c17a0..df95f6072e9 100644
--- a/modular_skyrat/modules/projectiles/code/guns/misc/m6pdw.dm
+++ b/modular_skyrat/modules/projectiles/code/guns/misc/m6pdw.dm
@@ -10,7 +10,7 @@
lefthand_file = 'modular_skyrat/modules/projectiles/icons/inhands/lefthand.dmi'
w_class = WEIGHT_CLASS_NORMAL
spawnwithmagazine = FALSE
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/g17
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/g17
can_suppress = FALSE
fire_sound = 'sound/weapons/gun/pistol/shot_alt.ogg'
rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
diff --git a/modular_skyrat/modules/reagent_forging/code/forge.dm b/modular_skyrat/modules/reagent_forging/code/forge.dm
index 90345c7dc1d..1aee837169a 100644
--- a/modular_skyrat/modules/reagent_forging/code/forge.dm
+++ b/modular_skyrat/modules/reagent_forging/code/forge.dm
@@ -160,7 +160,7 @@
. += span_notice("
[src] is currently [forge_temperature] degrees hot, going towards [target_temperature] degrees.
")
- if(reagent_forging)
+ if(reagent_forging && (is_species(user, /datum/species/lizard/ashwalker) || is_species(user, /datum/species/human/felinid/primitive)))
. += span_warning("[src] has a fine gold trim, it is ready to imbue chemicals into reagent objects.")
return .
@@ -388,27 +388,30 @@
if(!forced)
to_chat(user, span_notice("Some careful placement and stoking of the flame will allow you to keep at least the embers burning..."))
minimum_target_temperature = 25 // Will allow quicker reheating from having no fuel
- temperature_loss_reduction = 2
+ temperature_loss_reduction = 3
forge_level = FORGE_LEVEL_JOURNEYMAN
if(SKILL_LEVEL_EXPERT)
if(!forced)
- to_chat(user, span_notice("With just the right heat treating technique, metal could be made to accept reagents..."))
- create_reagent_forge()
- temperature_loss_reduction = 3
+ to_chat(user, span_notice("[src] has become nearly perfect, able to hold heat for long enough that even a piece of wood can outmatch the longevity of lesser forges."))
+ temperature_loss_reduction = 4
minimum_target_temperature = 25
forge_level = FORGE_LEVEL_EXPERT
if(SKILL_LEVEL_MASTER)
if(!forced)
- to_chat(user, span_notice("[src] has become nearly perfect, able to hold heat for long enough that even a piece of wood can outmatch the longevity of lesser forges."))
- temperature_loss_reduction = 4
+ to_chat(user, span_notice("The perfect forge for a perfect metalsmith, with your knowledge it should bleed heat so slowly, that not even you will live to see [src] cool."))
+ temperature_loss_reduction = MAX_TEMPERATURE_LOSS_DECREASE
minimum_target_temperature = 25
forge_level = FORGE_LEVEL_MASTER
if(SKILL_LEVEL_LEGENDARY)
if(!forced)
- to_chat(user, span_notice("The perfect forge for a perfect metalsmith, with your knowledge it should bleed heat so slowly, that not even you will live to see [src] cool."))
+ if(is_species(user, /datum/species/lizard/ashwalker) || is_species(user, /datum/species/human/felinid/primitive))
+ to_chat(user, span_notice("With just the right heat treating technique, metal could be made to accept reagents..."))
+ create_reagent_forge()
+ if(forge_level == FORGE_LEVEL_MASTER)
+ to_chat(user, span_warning("It is impossible to further improve the forge!"))
temperature_loss_reduction = MAX_TEMPERATURE_LOSS_DECREASE
minimum_target_temperature = 25 // This won't matter except in a few cases here, but we still need to cover those few cases
forge_level = FORGE_LEVEL_LEGENDARY
@@ -557,6 +560,16 @@
/// Handles weapon reagent imbuing
/obj/structure/reagent_forge/proc/handle_weapon_imbue(obj/attacking_item, mob/living/user)
+ //This code will refuse all non-ashwalkers & non-icecats from imbuing
+ if(!ishuman(user))
+ to_chat(user, span_danger("It is impossible for you to imbue!")) //maybe remove (ashwalkers & icecats only) after some time
+ return
+
+ var/mob/living/carbon/human/human_user = user
+ if(!is_species(human_user, /datum/species/lizard/ashwalker) && !is_species(human_user, /datum/species/human/felinid/primitive))
+ to_chat(user, span_danger("It is impossible for you to imbue!")) //maybe remove (ashwalkers & icecats only) after some time
+ return
+
in_use = TRUE
balloon_alert_to_viewers("imbuing...")
@@ -597,6 +610,16 @@
/// Handles clothing imbuing, extremely similar to weapon imbuing but not in the same proc because of how uhh... goofy the way this has to be done is
/obj/structure/reagent_forge/proc/handle_clothing_imbue(obj/attacking_item, mob/living/user)
+ //This code will refuse all non-ashwalkers & non-icecats from imbuing
+ if(!ishuman(user))
+ to_chat(user, span_danger("It is impossible for you to imbue!")) //maybe remove (ashwalkers & icecats only) after some time
+ return
+
+ var/mob/living/carbon/human/human_user = user
+ if(!is_species(human_user, /datum/species/lizard/ashwalker) && !is_species(human_user, /datum/species/human/felinid/primitive))
+ to_chat(user, span_danger("It is impossible for you to imbue!")) //maybe remove (ashwalkers & icecats only) after some time
+ return
+
in_use = TRUE
balloon_alert_to_viewers("imbuing...")
@@ -879,9 +902,28 @@
new /obj/item/stack/sheet/iron/ten(get_turf(src))
return ..()
-/obj/structure/reagent_forge/ready
+/obj/structure/reagent_forge/tier2
+ forge_level = FORGE_LEVEL_NOVICE
+
+/obj/structure/reagent_forge/tier3
+ forge_level = FORGE_LEVEL_APPRENTICE
+
+/obj/structure/reagent_forge/tier4
+ forge_level = FORGE_LEVEL_JOURNEYMAN
+
+/obj/structure/reagent_forge/tier5
+ forge_level = FORGE_LEVEL_EXPERT
+
+/obj/structure/reagent_forge/tier6
+ forge_level = FORGE_LEVEL_MASTER
+
+/obj/structure/reagent_forge/tier7
forge_level = FORGE_LEVEL_LEGENDARY
+/obj/structure/reagent_forge/tier7/imbuing/Initialize(mapload)
+ . = ..()
+ create_reagent_forge()
+
/particles/smoke/mild
spawning = 1
velocity = list(0, 0.3, 0)
diff --git a/modular_skyrat/modules/robohand/code/robohand.dm b/modular_skyrat/modules/robohand/code/robohand.dm
index 3faef4c18cc..a78c973c002 100644
--- a/modular_skyrat/modules/robohand/code/robohand.dm
+++ b/modular_skyrat/modules/robohand/code/robohand.dm
@@ -12,7 +12,7 @@
icon = 'modular_skyrat/modules/robohand/icons/3516.dmi'
icon_state = "3516"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/m14mm
+ accepted_magazine_type = /obj/item/ammo_box/magazine/m14mm
can_suppress = FALSE
fire_sound = 'modular_skyrat/modules/robohand/sound/fire2.ogg'
load_sound = 'modular_skyrat/modules/robohand/sound/reload.ogg'
@@ -45,7 +45,7 @@
. = ..()
/obj/item/gun/ballistic/automatic/pistol/robohand/insert_magazine(mob/user, obj/item/ammo_box/magazine/inserted_mag, display_message)
- if(!istype(inserted_mag, mag_type))
+ if(!istype(inserted_mag, accepted_magazine_type))
to_chat(user, span_warning("\The [inserted_mag] doesn't seem to fit into \the [src]..."))
return FALSE
if(!user.transferItemToLoc(inserted_mag, src))
diff --git a/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm b/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm
index 09a8fcbb493..7d338480d8d 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/armory_spawns.dm
@@ -32,7 +32,7 @@
var/obj/item/storage/box/ammo_box/spawned_box = new(loc)
spawned_box.name = "ammo box - [spawned_ballistic_gun.name]"
for(var/i in 1 to mags_to_spawn)
- new spawned_ballistic_gun.mag_type (spawned_box)
+ new spawned_ballistic_gun.spawn_magazine_type (spawned_box)
/obj/effect/spawner/armory_spawn/shotguns
icon_state = "random_shotgun"
diff --git a/modular_skyrat/modules/sec_haul/code/guns/cmg.dm b/modular_skyrat/modules/sec_haul/code/guns/cmg.dm
index 004fbe69210..99f8c2586bf 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/cmg.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/cmg.dm
@@ -15,7 +15,7 @@
icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi'
inhand_icon_state = "c20r"
selector_switch_icon = TRUE
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/cmg
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/cmg
fire_delay = 2 //Slightly buffed firespeed over the last cmg because the bullets are a bit weaker
burst_size = 1
actions_types = list()
diff --git a/modular_skyrat/modules/sec_haul/code/guns/guns.dm b/modular_skyrat/modules/sec_haul/code/guns/guns.dm
index d851a155d0b..04a85fa0c87 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/guns.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/guns.dm
@@ -8,7 +8,7 @@
icon = 'modular_skyrat/modules/sec_haul/icons/guns/glock.dmi'
icon_state = "glock"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/g17
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/g17
can_suppress = FALSE
fire_sound = 'sound/weapons/gun/pistol/shot_alt.ogg'
rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
@@ -51,7 +51,7 @@
icon = 'modular_skyrat/modules/sec_haul/icons/guns/glock.dmi'
icon_state = "glock_spec"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/g18
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/g18
can_suppress = FALSE
fire_sound = 'sound/weapons/gun/pistol/shot_alt.ogg'
rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
@@ -99,7 +99,7 @@
icon = 'modular_skyrat/modules/sec_haul/icons/guns/glock.dmi'
icon_state = "glock_mesa"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/ladon // C o m p a t i b i l i t y .
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/ladon // C o m p a t i b i l i t y .
fire_sound = 'modular_skyrat/master_files/sound/weapons/glock17_fire.ogg'
rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
@@ -125,7 +125,7 @@
icon_state = "pdh"
inhand_icon_state = "pdh"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/pdh
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/pdh
can_suppress = FALSE
fire_sound = 'modular_skyrat/modules/sec_haul/sound/hpistol_fire.ogg'
rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
@@ -143,7 +143,7 @@
desc = "A prestigious 12mm sidearm normally seen in the hands of SolFed special operation units due to its reliable and time-tested design. Now's one of those times that pays to be the strong, silent type."
icon_state = "pdh_alt"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/pdh
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/pdh
can_suppress = FALSE
fire_sound = 'sound/weapons/gun/pistol/shot_suppressed.ogg'
fire_delay = 8
@@ -178,7 +178,7 @@
desc = "A prestigious ballistic sidearm, from Armadyne's military division, normally given to high-ranking corporate agents. It has a 3 round burst mode and uses .357 Magnum ammunition."
icon_state = "pdh_corpo"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/pdh_corpo
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/pdh_corpo
can_suppress = FALSE
fire_sound = 'modular_skyrat/modules/sec_haul/sound/hpistol_fire.ogg'
burst_size = 3
@@ -209,7 +209,7 @@
desc = "A sidearm used by Armadyne corporate agents who didn't make the cut for the Corpo model. Chambered in .38 special."
icon_state = "pdh_striker"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/pdh_striker
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/pdh_striker
can_suppress = FALSE
fire_sound = 'modular_skyrat/modules/sec_haul/sound/hpistol_fire.ogg'
burst_size = 3
@@ -239,7 +239,7 @@
desc = "A modern ballistic sidearm, used primarily by law enforcement, chambered in 9x25mm."
fire_delay = 1.95
icon_state = "pdh_peacekeeper"
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/pdh_peacekeeper
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/pdh_peacekeeper
fire_sound = 'modular_skyrat/modules/sec_haul/sound/pistol_fire.ogg'
projectile_damage_multiplier = 0.5
@@ -278,7 +278,7 @@
icon_state = "ladon"
inhand_icon_state = "ladon"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/ladon
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/ladon
can_suppress = FALSE
fire_sound = 'modular_skyrat/modules/sec_haul/sound/pistol_fire.ogg'
rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
@@ -325,7 +325,7 @@
icon = 'modular_skyrat/modules/sec_haul/icons/guns/makarov.dmi'
icon_state = "makarov"
w_class = WEIGHT_CLASS_SMALL
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/makarov
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/makarov
can_suppress = TRUE
rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
@@ -367,7 +367,7 @@
icon = 'modular_skyrat/modules/sec_haul/icons/guns/mk58.dmi'
icon_state = "mk58"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/mk58
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/mk58
can_suppress = FALSE
fire_sound = 'modular_skyrat/modules/sec_haul/sound/pistol_fire.ogg'
rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
@@ -414,7 +414,7 @@
inhand_icon_state = "firefly"
fire_delay = 1.95
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/firefly
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/firefly
can_suppress = FALSE
projectile_damage_multiplier = 0.5
@@ -459,7 +459,7 @@
icon_state = "croon"
inhand_icon_state = "croon"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/croon
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/croon
can_suppress = FALSE
fire_sound = 'sound/weapons/gun/smg/shot.ogg'
rack_sound = 'sound/weapons/gun/smg/smgrack.ogg'
@@ -507,7 +507,7 @@
icon_state = "dozer"
inhand_icon_state = "dozer"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/dozer
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/dozer
can_suppress = TRUE
mag_display = FALSE
mag_display_ammo = FALSE
@@ -561,7 +561,7 @@
inhand_icon_state = "dmr"
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_SUITSTORE
- mag_type = /obj/item/ammo_box/magazine/dmr
+ accepted_magazine_type = /obj/item/ammo_box/magazine/dmr
fire_delay = 1.7
can_suppress = FALSE
can_bayonet = FALSE
@@ -599,7 +599,7 @@
lefthand_file = 'modular_skyrat/modules/sec_haul/icons/guns/inhands/lefthand.dmi'
icon_state = "zeta"
inhand_icon_state = "zeta"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/zeta
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/zeta
fire_sound = 'modular_skyrat/modules/sec_haul/sound/revolver_fire.ogg'
fire_delay = 3
@@ -638,7 +638,7 @@
lefthand_file = 'modular_skyrat/modules/sec_haul/icons/guns/inhands/lefthand.dmi'
icon_state = "revolution"
inhand_icon_state = "revolution"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/revolution
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/revolution
fire_sound = 'modular_skyrat/modules/sec_haul/sound/revolver_fire.ogg'
fire_delay = 1.90
projectile_damage_multiplier = 0.5
@@ -683,7 +683,7 @@
inhand_icon_state = "smartgun_worn"
worn_icon = 'modular_skyrat/modules/sec_haul/icons/guns/smartgun.dmi'
worn_icon_state = "smartgun_worn"
- mag_type = /obj/item/ammo_box/magazine/smartgun
+ accepted_magazine_type = /obj/item/ammo_box/magazine/smartgun
actions_types = null
can_suppress = FALSE
can_bayonet = FALSE
@@ -780,7 +780,7 @@
worn_icon_state = "g11_worn"
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/g11
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/g11
can_suppress = FALSE
fire_delay = 0.5
spread = 10
@@ -825,7 +825,7 @@
icon_state = "riotshotgun"
worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi'
inhand_icon_state = "shotgun"
- mag_type = /obj/item/ammo_box/magazine/internal/shot/m23
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/m23
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING
@@ -856,7 +856,7 @@
vary_fire_sound = TRUE
fire_sound = 'modular_skyrat/modules/aesthetics/guns/sound/shotgun_light.ogg'
fire_delay = 5
- mag_type = /obj/item/ammo_box/magazine/internal/shot/as2
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/as2
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING
@@ -888,7 +888,7 @@
worn_icon_state = "norwind_worn"
alt_icons = TRUE
alt_icon_state = "norwind_worn"
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/norwind
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/norwind
can_suppress = FALSE
can_bayonet = TRUE
mag_display = TRUE
@@ -946,7 +946,7 @@
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING
inhand_icon_state = "vintorez"
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/vintorez
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/vintorez
suppressed = TRUE
can_unsuppress = FALSE
can_bayonet = FALSE
@@ -1005,7 +1005,7 @@
icon_state = "pcr"
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING
w_class = WEIGHT_CLASS_BULKY
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/pcr
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/pcr
fire_delay = 1.80
can_suppress = FALSE
spread = 10
@@ -1060,7 +1060,7 @@
worn_icon_state = "ostwind_worn"
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/pitbull
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/pitbull
fire_delay = 4.20
can_suppress = FALSE
burst_size = 3
@@ -1123,7 +1123,7 @@
alt_icon_state = "ostwind_worn"
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT | ITEM_SLOT_OCLOTHING
- mag_type = /obj/item/ammo_box/magazine/multi_sprite/ostwind
+ accepted_magazine_type = /obj/item/ammo_box/magazine/multi_sprite/ostwind
spread = 10
fire_delay = 2
can_suppress = FALSE
diff --git a/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm b/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm
index a3e6f017126..ffca51d4e67 100644
--- a/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm
+++ b/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm
@@ -4,7 +4,7 @@
icon = 'modular_skyrat/modules/sec_haul/icons/guns/pepperball.dmi'
icon_state = "peppergun"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/pepperball
+ accepted_magazine_type = /obj/item/ammo_box/magazine/pepperball
can_suppress = FALSE
fire_sound = 'sound/effects/pop_expl.ogg'
rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
diff --git a/modular_zubbers/code/game/objects/items/reshirevolver.dm b/modular_zubbers/code/game/objects/items/reshirevolver.dm
index c853eeee507..7b656ef2400 100644
--- a/modular_zubbers/code/game/objects/items/reshirevolver.dm
+++ b/modular_zubbers/code/game/objects/items/reshirevolver.dm
@@ -1,7 +1,6 @@
/obj/item/gun/ballistic/revolver/hos_revolver
name = "\improper HR-460MS 'Tracker'"
desc = "A brutally effectve revolver by Romulus officers prior to destruction of the planet, if the initial damage did not kill, the bleedout would. Uses the brutal .460 Rowland ammo."
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rowland
icon = 'modular_zubbers/icons/obj/reshirevolver.dmi'
icon_state = "tracker"
fire_sound = 'modular_skyrat/modules/sec_haul/sound/hpistol_fire.ogg'
diff --git a/tgstation.dme b/tgstation.dme
index 51a9112687b..e28856500c2 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -290,6 +290,7 @@
#include "code\__DEFINES\dcs\signals\signals_ladder.dm"
#include "code\__DEFINES\dcs\signals\signals_lift.dm"
#include "code\__DEFINES\dcs\signals\signals_light_eater.dm"
+#include "code\__DEFINES\dcs\signals\signals_material_container.dm"
#include "code\__DEFINES\dcs\signals\signals_medical.dm"
#include "code\__DEFINES\dcs\signals\signals_mind.dm"
#include "code\__DEFINES\dcs\signals\signals_mining.dm"
@@ -1059,7 +1060,6 @@
#include "code\datums\components\lock_on_cursor.dm"
#include "code\datums\components\manual_blinking.dm"
#include "code\datums\components\manual_breathing.dm"
-#include "code\datums\components\material_container.dm"
#include "code\datums\components\mind_linker.dm"
#include "code\datums\components\mirage_border.dm"
#include "code\datums\components\mirv.dm"
@@ -1084,11 +1084,11 @@
#include "code\datums\components\puzzgrid.dm"
#include "code\datums\components\radiation_countdown.dm"
#include "code\datums\components\radioactive_emitter.dm"
+#include "code\datums\components\radioactive_exposure.dm"
#include "code\datums\components\reagent_refiller.dm"
#include "code\datums\components\redirect_attack_hand_from_turf.dm"
#include "code\datums\components\regenerator.dm"
#include "code\datums\components\religious_tool.dm"
-#include "code\datums\components\remote_materials.dm"
#include "code\datums\components\rename.dm"
#include "code\datums\components\revenge_ability.dm"
#include "code\datums\components\rot.dm"
@@ -1185,6 +1185,8 @@
#include "code\datums\components\food\germ_sensitive.dm"
#include "code\datums\components\food\golem_food.dm"
#include "code\datums\components\food\ice_cream_holder.dm"
+#include "code\datums\components\material\material_container.dm"
+#include "code\datums\components\material\remote_materials.dm"
#include "code\datums\components\pet_commands\fetch.dm"
#include "code\datums\components\pet_commands\obeys_commands.dm"
#include "code\datums\components\pet_commands\pet_command.dm"
@@ -6644,6 +6646,7 @@
#include "modular_skyrat\modules\mapping\code\areas\shuttles.dm"
#include "modular_skyrat\modules\mapping\code\areas\space.dm"
#include "modular_skyrat\modules\mapping\code\areas\station.dm"
+#include "modular_skyrat\modules\mapping\code\lockers\cargodiselost\cargodiselockers.dm"
#include "modular_skyrat\modules\mapping\code\lockers\interdyne_fob\cargo.dm"
#include "modular_skyrat\modules\mapping\code\lockers\interdyne_fob\command.dm"
#include "modular_skyrat\modules\mapping\code\lockers\interdyne_fob\engineering.dm"
diff --git a/tgui/packages/tgui/interfaces/Autolathe.tsx b/tgui/packages/tgui/interfaces/Autolathe.tsx
index 0f5a63879b6..1436d045256 100644
--- a/tgui/packages/tgui/interfaces/Autolathe.tsx
+++ b/tgui/packages/tgui/interfaces/Autolathe.tsx
@@ -8,26 +8,25 @@ import { BooleanLike, classes } from 'common/react';
import { MaterialCostSequence } from './Fabrication/MaterialCostSequence';
import { Material } from './Fabrication/Types';
-type AutolatheDesign = Design & {
- buildable: BooleanLike;
- mult5: BooleanLike;
- mult10: BooleanLike;
- mult25: BooleanLike;
- mult50: BooleanLike;
- sheet: BooleanLike;
-};
-
type AutolatheData = {
materials: Material[];
materialtotal: number;
materialsmax: number;
- designs: AutolatheDesign[];
+ SHEET_MATERIAL_AMOUNT: number;
+ designs: Design[];
active: BooleanLike;
};
export const Autolathe = (props, context) => {
- const { act, data } = useBackend
(context);
- const { materialtotal, materialsmax, materials, designs, active } = data;
+ const { data } = useBackend(context);
+ const {
+ materialtotal,
+ materialsmax,
+ materials,
+ designs,
+ active,
+ SHEET_MATERIAL_AMOUNT,
+ } = data;
const filteredMaterials = materials.filter((material) => material.amount > 0);
@@ -54,7 +53,10 @@ export const Autolathe = (props, context) => {
'average': [materialsmax * 0.25, materialsmax * 0.85],
'bad': [0, materialsmax * 0.25],
}}>
- {materialtotal + '/' + materialsmax + ' cm³'}
+ {materialtotal / SHEET_MATERIAL_AMOUNT +
+ '/' +
+ materialsmax / SHEET_MATERIAL_AMOUNT +
+ ' sheets'}
@@ -74,7 +76,8 @@ export const Autolathe = (props, context) => {
backgroundColor={material.color}
color="black">
- {material.amount + ' cm³'}
+ {material.amount / SHEET_MATERIAL_AMOUNT +
+ ' sheets'}
@@ -98,6 +101,7 @@ export const Autolathe = (props, context) => {
) => (
)}
@@ -113,11 +117,12 @@ type PrintButtonProps = {
design: Design;
quantity: number;
availableMaterials: MaterialMap;
+ SHEET_MATERIAL_AMOUNT: number;
};
const PrintButton = (props: PrintButtonProps, context) => {
- const { act, data } = useBackend(context);
- const { design, quantity, availableMaterials } = props;
+ const { act } = useBackend(context);
+ const { design, quantity, availableMaterials, SHEET_MATERIAL_AMOUNT } = props;
const canPrint = !Object.entries(design.cost).some(
([material, amount]) =>
@@ -131,6 +136,7 @@ const PrintButton = (props: PrintButtonProps, context) => {
}>
@@ -148,13 +154,14 @@ const PrintButton = (props: PrintButtonProps, context) => {
};
type AutolatheRecipeProps = {
- design: AutolatheDesign;
+ design: Design;
availableMaterials: MaterialMap;
+ SHEET_MATERIAL_AMOUNT: number;
};
const AutolatheRecipe = (props: AutolatheRecipeProps, context) => {
- const { act, data } = useBackend(context);
- const { design, availableMaterials } = props;
+ const { act } = useBackend(context);
+ const { design, availableMaterials, SHEET_MATERIAL_AMOUNT } = props;
const canPrint = !Object.entries(design.cost).some(
([material, amount]) =>
@@ -179,6 +186,7 @@ const AutolatheRecipe = (props: AutolatheRecipeProps, context) => {
}>
@@ -199,37 +207,19 @@ const AutolatheRecipe = (props: AutolatheRecipeProps, context) => {