"
dat += "
Active Upgrade Chambers:"
@@ -682,17 +670,17 @@
var/spur_chambers_built = length(user?.hive?.spur_chambers)
var/veil_chambers_built = length(user?.hive?.veil_chambers)
dat += "
SURVIVAL
"
- dat += "[shell_chambers_built ? "
Carapace " : "
Carapace "] | Cost: [upgrade_price] | Increase our armor."
- dat += "[shell_chambers_built ? "
Regeneration " : "
Regeneration "] | Cost: [upgrade_price] | Increase our health regeneration."
- dat += "[shell_chambers_built ? "
Vampirism " : "
Vampirism "] | Cost: [upgrade_price] | Leech from our attacks."
+ dat += "[shell_chambers_built ? "
Carapace " : "
Carapace "] | Cost: [XENO_UPGRADE_COST] | Increase our armor."
+ dat += "[shell_chambers_built ? "
Regeneration " : "
Regeneration "] | Cost: [XENO_UPGRADE_COST] | Increase our health regeneration."
+ dat += "[shell_chambers_built ? "
Vampirism " : "
Vampirism "] | Cost: [XENO_UPGRADE_COST] | Leech from our attacks."
dat += "
ATTACK
"
- dat += "[spur_chambers_built ? "
Celerity " : "
Celerity "] | Cost: [upgrade_price] | Increase our movement speed."
- dat += "[spur_chambers_built ? "
Adrenalin " : "
Adrenalin "] | Cost: [upgrade_price] | Increase our plasma regeneration."
- dat += "[spur_chambers_built ? "
Crush " : "
Crush "] | Cost: [upgrade_price] | Increase our damage to objects."
+ dat += "[spur_chambers_built ? "
Celerity " : "
Celerity "] | Cost: [XENO_UPGRADE_COST] | Increase our movement speed."
+ dat += "[spur_chambers_built ? "
Adrenalin " : "
Adrenalin "] | Cost: [XENO_UPGRADE_COST] | Increase our plasma regeneration."
+ dat += "[spur_chambers_built ? "
Crush " : "
Crush "] | Cost: [XENO_UPGRADE_COST] | Increase our damage to objects."
dat += "
UTILITY
"
- dat += "[veil_chambers_built ? "
Toxin " : "
Toxin "] | Cost: [upgrade_price] | Inject neurotoxin into the target."
- dat += "[veil_chambers_built ? "
Pheromones " : "
Pheromones "] | Cost: [upgrade_price] | Ability to emit pheromones."
- dat += "[veil_chambers_built ? "
Trail " : "
Trail "] | Cost: [upgrade_price] | Leave a trail behind."
+ dat += "[veil_chambers_built ? "
Toxin " : "
Toxin "] | Cost: [XENO_UPGRADE_COST] | Inject neurotoxin into the target."
+ dat += "[veil_chambers_built ? "
Pheromones " : "
Pheromones "] | Cost: [XENO_UPGRADE_COST] | Ability to emit pheromones."
+ dat += "[veil_chambers_built ? "
Trail " : "
Trail "] | Cost: [XENO_UPGRADE_COST] | Leave a trail behind."
var/datum/browser/popup = new(user, "upgrademenu", "
Mutations Menu
", 600, 600)
popup.set_content(dat)
@@ -702,17 +690,7 @@
if(incapacitated(TRUE))
to_chat(usr, span_warning("Cant do that right now!"))
return
- var/upgrade_price
- switch(xeno_caste.tier)
- if(XENO_TIER_ONE)
- upgrade_price = XENO_UPGRADE_BIOMASS_COST_T1
- if(XENO_TIER_TWO)
- upgrade_price = XENO_UPGRADE_BIOMASS_COST_T2
- if(XENO_TIER_THREE)
- upgrade_price = XENO_UPGRADE_BIOMASS_COST_T3
- else
- upgrade_price = XENO_UPGRADE_BIOMASS_COST_T4
- if(biomass < upgrade_price)
+ if(biomass < XENO_UPGRADE_COST)
to_chat(usr, span_warning("You dont have enough biomass!"))
return
var/upgrade = locate(upgrade_to_apply) in status_effects
@@ -720,12 +698,14 @@
to_chat(usr, span_xenonotice("Existing mutation chosen. No biomass spent."))
DIRECT_OUTPUT(usr, browse(null, "window=["upgrademenu"]"))
return
- biomass -= upgrade_price
+ biomass -= XENO_UPGRADE_COST
to_chat(usr, span_xenonotice("Mutation gained."))
for(var/datum/status_effect/S AS in upgrades_to_remove)
remove_status_effect(S)
+ upgrades_holder.Remove(S.type)
do_jitter_animation(500)
apply_status_effect(upgrade_to_apply)
+ upgrades_holder.Add(upgrade_to_apply.type)
DIRECT_OUTPUT(usr, browse(null, "window=["upgrademenu"]"))
//Special override case. May not call the parent.
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index fe0aebcd4cf..7fd5a5060d6 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -323,6 +323,8 @@
return FALSE
if(buckled || now_pushing)
return
+ if(anchored)
+ return
if(isliving(A))
var/mob/living/L = A
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 88130e2750f..9bffe969dd4 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -527,7 +527,7 @@
if(!can_use_action())
return
owner.playsound_local(owner, "sound/effects/CIC_order.ogg", 10, 1)
- TIMER_COOLDOWN_START(owner, COOLDOWN_HUD_ORDER, ORDER_COOLDOWN)
+ TIMER_COOLDOWN_START(owner, COOLDOWN_HUD_ORDER, CIC_ORDER_COOLDOWN)
log_game("[key_name(owner)] has broadcasted the hud message [text] at [AREACOORD(owner)]")
deadchat_broadcast(" has sent the command order \"[text]\"", owner, owner)
for(var/mob/living/carbon/human/human AS in GLOB.alive_human_list)
diff --git a/code/modules/mob/living/silicon/ai/ai_verbs.dm b/code/modules/mob/living/silicon/ai/ai_verbs.dm
index 35aa86eecb8..46ecbbb9662 100644
--- a/code/modules/mob/living/silicon/ai/ai_verbs.dm
+++ b/code/modules/mob/living/silicon/ai/ai_verbs.dm
@@ -153,7 +153,7 @@
return
last_announcement = world.time
- priority_announce(input, "[src] Announcement", sound = 'sound/AI/aireport.ogg')
+ priority_announce(input, "Оповещение от [src]", sound = 'sound/AI/aireport.ogg')
/mob/living/silicon/ai/verb/ai_core_display()
@@ -320,6 +320,6 @@
log_game("[key_name(src)] has ghosted at [AREACOORD(src)].")
message_admins("[ADMIN_TPMONTY(src)] has ghosted.")
- priority_announce("[src] has suffered an unexpected NTOS failure over its Logarithmic silicon backhaul functions and has been taken offline. An attempt to load a backup personality core will proceed shortly.", "AI NT-OS Critical Failure")
+ priority_announce("[src] был отключен. Ожидание загрузки новой личности...", "Сбой ИИ", sound = 'sound/AI/aileft.ogg')
ghostize(FALSE)
offer_mob()
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index a8815a0061a..661d2e08339 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -45,9 +45,6 @@
/mob/living/silicon/put_in_r_hand(obj/item/I)
return
-/mob/living/silicon/stripPanelUnequip(obj/item/I, mob/M, slot)
- return
-
/mob/living/silicon/med_hud_set_health()
return
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index e6086011dd9..1dc60661422 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -378,9 +378,9 @@ GLOBAL_LIST_INIT(organ_rel_size, list(
A.target = source
if(!alert_overlay)
alert_overlay = new(source)
- var/icon/I = icon(source.icon)
- var/iheight = I.Height()
- var/iwidth = I.Width()
+ var/list/icon_dimensions = get_icon_dimensions(source.icon)
+ var/iheight = icon_dimensions["width"]
+ var/iwidth = icon_dimensions["height"]
var/higher_power = (iheight > iwidth) ? iheight : iwidth
if(higher_power > 32)
var/diff = 32 / higher_power
diff --git a/code/modules/mob/update_icons.dm b/code/modules/mob/update_icons.dm
index 58c7b6dd60c..f5be18d6bf1 100644
--- a/code/modules/mob/update_icons.dm
+++ b/code/modules/mob/update_icons.dm
@@ -63,3 +63,6 @@
/mob/proc/update_burst()
return
+
+/mob/proc/hud_set_hunter()
+ return
diff --git a/code/modules/orbits/spaceship.dm b/code/modules/orbits/spaceship.dm
index d058fe16f2c..0852570b41c 100644
--- a/code/modules/orbits/spaceship.dm
+++ b/code/modules/orbits/spaceship.dm
@@ -160,8 +160,8 @@ GLOBAL_VAR_INIT(current_orbit,STANDARD_ORBIT)
return
message_admins("[ADMIN_TPMONTY(usr)] Has sent the ship [direction == "UP" ? "UPWARD" : "DOWNWARD"] in orbit")
- var/message = "Prepare for orbital change in 10 seconds.\nMoving [direction] the gravity well.\nSecure all belongings and prepare for engine ignition."
- minor_announce(message, title = "Orbit Change")
+ var/message = "Внимание. [direction == "UP" ? "Подъём" : "Снижение"] на другую орбиту через 10 секунд."
+ minor_announce(message, title = "Смена Орбиты")
addtimer(CALLBACK(src, PROC_REF(do_change_orbit), current_orbit, direction), 10 SECONDS)
/obj/machinery/computer/navigation/proc/can_change_orbit(current_orbit, direction, silent = FALSE)
@@ -194,8 +194,8 @@ GLOBAL_VAR_INIT(current_orbit,STANDARD_ORBIT)
changing_orbit = TRUE
engine_shudder()
- var/message = "Arriving at new orbital level. Prepare for engine ignition and stabilization."
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(minor_announce), message, "Orbit Change"), 290 SECONDS)
+ var/message = "Переход на новую орбиту. Приготовьтесь к запуску двигателей и стабилизации."
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(minor_announce), message, "Смена Орбиты"), 290 SECONDS)
addtimer(CALLBACK(src, PROC_REF(orbit_gets_changed), current_orbit, direction), 3 MINUTES)
/obj/machinery/computer/navigation/proc/orbit_gets_changed(current_orbit, direction)
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 5bc55e70d38..dcfec555aa3 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -328,7 +328,7 @@
playsound_z(3, 'sound/effects/powerloss.ogg')
if(announce)
- priority_announce("Abnormal activity detected in the ship power system. As a precaution, power must be shut down for an indefinite duration.", "Critical Power Failure", sound = 'sound/AI/poweroff.ogg')
+ priority_announce("В системе питания судна обнаружена аномальная активность. В качестве меры предосторожности питание будет отключено на неопределенный срок.", "Критический Сбой Питания", sound = 'sound/AI/poweroff.ogg')
/proc/power_restore(announce = TRUE)
@@ -351,7 +351,7 @@
if(announce)
- priority_announce("Power has been restored. Reason: Unknown.", "Power Systems Nominal", sound = 'sound/AI/poweron.ogg')
+ priority_announce("Питание восстановлено. Причина: Неизвестно.", "Восстановление Питания", sound = 'sound/AI/poweron.ogg')
/proc/power_restore_quick(announce = TRUE)
@@ -365,7 +365,7 @@
S.power_change()
if(announce)
- priority_announce("Power has been restored. Reason: Unknown.", "Power Systems Nominal", sound = 'sound/AI/poweron.ogg')
+ priority_announce("Питание восстановлено. Причина: Неизвестно.", "Восстановление Питания", sound = 'sound/AI/poweron.ogg')
/proc/power_restore_everything(announce = TRUE)
@@ -382,4 +382,4 @@
C.cell.charge = C.cell.maxcharge
if(announce)
- priority_announce("Power has been restored. Reason: Unknown.", "Power Systems Nominal", sound = 'sound/AI/poweron.ogg')
+ priority_announce("Питание восстановлено. Причина: Неизвестно.", "Восстановление Питания", sound = 'sound/AI/poweron.ogg')
diff --git a/code/modules/projectiles/ammo_casing.dm b/code/modules/projectiles/ammo_casing.dm
new file mode 100644
index 00000000000..2a28b5acd67
--- /dev/null
+++ b/code/modules/projectiles/ammo_casing.dm
@@ -0,0 +1,86 @@
+/*
+Doesn't do anything or hold anything anymore.
+Generated per the various mags, and then changed based on the number of
+casings. .dir is the main thing that controls the icon. It modifies
+the icon_state to look like more casings are hitting the ground.
+There are 8 directions, 8 bullets are possible so after that it tries to grab the next
+icon_state while reseting the direction. After 16 casings, it just ignores new
+ones. At that point there are too many anyway. Shells and bullets leave different
+items, so they do not intersect. This is far more efficient than using Blend() or
+Turn() or Shift() as there is virtually no overhead. ~N
+*/
+/obj/item/ammo_casing
+ name = "spent casing"
+ desc = "Empty and useless now."
+ icon = 'icons/obj/items/casings.dmi'
+ icon_state = "casing_"
+ throwforce = 1
+ w_class = WEIGHT_CLASS_TINY
+ layer = LOWER_ITEM_LAYER //Below other objects
+ dir = 1 //Always north when it spawns.
+ flags_atom = CONDUCT|DIRLOCK
+ ///This is manipulated in the procs that use these.
+ var/current_casings = 1
+ ///Maximum amount of casings 1 stack can have
+ var/max_casings = 16
+ ///Current icon of the casings stack, increases by 1 with each casing in the stack
+ var/current_icon = 0
+ ///How many variations of this item there are.
+ var/number_of_states = 10
+ ///holder for icon_state so we can do random variations without effecting mapper visibility
+ var/initial_icon_state = "cartridge_"
+
+/obj/item/ammo_casing/Initialize(mapload)
+ . = ..()
+ pixel_x = rand(-2, 2) //Want to move them just a tad.
+ pixel_y = rand(-2, 2)
+ icon_state = initial_icon_state += "[rand(1, number_of_states)]" //Set the icon to it.
+
+//This does most of the heavy lifting. It updates the icon and name if needed
+
+/obj/item/ammo_casing/update_name(updates)
+ . = ..()
+ if(max_casings >= current_casings && current_casings == 2)
+ name += "s" //In case there is more than one.
+
+/obj/item/ammo_casing/update_icon_state()
+ . = ..()
+ if(max_casings < current_casings)
+ return
+ if(round((current_casings - 1) / 8) > current_icon)
+ current_icon++
+ icon_state += "_[current_icon]"
+
+ var/base_direction = current_casings - (current_icon * 8)
+ setDir(base_direction + round(base_direction) / 3)
+ switch(current_casings)
+ if(3 to 5)
+ w_class = WEIGHT_CLASS_SMALL //Slightly heavier.
+ if(9 to 10)
+ w_class = WEIGHT_CLASS_NORMAL //Can't put it in your pockets and stuff.
+
+///changes .dir to simulate new casings, also sets the new w_class
+/obj/item/ammo_casing/proc/update_dir()
+ var/base_direction = current_casings - (current_icon * 8)
+ setDir(base_direction + round(base_direction) / 3)
+ switch(current_casings)
+ if(3 to 5)
+ w_class = WEIGHT_CLASS_SMALL //Slightly heavier.
+ if(9 to 10)
+ w_class = WEIGHT_CLASS_NORMAL //Can't put it in your pockets and stuff.
+
+/obj/item/ammo_casing/update_icon()
+ update_dir()
+ return ..()
+
+//Making child objects so that locate() and istype() doesn't screw up.
+/obj/item/ammo_casing/bullet
+
+/obj/item/ammo_casing/cartridge
+ name = "spent cartridge"
+ icon_state = "cartridge"
+
+/obj/item/ammo_casing/shell
+ name = "spent shell"
+ initial_icon_state = "shell_"
+ icon_state = "shell"
diff --git a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm
index c32d6fe7e68..63092ccbef9 100644
--- a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm
+++ b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm
@@ -90,17 +90,6 @@
penetration = 10
sundering = 1
-/datum/ammo/bullet/sg29
- name = "smartmachinegun bullet"
- bullet_color = COLOR_SOFT_RED //Red bullets to indicate friendly fire restriction
- hud_state = "smartgun"
- hud_state_empty = "smartgun_empty"
- flags_ammo_behavior = AMMO_BALLISTIC
- accurate_range = 8
- damage = 20
- penetration = 5
- additional_xeno_penetration = 20
-
/datum/ammo/bullet/smart_minigun
name = "smartminigun bullet"
bullet_color = COLOR_SOFT_RED //Red bullets to indicate friendly fire restriction
@@ -108,6 +97,14 @@
hud_state_empty = "smartgun_empty"
flags_ammo_behavior = AMMO_BALLISTIC
accurate_range = 12
- damage = 25
- penetration = -15
+ damage = 12
+ penetration = 20
damage_falloff = 0.1
+ var/shatter_duration = 3 SECONDS
+
+/datum/ammo/bullet/smart_minigun/on_hit_mob(mob/M, obj/projectile/proj)
+ if(!isliving(M))
+ return
+
+ var/mob/living/living_victim = M
+ living_victim.apply_status_effect(STATUS_EFFECT_SHATTER, shatter_duration)
diff --git a/code/modules/projectiles/ammo_datums/xeno.dm b/code/modules/projectiles/ammo_datums/xeno.dm
index 918f07805d8..e14b9aec91e 100644
--- a/code/modules/projectiles/ammo_datums/xeno.dm
+++ b/code/modules/projectiles/ammo_datums/xeno.dm
@@ -573,15 +573,15 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh
/datum/ammo/xeno/hugger/on_hit_mob(mob/M, obj/projectile/proj)
var/obj/item/clothing/mask/facehugger/hugger = new hugger_type(get_turf(M), hivenumber)
- hugger.go_idle()
+ hugger.Attach(M)
/datum/ammo/xeno/hugger/on_hit_obj(obj/O, obj/projectile/proj)
var/obj/item/clothing/mask/facehugger/hugger = new hugger_type(get_turf(O), hivenumber)
- hugger.go_idle()
+ hugger.go_active()
/datum/ammo/xeno/hugger/on_hit_turf(turf/T, obj/projectile/P)
var/obj/item/clothing/mask/facehugger/hugger = new hugger_type(T.density ? P.loc : T, hivenumber)
- hugger.go_idle()
+ hugger.go_active()
/datum/ammo/xeno/hugger/do_at_max_range(turf/T, obj/projectile/P)
var/obj/item/clothing/mask/facehugger/hugger = new hugger_type(T.density ? P.loc : T, hivenumber)
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index e43b4e4cb1f..06291ece24d 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -1,20 +1,19 @@
/obj/item/ammo_magazine
name = "generic ammo"
desc = "A box of ammo."
- icon = 'icons/obj/items/ammo.dmi'
- icon_state = null
+ icon = 'icons/obj/items/ammo/magazine.dmi'
item_state = "ammo_mag" //PLACEHOLDER. This ensures the mag doesn't use the icon state instead.
item_icons = list(
slot_l_hand_str = 'icons/mob/inhands/weapons/ammo_left.dmi',
slot_r_hand_str = 'icons/mob/inhands/weapons/ammo_right.dmi',
- )
+ )
flags_atom = CONDUCT
flags_equip_slot = ITEM_SLOT_BELT
throwforce = 2
w_class = WEIGHT_CLASS_TINY
throw_speed = 2
throw_range = 6
- ///Icon state in ammo.dmi to an overlay to add to the gun, for extended mags, box mags, and so on
+ ///Icon state to an overlay to add to the gun, for extended mags, box mags, and so on
var/bonus_overlay = null
///This is a typepath for the type of bullet the magazine holds, it is cast so that it can draw the variable handful_amount from default_ammo in create_handful()
var/datum/ammo/bullet/default_ammo = /datum/ammo/bullet
@@ -80,7 +79,6 @@
. = ..()
. += "[src] has
[current_rounds] rounds out of
[max_rounds]."
-
/obj/item/ammo_magazine/attack_hand(mob/living/user)
if(user.get_inactive_held_item() != src || !CHECK_BITFIELD(flags_magazine, MAGAZINE_REFILLABLE))
return ..()
@@ -119,7 +117,6 @@
transfer_ammo(mag, user, amount_to_transfer)
-
/obj/item/ammo_magazine/attackby_alternate(obj/item/I, mob/user, params)
. = ..()
if(!isgun(I))
@@ -135,7 +132,6 @@
master_gun.aim_slowdown += aim_speed_mod
master_gun.wield_delay += wield_delay_mod
-
/obj/item/ammo_magazine/proc/on_removed(obj/item/weapon/gun/master_gun)
master_gun.scatter -= scatter_mod
master_gun.scatter_unwielded -= scatter_unwielded_mod
@@ -191,29 +187,6 @@
update_icon()
-///This will attempt to place the ammo in the user's hand if possible.
-/obj/item/ammo_magazine/proc/create_handful(mob/user, transfer_amount)
- if(current_rounds <= 0)
- return
- var/obj/item/ammo_magazine/handful/new_handful = new /obj/item/ammo_magazine/handful()
- var/rounds = transfer_amount ? min(current_rounds, transfer_amount) : min(current_rounds, initial(default_ammo.handful_amount))
- new_handful.generate_handful(default_ammo, caliber, rounds)
- current_rounds -= rounds
-
- if(user)
- user.put_in_hands(new_handful)
- to_chat(user, span_notice("You grab
[rounds] round\s from [src]."))
- update_icon() //Update the other one.
- if(current_rounds <= 0 && CHECK_BITFIELD(flags_magazine, MAGAZINE_HANDFUL))
- user.temporarilyRemoveItemFromInventory(src)
- qdel(src)
- return rounds //Give the number created.
- else
- update_icon()
- if(current_rounds <= 0 && CHECK_BITFIELD(flags_magazine, MAGAZINE_HANDFUL))
- qdel(src)
- return new_handful
-
///Called on a /ammo_magazine that wishes to be a handful. It generates all the data required for the handful.
/obj/item/ammo_magazine/proc/generate_handful(new_ammo, new_caliber, new_rounds, maximum_rounds)
var/datum/ammo/ammo = ispath(new_ammo) ? GLOB.ammo_list[new_ammo] : new_ammo
@@ -236,6 +209,28 @@
current_rounds = new_rounds
update_icon()
+///This will attempt to place the ammo in the user's hand if possible.
+/obj/item/ammo_magazine/proc/create_handful(mob/user, transfer_amount)
+ if(current_rounds <= 0)
+ return
+ var/obj/item/ammo_magazine/handful/new_handful = new /obj/item/ammo_magazine/handful()
+ var/rounds = transfer_amount ? min(current_rounds, transfer_amount) : min(current_rounds, initial(default_ammo.handful_amount))
+ new_handful.generate_handful(default_ammo, caliber, rounds)
+ current_rounds -= rounds
+
+ if(user)
+ user.put_in_hands(new_handful)
+ to_chat(user, span_notice("You grab
[rounds] round\s from [src]."))
+ update_icon() //Update the other one.
+ if(current_rounds <= 0 && CHECK_BITFIELD(flags_magazine, MAGAZINE_HANDFUL))
+ user.temporarilyRemoveItemFromInventory(src)
+ qdel(src)
+ return rounds //Give the number created.
+ else
+ update_icon()
+ if(current_rounds <= 0 && CHECK_BITFIELD(flags_magazine, MAGAZINE_HANDFUL))
+ qdel(src)
+ return new_handful
//our magazine inherits ammo info from a source magazine
/obj/item/ammo_magazine/proc/match_ammo(obj/item/ammo_magazine/source)
@@ -258,417 +253,4 @@
//Helper proc, to allow us to see a percentage of how full the magazine is.
/obj/item/ammo_magazine/proc/get_ammo_percent() // return % charge of cell
- return 100.0*current_rounds/max_rounds
-
-/obj/item/ammo_magazine/handful
- name = "generic handful of bullets or shells"
- desc = "A handful of rounds to reload on the go."
- flags_equip_slot = null // It only fits into pockets and such.
- w_class = WEIGHT_CLASS_SMALL
- current_rounds = 1 // So it doesn't get autofilled for no reason.
- max_rounds = 5 // For shotguns, though this will be determined by the handful type when generated.
- flags_atom = CONDUCT|DIRLOCK
- flags_magazine = MAGAZINE_HANDFUL|MAGAZINE_REFILLABLE
- attack_speed = 3 // should make reloading less painful
- icon_state_mini = "bullets"
-
-/obj/item/ammo_magazine/handful/repeater
- name = "handful of heavy impact rifle bullet (.45-70 Government)"
- icon_state = "bullet"
- current_rounds = 8
- max_rounds = 8
- default_ammo = /datum/ammo/bullet/rifle/repeater
- caliber = CALIBER_4570
-
-/obj/item/ammo_magazine/handful/slug
- name = "handful of shotgun slug (12 gauge)"
- icon_state = "shotgun slug"
- current_rounds = 5
- default_ammo = /datum/ammo/bullet/shotgun/slug
- caliber = CALIBER_12G
-
-/obj/item/ammo_magazine/handful/buckshot
- name = "handful of shotgun buckshot shells (12g)"
- icon_state = "shotgun buckshot shell"
- current_rounds = 5
- default_ammo = /datum/ammo/bullet/shotgun/buckshot
- caliber = CALIBER_12G
-
-/obj/item/ammo_magazine/handful/flechette
- name = "handful of shotgun flechette shells (12g)"
- icon_state = "shotgun flechette shell"
- current_rounds = 5
- default_ammo = /datum/ammo/bullet/shotgun/flechette
- caliber = CALIBER_12G
-
-/obj/item/ammo_magazine/handful/incendiary
- name = "handful of shotgun incendiary shells (12g)"
- icon_state = "incendiary slug"
- current_rounds = 5
- default_ammo = /datum/ammo/bullet/shotgun/incendiary
- caliber = CALIBER_12G
-
-/obj/item/ammo_magazine/handful/micro_grenade
- name = "handful of airburst micro grenades (10g)"
- icon_state = "micro_grenade_airburst"
- icon_state_mini = "40mm_cyan"
- current_rounds = 3
- max_rounds = 3
- default_ammo = /datum/ammo/bullet/micro_rail/airburst
- caliber = CALIBER_10G_RAIL
-
-/obj/item/ammo_magazine/handful/micro_grenade/dragonbreath
- name = "handful of dragon's breath micro grenades (10g)"
- icon_state = "micro_grenade_incendiary"
- icon_state_mini = "40mm_orange"
- default_ammo = /datum/ammo/bullet/micro_rail/dragonbreath
-
-/obj/item/ammo_magazine/handful/micro_grenade/cluster
- name = "handful of clustermunition micro grenades (10g)"
- icon_state = "micro_grenade_cluster"
- icon_state_mini = "40mm_red"
- default_ammo = /datum/ammo/bullet/micro_rail/cluster
-
-/obj/item/ammo_magazine/handful/micro_grenade/smoke_burst
- name = "handful of smoke burst micro grenades (10g)"
- icon_state = "micro_grenade_smoke"
- icon_state_mini = "40mm_blue"
- default_ammo = /datum/ammo/bullet/micro_rail/smoke_burst
-
-//----------------------------------------------------------------//
-
-/*
-Doesn't do anything or hold anything anymore.
-Generated per the various mags, and then changed based on the number of
-casings. .dir is the main thing that controls the icon. It modifies
-the icon_state to look like more casings are hitting the ground.
-There are 8 directions, 8 bullets are possible so after that it tries to grab the next
-icon_state while reseting the direction. After 16 casings, it just ignores new
-ones. At that point there are too many anyway. Shells and bullets leave different
-items, so they do not intersect. This is far more efficient than using Blend() or
-Turn() or Shift() as there is virtually no overhead. ~N
-*/
-/obj/item/ammo_casing
- name = "spent casing"
- desc = "Empty and useless now."
- icon = 'icons/obj/items/casings.dmi'
- icon_state = "casing_"
- throwforce = 1
- w_class = WEIGHT_CLASS_TINY
- layer = LOWER_ITEM_LAYER //Below other objects
- dir = 1 //Always north when it spawns.
- flags_atom = CONDUCT|DIRLOCK
- var/current_casings = 1 //This is manipulated in the procs that use these.
- var/max_casings = 16
- var/current_icon = 0
- var/number_of_states = 10 //How many variations of this item there are.
- var/initial_icon_state = "cartridge_" //holder for icon_state so we can do random variations without effecting mapper visibility
-
-/obj/item/ammo_casing/Initialize(mapload)
- . = ..()
- pixel_x = rand(-2, 2) //Want to move them just a tad.
- pixel_y = rand(-2, 2)
- icon_state = initial_icon_state += "[rand(1, number_of_states)]" //Set the icon to it.
-
-//This does most of the heavy lifting. It updates the icon and name if needed
-
-/obj/item/ammo_casing/update_name(updates)
- . = ..()
- if(max_casings >= current_casings && current_casings == 2)
- name += "s" //In case there is more than one.
-
-/obj/item/ammo_casing/update_icon_state()
- . = ..()
- if(max_casings >= current_casings)
- if(round((current_casings-1)/8) > current_icon)
- current_icon++
- icon_state += "_[current_icon]"
-
- var/base_direction = current_casings - (current_icon * 8)
- setDir(base_direction + round(base_direction)/3)
- switch(current_casings)
- if(3 to 5)
- w_class = WEIGHT_CLASS_SMALL //Slightly heavier.
- if(9 to 10)
- w_class = WEIGHT_CLASS_NORMAL //Can't put it in your pockets and stuff.
-
-///changes .dir to simulate new casings, also sets the new w_class
-/obj/item/ammo_casing/proc/update_dir()
- var/base_direction = current_casings - (current_icon * 8)
- setDir(base_direction + round(base_direction)/3)
- switch(current_casings)
- if(3 to 5)
- w_class = WEIGHT_CLASS_SMALL //Slightly heavier.
- if(9 to 10)
- w_class = WEIGHT_CLASS_NORMAL //Can't put it in your pockets and stuff.
-
-/obj/item/ammo_casing/update_icon()
- update_dir()
- return ..()
-
-//Making child objects so that locate() and istype() doesn't screw up.
-/obj/item/ammo_casing/bullet
-
-/obj/item/ammo_casing/cartridge
- name = "spent cartridge"
- icon_state = "cartridge"
-
-/obj/item/ammo_casing/shell
- name = "spent shell"
- initial_icon_state = "shell_"
- icon_state = "shell"
-
-
-
-
-//Big ammo boxes
-
-/obj/item/big_ammo_box
- name = "big ammo box (10x24mm)"
- desc = "A large ammo box. It comes with a leather strap."
- w_class = WEIGHT_CLASS_HUGE
- icon = 'icons/obj/items/ammo.dmi'
- icon_state = "big_ammo_box"
- item_state = "big_ammo_box"
- flags_equip_slot = ITEM_SLOT_BACK
- base_icon_state = "big_ammo_box"
- var/default_ammo = /datum/ammo/bullet/rifle
- var/bullet_amount = 2400
- var/max_bullet_amount = 2400
- var/caliber = CALIBER_10X24_CASELESS
-
-/obj/item/big_ammo_box/update_icon_state()
- . = ..()
- if(bullet_amount)
- icon_state = base_icon_state
- return
- icon_state = "[base_icon_state]_e"
-
-/obj/item/big_ammo_box/examine(mob/user)
- . = ..()
- if(bullet_amount)
- . += "It contains [bullet_amount] round\s."
- else
- . += "It's empty."
-
-/obj/item/big_ammo_box/attackby(obj/item/I, mob/user, params)
- . = ..()
-
- if(istype(I, /obj/item/ammo_magazine))
- var/obj/item/ammo_magazine/AM = I
- if(!isturf(loc))
- to_chat(user, span_warning("[src] must be on the ground to be used."))
- return
- if(AM.flags_magazine & MAGAZINE_REFILLABLE)
- if(default_ammo != AM.default_ammo)
- to_chat(user, span_warning("Those aren't the same rounds. Better not mix them up."))
- return
- if(caliber != AM.caliber)
- to_chat(user, span_warning("The rounds don't match up. Better not mix them up."))
- return
- if(AM.current_rounds == AM.max_rounds)
- to_chat(user, span_warning("[AM] is already full."))
- return
-
- if(!do_after(user, 15, NONE, src, BUSY_ICON_GENERIC))
- return
-
- playsound(loc, 'sound/weapons/guns/interact/revolver_load.ogg', 25, 1)
- var/S = min(bullet_amount, AM.max_rounds - AM.current_rounds)
- AM.current_rounds += S
- bullet_amount -= S
- AM.update_icon()
- update_icon()
- if(AM.current_rounds == AM.max_rounds)
- to_chat(user, span_notice("You refill [AM]."))
- else
- to_chat(user, span_notice("You put [S] rounds in [AM]."))
- else if(AM.flags_magazine & MAGAZINE_HANDFUL)
- if(caliber != AM.caliber)
- to_chat(user, span_warning("The rounds don't match up. Better not mix them up."))
- return
- if(bullet_amount == max_bullet_amount)
- to_chat(user, span_warning("[src] is full!"))
- return
- playsound(loc, 'sound/weapons/guns/interact/revolver_load.ogg', 25, 1)
- var/S = min(AM.current_rounds, max_bullet_amount - bullet_amount)
- AM.current_rounds -= S
- bullet_amount += S
- AM.update_icon()
- to_chat(user, span_notice("You put [S] rounds in [src]."))
- if(AM.current_rounds <= 0)
- user.temporarilyRemoveItemFromInventory(AM)
- qdel(AM)
-
-//explosion when using flamer procs.
-/obj/item/big_ammo_box/fire_act(burn_level, flame_color)
- if(QDELETED(src))
- return
- if(!bullet_amount)
- return
- var/turf/explosion_loc = loc // we keep it so we don't runtime on src deletion
- var/power = 5
- for(var/obj/item/big_ammo_box/box in explosion_loc)
- if(!box.bullet_amount)
- continue
- power++
- qdel(box)
- cell_explosion(explosion_loc, power, power)
-
-//Deployable shotgun ammo box
-/obj/item/shotgunbox
- name = "Slug Ammo Box"
- desc = "A large, deployable ammo box."
- icon = 'icons/obj/items/ammo.dmi'
- icon_state = "ammoboxslug"
- item_state = "ammoboxslug"
- base_icon_state = "ammoboxslug"
- w_class = WEIGHT_CLASS_HUGE
- flags_equip_slot = ITEM_SLOT_BACK
- ///Current stored rounds
- var/current_rounds = 200
- ///Maximum stored rounds
- var/max_rounds = 200
- ///Ammunition type
- var/datum/ammo/ammo_type = /datum/ammo/bullet/shotgun/slug
- ///Whether the box is deployed or not.
- var/deployed = FALSE
- ///Caliber of the rounds stored.
- var/caliber = CALIBER_12G
-
-
-/obj/item/shotgunbox/update_icon_state()
- . = ..()
- if(!deployed)
- icon_state = "[initial(icon_state)]"
- else if(current_rounds > 0)
- icon_state = "[initial(icon_state)]_deployed"
- else
- icon_state = "[initial(icon_state)]_empty"
-
-
-/obj/item/shotgunbox/attack_self(mob/user)
- deployed = TRUE
- update_icon()
- user.dropItemToGround(src)
-
-
-/obj/item/shotgunbox/MouseDrop(atom/over_object)
- if(!deployed)
- return
-
- if(!ishuman(over_object))
- return
-
- var/mob/living/carbon/human/H = over_object
- if(H == usr && !H.incapacitated() && Adjacent(H) && H.put_in_hands(src))
- deployed = FALSE
- update_icon()
-
-
-/obj/item/shotgunbox/examine(mob/user)
- . = ..()
- . += "It contains [current_rounds] out of [max_rounds] shotgun shells."
-
-
-/obj/item/shotgunbox/attack_hand(mob/living/user)
- if(loc == user)
- return ..()
-
- if(!deployed)
- user.put_in_hands(src)
- return
-
- if(current_rounds < 1)
- to_chat(user, ("The [src] is empty."))
- return
-
- var/obj/item/ammo_magazine/handful/H = new
- var/rounds = min(current_rounds, 5)
-
- H.generate_handful(ammo_type, caliber, rounds, initial(ammo_type.handful_amount))
- current_rounds -= rounds
-
- user.put_in_hands(H)
- to_chat(user, span_notice("You grab
[rounds] round\s from [src]."))
- update_icon()
-
-
-/obj/item/shotgunbox/attackby(obj/item/I, mob/user, params)
- . = ..()
-
- if(!istype(I, /obj/item/ammo_magazine/handful))
- return
-
- var/obj/item/ammo_magazine/handful/H = I
-
- if(!deployed)
- to_chat(user, span_warning("[src] must be deployed on the ground to be refilled."))
- return
-
- if(H.default_ammo != ammo_type)
- to_chat(user, span_warning("That's not the right kind of ammo."))
- return
-
- if(current_rounds == max_rounds)
- to_chat(user, span_warning("The [src] is already full."))
- return
-
- current_rounds = min(current_rounds + H.current_rounds, max_rounds)
- qdel(H)
- update_icon()
-
-
-/obj/item/big_ammo_box/ap
- name = "big ammo box (10x24mm AP)"
- icon_state = "big_ammo_box_ap"
- base_icon_state = "big_ammo_box_ap"
- default_ammo = /datum/ammo/bullet/rifle/ap
- bullet_amount = 400 //AP is OP
- max_bullet_amount = 400
-
-/obj/item/big_ammo_box/smg
- name = "big ammo box (10x20mm)"
- caliber = CALIBER_10X20
- icon_state = "big_ammo_box_m25"
- base_icon_state = "big_ammo_box_m25"
- default_ammo = /datum/ammo/bullet/smg
- bullet_amount = 4500
- max_bullet_amount = 4500
- caliber = CALIBER_10X20_CASELESS
-
-/obj/item/shotgunbox/buckshot
- name = "Buckshot Ammo Box"
- icon_state = "ammoboxbuckshot"
- item_state = "ammoboxbuckshot"
- base_icon_state = "ammoboxbuckshot"
- ammo_type = /datum/ammo/bullet/shotgun/buckshot
-
-/obj/item/shotgunbox/flechette
- name = "Flechette Ammo Box"
- icon_state = "ammoboxflechette"
- item_state = "ammoboxflechette"
- base_icon_state = "ammoboxflechette"
- ammo_type = /datum/ammo/bullet/shotgun/flechette
-
-/obj/item/shotgunbox/clf_heavyrifle
- name = "big ammo box (14.5mm API)"
- caliber = CALIBER_14X5
- icon_state = "ammobox_145"
- item_state = "ammobox_145"
- base_icon_state = "ammobox_145"
- ammo_type = /datum/ammo/bullet/sniper/clf_heavyrifle
-
-/obj/item/shotgunbox/tracker
- name = "Tracking Ammo Box"
- icon_state = "ammoboxtracking"
- item_state = "ammoboxtracking"
- base_icon_state = "ammoboxtracking"
- ammo_type = /datum/ammo/bullet/shotgun/tracker
-
-/obj/item/big_ammo_box/mg
- name = "big ammo box (10x26mm)"
- default_ammo = /datum/ammo/bullet/rifle/machinegun
- caliber = CALIBER_10x26_CASELESS
- bullet_amount = 3200 //a backpack holds 8 MG-60 box mags, which is 1600 rounds
- max_bullet_amount = 3200
+ return 100.0 * current_rounds / max_rounds
diff --git a/code/modules/projectiles/attachables/foldable.dm b/code/modules/projectiles/attachables/foldable.dm
index 7cd6cdc94aa..8e76cc5cb07 100644
--- a/code/modules/projectiles/attachables/foldable.dm
+++ b/code/modules/projectiles/attachables/foldable.dm
@@ -61,9 +61,6 @@
if(master_gun)
apply_modifiers(master_gun, user, !folded)
- for(var/X in master_gun.actions)
- var/datum/action/A = X
- A.update_button_icon()
return TRUE
diff --git a/code/modules/projectiles/attachables/rail.dm b/code/modules/projectiles/attachables/rail.dm
index e8083e12ad6..98507e5e8f8 100644
--- a/code/modules/projectiles/attachables/rail.dm
+++ b/code/modules/projectiles/attachables/rail.dm
@@ -76,10 +76,6 @@
else
return
- for(var/X in master_gun.actions)
- var/datum/action/A = X
- A.update_button_icon()
-
update_icon()
/obj/item/attachable/flashlight/attackby(obj/item/I, mob/user, params)
diff --git a/code/modules/projectiles/attachables/underbarrel.dm b/code/modules/projectiles/attachables/underbarrel.dm
index 6a346ae1b4d..c4879773cbf 100644
--- a/code/modules/projectiles/attachables/underbarrel.dm
+++ b/code/modules/projectiles/attachables/underbarrel.dm
@@ -59,13 +59,6 @@
flags_attach_features = ATTACH_REMOVABLE|ATTACH_ACTIVATION
attachment_action_type = /datum/action/item_action/toggle
-/obj/item/attachable/lace/t500
- name = "R-500 lace"
- icon = 'icons/Marine/attachments_64.dmi'
- slot = ATTACHMENT_SLOT_STOCK
- pixel_shift_x = 0
- pixel_shift_y = 0
-
/obj/item/attachable/lace/activate(mob/living/user, turn_off)
if(lace_deployed)
REMOVE_TRAIT(master_gun, TRAIT_NODROP, PISTOL_LACE_TRAIT)
@@ -87,13 +80,16 @@
lace_deployed = !lace_deployed
- for(var/i in master_gun.actions)
- var/datum/action/action_to_update = i
- action_to_update.update_button_icon()
-
update_icon()
return TRUE
+/obj/item/attachable/lace/t500
+ name = "R-500 lace"
+ icon = 'icons/Marine/attachments_64.dmi'
+ slot = ATTACHMENT_SLOT_STOCK
+ pixel_shift_x = 0
+ pixel_shift_y = 0
+
/obj/item/attachable/burstfire_assembly
name = "burst fire assembly"
desc = "A mechanism re-assembly kit that allows for automatic fire, or more shots per burst if the weapon already has the ability."
diff --git a/code/modules/projectiles/big_ammo_box.dm b/code/modules/projectiles/big_ammo_box.dm
new file mode 100644
index 00000000000..898b2609859
--- /dev/null
+++ b/code/modules/projectiles/big_ammo_box.dm
@@ -0,0 +1,246 @@
+/obj/item/big_ammo_box
+ name = "big ammo box (10x24mm)"
+ desc = "A large ammo box. It comes with a leather strap."
+ w_class = WEIGHT_CLASS_HUGE
+ icon = 'icons/obj/items/ammo/box.dmi'
+ icon_state = "big_ammo_box"
+ item_state = "big_ammo_box"
+ flags_equip_slot = ITEM_SLOT_BACK
+ base_icon_state = "big_ammo_box"
+ ///Ammunition type
+ var/default_ammo = /datum/ammo/bullet/rifle
+ ///Current stored rounds
+ var/bullet_amount = 2400
+ ///Maximum stored rounds
+ var/max_bullet_amount = 2400
+ ///Caliber of the rounds stored.
+ var/caliber = CALIBER_10X24_CASELESS
+
+/obj/item/big_ammo_box/update_icon_state()
+ . = ..()
+ if(bullet_amount)
+ icon_state = base_icon_state
+ return
+ icon_state = "[base_icon_state]_e"
+
+/obj/item/big_ammo_box/examine(mob/user)
+ . = ..()
+ if(bullet_amount)
+ . += "It contains [bullet_amount] round\s."
+ else
+ . += "It's empty."
+
+/obj/item/big_ammo_box/attackby(obj/item/I, mob/user, params)
+ . = ..()
+
+ if(istype(I, /obj/item/ammo_magazine))
+ var/obj/item/ammo_magazine/AM = I
+ if(!isturf(loc))
+ to_chat(user, span_warning("[src] must be on the ground to be used."))
+ return
+ if(AM.flags_magazine & MAGAZINE_REFILLABLE)
+ if(default_ammo != AM.default_ammo)
+ to_chat(user, span_warning("Those aren't the same rounds. Better not mix them up."))
+ return
+ if(caliber != AM.caliber)
+ to_chat(user, span_warning("The rounds don't match up. Better not mix them up."))
+ return
+ if(AM.current_rounds == AM.max_rounds)
+ to_chat(user, span_warning("[AM] is already full."))
+ return
+
+ if(!do_after(user, 15, NONE, src, BUSY_ICON_GENERIC))
+ return
+
+ playsound(loc, 'sound/weapons/guns/interact/revolver_load.ogg', 25, 1)
+ var/S = min(bullet_amount, AM.max_rounds - AM.current_rounds)
+ AM.current_rounds += S
+ bullet_amount -= S
+ AM.update_icon()
+ update_icon()
+ if(AM.current_rounds == AM.max_rounds)
+ to_chat(user, span_notice("You refill [AM]."))
+ else
+ to_chat(user, span_notice("You put [S] rounds in [AM]."))
+ else if(AM.flags_magazine & MAGAZINE_HANDFUL)
+ if(caliber != AM.caliber)
+ to_chat(user, span_warning("The rounds don't match up. Better not mix them up."))
+ return
+ if(bullet_amount == max_bullet_amount)
+ to_chat(user, span_warning("[src] is full!"))
+ return
+ playsound(loc, 'sound/weapons/guns/interact/revolver_load.ogg', 25, 1)
+ var/S = min(AM.current_rounds, max_bullet_amount - bullet_amount)
+ AM.current_rounds -= S
+ bullet_amount += S
+ AM.update_icon()
+ to_chat(user, span_notice("You put [S] rounds in [src]."))
+ if(AM.current_rounds <= 0)
+ user.temporarilyRemoveItemFromInventory(AM)
+ qdel(AM)
+
+//explosion when using flamer procs.
+/obj/item/big_ammo_box/fire_act(burn_level, flame_color)
+ if(QDELETED(src))
+ return
+ if(!bullet_amount)
+ return
+ var/turf/explosion_loc = loc // we keep it so we don't runtime on src deletion
+ var/power = 5
+ for(var/obj/item/big_ammo_box/box in explosion_loc)
+ if(!box.bullet_amount)
+ continue
+ power++
+ qdel(box)
+ cell_explosion(explosion_loc, power, power)
+
+/obj/item/big_ammo_box/ap
+ name = "big ammo box (10x24mm AP)"
+ icon_state = "big_ammo_box_ap"
+ base_icon_state = "big_ammo_box_ap"
+ default_ammo = /datum/ammo/bullet/rifle/ap
+ bullet_amount = 400 //AP is OP
+ max_bullet_amount = 400
+
+/obj/item/big_ammo_box/smg
+ name = "big ammo box (10x20mm)"
+ caliber = CALIBER_10X20
+ icon_state = "big_ammo_box_m25"
+ base_icon_state = "big_ammo_box_m25"
+ default_ammo = /datum/ammo/bullet/smg
+ bullet_amount = 4500
+ max_bullet_amount = 4500
+ caliber = CALIBER_10X20_CASELESS
+
+/obj/item/big_ammo_box/mg
+ name = "big ammo box (10x26mm)"
+ default_ammo = /datum/ammo/bullet/rifle/machinegun
+ caliber = CALIBER_10X26_CASELESS
+ bullet_amount = 3200 //a backpack holds 8 MG-60 box mags, which is 1600 rounds
+ max_bullet_amount = 3200
+
+//Deployable shotgun ammo box
+/obj/item/shotgunbox
+ name = "Slug Ammo Box"
+ desc = "A large, deployable ammo box."
+ icon = 'icons/obj/items/ammo/box.dmi'
+ icon_state = "ammoboxslug"
+ item_state = "ammoboxslug"
+ base_icon_state = "ammoboxslug"
+ w_class = WEIGHT_CLASS_HUGE
+ flags_equip_slot = ITEM_SLOT_BACK
+ ///Current stored rounds
+ var/current_rounds = 200
+ ///Maximum stored rounds
+ var/max_rounds = 200
+ ///Ammunition type
+ var/datum/ammo/ammo_type = /datum/ammo/bullet/shotgun/slug
+ ///Whether the box is deployed or not.
+ var/deployed = FALSE
+ ///Caliber of the rounds stored.
+ var/caliber = CALIBER_12G
+
+/obj/item/shotgunbox/update_icon_state()
+ . = ..()
+ if(!deployed)
+ icon_state = "[initial(icon_state)]"
+ else if(current_rounds > 0)
+ icon_state = "[initial(icon_state)]_deployed"
+ else
+ icon_state = "[initial(icon_state)]_empty"
+
+/obj/item/shotgunbox/attack_self(mob/user)
+ deployed = TRUE
+ update_icon()
+ user.dropItemToGround(src)
+
+/obj/item/shotgunbox/MouseDrop(atom/over_object)
+ if(!deployed)
+ return
+
+ if(!ishuman(over_object))
+ return
+
+ var/mob/living/carbon/human/H = over_object
+ if(H == usr && !H.incapacitated() && Adjacent(H) && H.put_in_hands(src))
+ deployed = FALSE
+ update_icon()
+
+/obj/item/shotgunbox/examine(mob/user)
+ . = ..()
+ . += "It contains [current_rounds] out of [max_rounds] shotgun shells."
+
+/obj/item/shotgunbox/attack_hand(mob/living/user)
+ if(loc == user)
+ return ..()
+
+ if(!deployed)
+ user.put_in_hands(src)
+ return
+
+ if(current_rounds < 1)
+ to_chat(user, ("The [src] is empty."))
+ return
+
+ var/obj/item/ammo_magazine/handful/H = new
+ var/rounds = min(current_rounds, 5)
+
+ H.generate_handful(ammo_type, caliber, rounds, initial(ammo_type.handful_amount))
+ current_rounds -= rounds
+
+ user.put_in_hands(H)
+ to_chat(user, span_notice("You grab
[rounds] round\s from [src]."))
+ update_icon()
+
+/obj/item/shotgunbox/attackby(obj/item/I, mob/user, params)
+ . = ..()
+
+ if(!istype(I, /obj/item/ammo_magazine/handful))
+ return
+
+ var/obj/item/ammo_magazine/handful/H = I
+
+ if(!deployed)
+ to_chat(user, span_warning("[src] must be deployed on the ground to be refilled."))
+ return
+
+ if(H.default_ammo != ammo_type)
+ to_chat(user, span_warning("That's not the right kind of ammo."))
+ return
+
+ if(current_rounds == max_rounds)
+ to_chat(user, span_warning("The [src] is already full."))
+ return
+
+ current_rounds = min(current_rounds + H.current_rounds, max_rounds)
+ qdel(H)
+ update_icon()
+
+/obj/item/shotgunbox/buckshot
+ name = "Buckshot Ammo Box"
+ icon_state = "ammoboxbuckshot"
+ item_state = "ammoboxbuckshot"
+ base_icon_state = "ammoboxbuckshot"
+ ammo_type = /datum/ammo/bullet/shotgun/buckshot
+
+/obj/item/shotgunbox/flechette
+ name = "Flechette Ammo Box"
+ icon_state = "ammoboxflechette"
+ item_state = "ammoboxflechette"
+ base_icon_state = "ammoboxflechette"
+ ammo_type = /datum/ammo/bullet/shotgun/flechette
+
+/obj/item/shotgunbox/clf_heavyrifle
+ name = "big ammo box (14.5mm API)"
+ caliber = CALIBER_14X5
+ icon_state = "ammobox_145"
+ item_state = "ammobox_145"
+ base_icon_state = "ammobox_145"
+ ammo_type = /datum/ammo/bullet/sniper/clf_heavyrifle
+
+/obj/item/shotgunbox/tracker
+ name = "Tracking Ammo Box"
+ icon_state = "ammoboxtracking"
+ item_state = "ammoboxtracking"
+ base_icon_state = "ammoboxtracking"
+ ammo_type = /datum/ammo/bullet/shotgun/tracker
diff --git a/code/modules/projectiles/gun_system.dm b/code/modules/projectiles/gun_system.dm
index 79935f3b1b3..722749767d0 100644
--- a/code/modules/projectiles/gun_system.dm
+++ b/code/modules/projectiles/gun_system.dm
@@ -504,16 +504,8 @@
SIGNAL_HANDLER
set_gun_user(null)
-/obj/item/weapon/gun/update_icon()
+/obj/item/weapon/gun/update_icon(updates=ALL)
. = ..()
-
- for(var/datum/action/action AS in actions)
- action.update_button_icon()
-
- if(master_gun)
- for(var/datum/action/action AS in master_gun.actions)
- action.update_button_icon()
-
update_item_state()
/obj/item/weapon/gun/update_icon_state()
diff --git a/code/modules/projectiles/guns/mounted.dm b/code/modules/projectiles/guns/mounted.dm
index 47f2855b267..1b13d0d5659 100644
--- a/code/modules/projectiles/guns/mounted.dm
+++ b/code/modules/projectiles/guns/mounted.dm
@@ -402,7 +402,7 @@
icon = 'icons/Marine/marine-mmg.dmi'
icon_state = "t27"
item_state = "t27"
- caliber = CALIBER_10x27_CASELESS // codex
+ caliber = CALIBER_10X27_CASELESS // codex
max_shells = 150 //codex
force = 40
aim_slowdown = 1.2
diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm
index dca92f6c726..8fdc32db8d4 100644
--- a/code/modules/projectiles/guns/revolvers.dm
+++ b/code/modules/projectiles/guns/revolvers.dm
@@ -334,7 +334,7 @@
icon_state = "t76"
item_state = "t76"
fire_animation = "t76_fire"
- caliber = CALIBER_12x7 //codex
+ caliber = CALIBER_12X7 //codex
max_chamber_items = 5 //codex
default_ammo_type = /obj/item/ammo_magazine/revolver/standard_magnum
allowed_ammo_types = list(/obj/item/ammo_magazine/revolver/standard_magnum)
diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm
index 0f4d5b30f73..dd73350c577 100644
--- a/code/modules/projectiles/guns/rifles.dm
+++ b/code/modules/projectiles/guns/rifles.dm
@@ -238,7 +238,7 @@
cocked_sound = 'sound/weapons/guns/dmr/DMR-37/DMR37_boltpull.ogg'
silenced_sound = 'sound/weapons/guns/dmr/DMR-37/DMR37_SIL.ogg'
wield_sound = 'sound/weapons/guns/dmr/Deploy_Wave_DMR.ogg'
- caliber = CALIBER_10x27_CASELESS //codex
+ caliber = CALIBER_10X27_CASELESS //codex
aim_slowdown = 0.75
wield_delay = 0.8 SECONDS
force = 20
@@ -321,7 +321,7 @@
cocked_sound = 'sound/weapons/guns/dmr/BR-64/BR64_boltpull.ogg'
silenced_sound = 'sound/weapons/guns/dmr/BR-64/BR64_SIL.ogg'
wield_sound = 'sound/weapons/guns/dmr/Deploy_Wave_DMR.ogg'
- caliber = CALIBER_10x265_CASELESS //codex
+ caliber = CALIBER_10X265_CASELESS //codex
aim_slowdown = 0.55
wield_delay = 0.7 SECONDS
force = 20
@@ -993,7 +993,7 @@
inhand_x_dimension = 64
inhand_y_dimension = 32
- caliber = CALIBER_10x26_CASELESS //codex
+ caliber = CALIBER_10X26_CASELESS //codex
max_shells = 200 //codex
force = 35
aim_slowdown = 1.2
@@ -1319,7 +1319,7 @@
desc = "The Raummetall-KT SG-29 is the TGMC's current standard IFF-capable medium machine gun. It's known for its ability to lay down heavy fire support very well. It is generally used when someone wants to hold a position or provide fire support. Requires special training and it cannot turn off IFF. It uses 10x26mm ammunition."
icon_state = "sg29"
item_state = "sg29"
- caliber = CALIBER_10x26_CASELESS //codex
+ caliber = CALIBER_10X26_CASELESS //codex
max_shells = 300 //codex
force = 30
aim_slowdown = 0.95
@@ -1355,7 +1355,8 @@
starting_attachment_types = list(/obj/item/attachable/stock/sgstock, /obj/item/attachable/sgbarrel)
gun_skill_category = SKILL_SMARTGUN //Uses SG skill for the penalties.
attachable_offset = list("muzzle_x" = 42, "muzzle_y" = 17,"rail_x" = 15, "rail_y" = 21, "under_x" = 24, "under_y" = 14, "stock_x" = 12, "stock_y" = 13)
- fire_delay = 0.2 SECONDS
+
+ fire_delay = 0.15 SECONDS
burst_amount = 0
accuracy_mult_unwielded = 0.5
accuracy_mult = 1.1
@@ -1383,7 +1384,7 @@
icon = 'icons/Marine/gun64.dmi'
icon_state = "sg62"
item_state = "sg62"
- caliber = CALIBER_10x27_CASELESS //codex
+ caliber = CALIBER_10X27_CASELESS //codex
max_shells = 40 //codex
aim_slowdown = 0.55
wield_delay = 0.65 SECONDS
@@ -1431,7 +1432,7 @@
icon_state = "sg153"
icon = 'icons/Marine/gun64.dmi'
fire_sound = 'sound/weapons/guns/fire/spottingrifle.ogg'
- caliber = CALIBER_12x7
+ caliber = CALIBER_12X7
slot = ATTACHMENT_SLOT_UNDER
max_shells = 5
default_ammo_type =/obj/item/ammo_magazine/rifle/sg153
@@ -2289,7 +2290,7 @@
inhand_x_dimension = 64
inhand_y_dimension = 32
- caliber = CALIBER_10x26_CASELESS
+ caliber = CALIBER_10X26_CASELESS
max_shells = 200
force = 35
wield_delay = 1.5 SECONDS
@@ -2361,7 +2362,7 @@
dry_fire_sound = 'sound/weapons/guns/fire/m41a_empty.ogg'
unload_sound = 'sound/weapons/guns/interact/fal_unload.ogg'
reload_sound = 'sound/weapons/guns/interact/fal_reload.ogg'
- caliber = CALIBER_10x27_CASELESS //codex
+ caliber = CALIBER_10X27_CASELESS //codex
aim_slowdown = 0.8
wield_delay = 0.85 SECONDS
force = 20
@@ -2673,7 +2674,7 @@
slot_s_store_str = 'icons/mob/suit_slot.dmi',
slot_back_str = 'icons/mob/clothing/back.dmi',
)
- caliber = CALIBER_10x26_CASELESS //codex
+ caliber = CALIBER_10X26_CASELESS //codex
max_shells = 80 //codex
force = 20
aim_slowdown = 0.5
diff --git a/code/modules/projectiles/guns/specialist.dm b/code/modules/projectiles/guns/specialist.dm
index 18131866893..309ddcf5252 100644
--- a/code/modules/projectiles/guns/specialist.dm
+++ b/code/modules/projectiles/guns/specialist.dm
@@ -427,7 +427,7 @@ Note that this means that snipers will have a slowdown of 3, due to the scope
item_state = "minigun_sg"
fire_animation = "minigun_sg_fire"
max_shells = 2000 //codex
- caliber = CALIBER_10x26_CASELESS //codex
+ caliber = CALIBER_10X26_CASELESS //codex
allowed_ammo_types = list(/obj/item/ammo_magazine/minigun_powerpack/smartgun)
wield_delay = 1.5 SECONDS
flags_gun_features = GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY|GUN_IFF|GUN_SMOKE_PARTICLES
diff --git a/code/modules/projectiles/handful.dm b/code/modules/projectiles/handful.dm
new file mode 100644
index 00000000000..0698a2be023
--- /dev/null
+++ b/code/modules/projectiles/handful.dm
@@ -0,0 +1,75 @@
+/obj/item/ammo_magazine/handful
+ name = "generic handful of bullets or shells"
+ desc = "A handful of rounds to reload on the go."
+ flags_equip_slot = null // It only fits into pockets and such.
+ w_class = WEIGHT_CLASS_SMALL
+ current_rounds = 1 // So it doesn't get autofilled for no reason.
+ max_rounds = 5 // For shotguns, though this will be determined by the handful type when generated.
+ flags_atom = CONDUCT|DIRLOCK
+ flags_magazine = MAGAZINE_HANDFUL|MAGAZINE_REFILLABLE
+ attack_speed = 3 // should make reloading less painful
+ icon = 'icons/obj/items/ammo/handful.dmi'
+ icon_state_mini = "bullets"
+
+/obj/item/ammo_magazine/handful/repeater
+ name = "handful of heavy impact rifle bullet (.45-70 Government)"
+ icon_state = "bullet"
+ current_rounds = 8
+ max_rounds = 8
+ default_ammo = /datum/ammo/bullet/rifle/repeater
+ caliber = CALIBER_4570
+
+/obj/item/ammo_magazine/handful/slug
+ name = "handful of shotgun slug (12 gauge)"
+ icon_state = "shotgun slug"
+ current_rounds = 5
+ default_ammo = /datum/ammo/bullet/shotgun/slug
+ caliber = CALIBER_12G
+
+/obj/item/ammo_magazine/handful/buckshot
+ name = "handful of shotgun buckshot shells (12g)"
+ icon_state = "shotgun buckshot shell"
+ current_rounds = 5
+ default_ammo = /datum/ammo/bullet/shotgun/buckshot
+ caliber = CALIBER_12G
+
+/obj/item/ammo_magazine/handful/flechette
+ name = "handful of shotgun flechette shells (12g)"
+ icon_state = "shotgun flechette shell"
+ current_rounds = 5
+ default_ammo = /datum/ammo/bullet/shotgun/flechette
+ caliber = CALIBER_12G
+
+/obj/item/ammo_magazine/handful/incendiary
+ name = "handful of shotgun incendiary shells (12g)"
+ icon_state = "incendiary slug"
+ current_rounds = 5
+ default_ammo = /datum/ammo/bullet/shotgun/incendiary
+ caliber = CALIBER_12G
+
+/obj/item/ammo_magazine/handful/micro_grenade
+ name = "handful of airburst micro grenades (10g)"
+ icon_state = "micro_grenade_airburst"
+ icon_state_mini = "40mm_cyan"
+ current_rounds = 3
+ max_rounds = 3
+ default_ammo = /datum/ammo/bullet/micro_rail/airburst
+ caliber = CALIBER_10G_RAIL
+
+/obj/item/ammo_magazine/handful/micro_grenade/dragonbreath
+ name = "handful of dragon's breath micro grenades (10g)"
+ icon_state = "micro_grenade_incendiary"
+ icon_state_mini = "40mm_orange"
+ default_ammo = /datum/ammo/bullet/micro_rail/dragonbreath
+
+/obj/item/ammo_magazine/handful/micro_grenade/cluster
+ name = "handful of clustermunition micro grenades (10g)"
+ icon_state = "micro_grenade_cluster"
+ icon_state_mini = "40mm_red"
+ default_ammo = /datum/ammo/bullet/micro_rail/cluster
+
+/obj/item/ammo_magazine/handful/micro_grenade/smoke_burst
+ name = "handful of smoke burst micro grenades (10g)"
+ icon_state = "micro_grenade_smoke"
+ icon_state_mini = "40mm_blue"
+ default_ammo = /datum/ammo/bullet/micro_rail/smoke_burst
diff --git a/code/modules/projectiles/magazines/energy.dm b/code/modules/projectiles/magazines/energy.dm
index 50009190cb8..260e4d93642 100644
--- a/code/modules/projectiles/magazines/energy.dm
+++ b/code/modules/projectiles/magazines/energy.dm
@@ -3,7 +3,7 @@
/obj/item/cell/lasgun
name = "\improper lasgun Battery"
desc = "A specialized high density battery used to power lasguns."
- icon = 'icons/obj/items/ammo.dmi'
+ icon = 'icons/obj/items/ammo/energy.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/inhands/weapons/ammo_left.dmi',
slot_r_hand_str = 'icons/mob/inhands/weapons/ammo_right.dmi',
@@ -75,7 +75,6 @@
/obj/item/cell/lasgun/volkite
name = "\improper volkite energy cell"
desc = "A specialized high density battery used to power volkite weaponry."
- icon = 'icons/obj/items/ammo.dmi'
icon_state = "volkite"
maxcharge = 1440
w_class = WEIGHT_CLASS_NORMAL
@@ -86,7 +85,6 @@
/obj/item/cell/lasgun/volkite/small
name = "\improper compact volkite energy cell"
desc = "A specialized compact battery used to power the smallest volkite weaponry."
- icon = 'icons/obj/items/ammo.dmi'
icon_state = "volkite_small"
maxcharge = 540
w_class = WEIGHT_CLASS_SMALL
@@ -95,7 +93,6 @@
/obj/item/cell/lasgun/volkite/turret
name = "\improper volkite nuclear energy cell"
desc = "A nuclear powered battery designed for certain heavy SOM machinery like sentries. Slowly charges over time."
- icon = 'icons/obj/items/ammo.dmi'
icon_state = "volkite_turret"
maxcharge = 1800
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/modules/projectiles/magazines/flamer.dm b/code/modules/projectiles/magazines/flamer.dm
index 83d2334e811..88871609779 100644
--- a/code/modules/projectiles/magazines/flamer.dm
+++ b/code/modules/projectiles/magazines/flamer.dm
@@ -1,11 +1,9 @@
-
-
//Flame thrower.
-
/obj/item/ammo_magazine/flamer_tank
name = "incinerator tank"
desc = "A fuel tank of usually ultra thick napthal, a sticky combustable liquid chemical, for use in the FL-240 incinerator unit. Handle with care."
icon_state = "flametank"
+ icon = 'icons/obj/items/ammo/flamer.dmi'
max_rounds = 50 //Per turf.
current_rounds = 50
reload_delay = 2 SECONDS
diff --git a/code/modules/projectiles/magazines/misc.dm b/code/modules/projectiles/magazines/misc.dm
index 35c9218884d..401f2426094 100644
--- a/code/modules/projectiles/magazines/misc.dm
+++ b/code/modules/projectiles/magazines/misc.dm
@@ -3,6 +3,7 @@
/obj/item/ammo_magazine/packet
name = "box of some kind of ammo"
desc = "A packet containing some kind of ammo."
+ icon = 'icons/obj/items/ammo/packet.dmi'
icon_state_mini = "ammo_packet"
w_class = WEIGHT_CLASS_NORMAL
@@ -62,7 +63,7 @@
/obj/item/ammo_magazine/packet/p10x265mm
name = "box of 10x26.5mm"
desc = "A box containing 100 rounds of 10x26.5mm caseless."
- caliber = CALIBER_10x265_CASELESS
+ caliber = CALIBER_10X265_CASELESS
icon_state = "box_10x265mm"
default_ammo = /datum/ammo/bullet/rifle/br64
current_rounds = 100
@@ -71,7 +72,7 @@
/obj/item/ammo_magazine/packet/p10x27mm
name = "box of 10x27mm"
desc = "A box containing 100 rounds of 10x27mm caseless."
- caliber = CALIBER_10x27_CASELESS
+ caliber = CALIBER_10X27_CASELESS
icon_state = "box_10x27mm"
default_ammo = /datum/ammo/bullet/rifle/dmr37
current_rounds = 100
@@ -110,7 +111,7 @@
desc = "A hefty container stuffed to the absolute brim with 500 rounds for the SG-85 powerpack."
icon_state = "box_smartminigun"
default_ammo = /datum/ammo/bullet/smart_minigun
- caliber = CALIBER_10x26_CASELESS
+ caliber = CALIBER_10X26_CASELESS
current_rounds = 500
max_rounds = 500
w_class = WEIGHT_CLASS_NORMAL
@@ -249,7 +250,7 @@
name = "packet of 10x26mm"
desc = "A packet containing 100 rounds of 10x26mm caseless."
icon_state = "box_10x26mm"
- caliber = CALIBER_10x26_CASELESS
+ caliber = CALIBER_10X26_CASELESS
default_ammo = /datum/ammo/bullet/rifle/machinegun
w_class = WEIGHT_CLASS_SMALL
current_rounds = 100
@@ -289,7 +290,6 @@
/obj/item/ammo_magazine/packet/long_special
name = "box of .44 Long Special"
desc = "A packet containing 40 rounds of .44 Long Special."
- icon = 'icons/obj/items/ammo.dmi'
icon_state = "44LSbox"
default_ammo = /datum/ammo/bullet/revolver/rifle
caliber = CALIBER_44LS
@@ -300,10 +300,9 @@
/obj/item/ammo_magazine/packet/t25
name = "box of 10x26mm high-pressure"
desc = "A box containing 300 rounds of 10x26mm 'HP' caseless tuned for a smartgun."
- icon = 'icons/obj/items/ammo.dmi'
icon_state = "box_t25"
default_ammo = /datum/ammo/bullet/rifle/t25
- caliber = CALIBER_10x26_CASELESS
+ caliber = CALIBER_10X26_CASELESS
current_rounds = 300
max_rounds = 300
@@ -319,7 +318,6 @@
/obj/item/ammo_magazine/packet/t500
name = "packet of .500 Nigro Express"
- icon = 'icons/obj/items/ammo.dmi'
icon_state = "boxt500"
default_ammo = /datum/ammo/bullet/revolver/t500
caliber = CALIBER_500
@@ -340,10 +338,9 @@
/obj/item/ammo_magazine/packet/standard_magnum
name = "packet of .12x7mm"
- icon = 'icons/obj/items/ammo.dmi'
icon_state = "box_t76"
default_ammo = /datum/ammo/bullet/revolver/t76
- caliber = CALIBER_12x7
+ caliber = CALIBER_12X7
w_class = WEIGHT_CLASS_SMALL
current_rounds = 50
max_rounds = 50
@@ -387,22 +384,19 @@
/obj/item/ammo_magazine/packet/p10x265mm/ap
desc = "A box containing 100 armor piercing rounds of 10x26.5mm caseless."
- icon = 'icons/obj/items/ammo.dmi'
icon_state = "box_10x265mm_ap"
default_ammo = /datum/ammo/bullet/rifle/br64/ap
/obj/item/ammo_magazine/packet/p10x20mm/ap
desc = "A packet containing 125 rounds of 10x20mm caseless."
- icon = 'icons/obj/items/ammo.dmi'
icon_state = "box_10x20mm_ap"
default_ammo = /datum/ammo/bullet/smg/ap
/obj/item/ammo_magazine/packet/sg62
name = "box of 10x27mm"
desc = "A box containing 200 rounds of 10x27mm caseless."
- icon = 'icons/obj/items/ammo.dmi'
icon_state = "box_sg62"
default_ammo = /datum/ammo/bullet/sg62
- caliber = CALIBER_10x27_CASELESS
+ caliber = CALIBER_10X27_CASELESS
current_rounds = 200
max_rounds = 200
diff --git a/code/modules/projectiles/magazines/mounted.dm b/code/modules/projectiles/magazines/mounted.dm
index 8b169740b72..c01517bb952 100644
--- a/code/modules/projectiles/magazines/mounted.dm
+++ b/code/modules/projectiles/magazines/mounted.dm
@@ -48,7 +48,7 @@
icon_state = "mag"
icon_state_mini = "mag_drum_big_armygreen"
flags_magazine = NONE
- caliber = CALIBER_10x27_CASELESS
+ caliber = CALIBER_10X27_CASELESS
max_rounds = 150
default_ammo = /datum/ammo/bullet/rifle/heavy
reload_delay = 1 SECONDS
@@ -95,7 +95,6 @@
icon_state = "ags_mag_pgas"
default_ammo = /datum/ammo/grenade_container/agls37/tanglefoot
-
/obj/item/ammo_magazine/at36
name = "AT-36 AP-HE shell (37mm Shell)"
desc = "A 37mm shell for light anti tank guns. Will penetrate walls and fortifications, before hitting a target and exploding, has less payload and punch than usual rounds."
@@ -141,7 +140,7 @@
name = "MG-2005 box magazine (7.62x51mm)"
desc = "A box of 1000 rounds for the MG-2005 mounted minigun."
w_class = WEIGHT_CLASS_BULKY
- icon = 'icons/obj/items/ammo.dmi'
+ icon = 'icons/obj/items/ammo/stationary.dmi'
icon_state = "minigun"
flags_magazine = NONE
caliber = CALIBER_762X51
diff --git a/code/modules/projectiles/magazines/pistols.dm b/code/modules/projectiles/magazines/pistols.dm
index a12a25591ad..416e6545abf 100644
--- a/code/modules/projectiles/magazines/pistols.dm
+++ b/code/modules/projectiles/magazines/pistols.dm
@@ -32,35 +32,37 @@
name = "\improper RT-3 magazine (9mm)"
desc = "A pistol magazine."
caliber = CALIBER_9X19
+ icon = 'icons/obj/items/ammo/pistol.dmi'
icon_state = "m4a3"
max_rounds = 14
w_class = WEIGHT_CLASS_SMALL
default_ammo = /datum/ammo/bullet/pistol
icon_state_mini = "mag_pistol_orange"
+ ammo_band_icon = "m4a3_band"
/obj/item/ammo_magazine/pistol/hp
name = "\improper M4A3 hollowpoint magazine (9mm)"
- icon_state = "m4a3_hp"
default_ammo = /datum/ammo/bullet/pistol/hollow
icon_state_mini = "mag_pistol_blue"
+ ammo_band_color = AMMO_BAND_COLOR_HOLLOWPOINT
/obj/item/ammo_magazine/pistol/ap
name = "\improper M4A3 AP magazine (9mm)"
- icon_state = "m4a3_ap"
default_ammo = /datum/ammo/bullet/pistol/ap
icon_state_mini = "mag_pistol_green"
+ ammo_band_color = AMMO_BAND_COLOR_AP
/obj/item/ammo_magazine/pistol/incendiary
name = "\improper M4A3 incendiary magazine (9mm)"
- icon_state = "m4a3_incendiary"
default_ammo = /datum/ammo/bullet/pistol/incendiary
icon_state_mini = "mag_pistol_red"
+ ammo_band_color = AMMO_BAND_COLOR_INCENDIARY
/obj/item/ammo_magazine/pistol/extended
name = "\improper M4A3 extended magazine (9mm)"
max_rounds = 24
- icon_state = "m4a3_ext"
icon_state_mini = "mag_pistol_yellow"
+ ammo_band_color = AMMO_BAND_COLOR_EXTENDED
//-------------------------------------------------------
//P-1911
@@ -218,18 +220,20 @@
icon_state = "v11"
icon_state_mini = "mag_pistol_normal"
max_rounds = 18
+ ammo_band_icon = "v11_band"
/obj/item/ammo_magazine/pistol/som/incendiary
name = "\improper V-11 incendiary magazine (9mm)"
- icon_state = "v11_incend"
default_ammo = /datum/ammo/bullet/pistol/incendiary
icon_state_mini = "mag_pistol_red"
+ ammo_band_color = AMMO_BAND_COLOR_INCENDIARY
/obj/item/ammo_magazine/pistol/som/extended
name = "\improper V-11 extended magazine (9mm)"
max_rounds = 30
icon_state = "v11_extended"
icon_state_mini = "mag_pistol_yellow"
+ ammo_band_color = AMMO_BAND_COLOR_EXTENDED
//-------------------------------------------------------
//PL-5
diff --git a/code/modules/projectiles/magazines/revolvers.dm b/code/modules/projectiles/magazines/revolvers.dm
index 75de1d988cd..b790b4617c3 100644
--- a/code/modules/projectiles/magazines/revolvers.dm
+++ b/code/modules/projectiles/magazines/revolvers.dm
@@ -4,6 +4,7 @@
default_ammo = /datum/ammo/bullet/revolver
flags_equip_slot = NONE
caliber = CALIBER_44
+ icon = 'icons/obj/items/ammo/revolver.dmi'
icon_state = "m44"
icon_state_mini = "mag_revolver_bronze"
w_class = WEIGHT_CLASS_SMALL
@@ -12,7 +13,6 @@
/obj/item/ammo_magazine/revolver/rifle
name = "\improper M1855 speed loader (.44LS)"
desc = "A speed loader for the M1855, with special design to make it possible to speedload a rifle. Longer version of .44 Magnum, with uranium-neodimium core."
- icon = 'icons/obj/items/ammo.dmi'
icon_state = "44LS"
default_ammo = /datum/ammo/bullet/revolver/rifle
caliber = CALIBER_44LS
@@ -20,13 +20,10 @@
/obj/item/ammo_magazine/revolver/t500
name = "\improper R-500 speed loader (.500)"
- icon = 'icons/obj/items/ammo.dmi'
icon_state = "t500"
desc = "A R-500 BF revolver speed loader."
default_ammo = /datum/ammo/bullet/revolver/t500
- flags_equip_slot = NONE
caliber = CALIBER_500
- w_class = WEIGHT_CLASS_SMALL
max_rounds = 5
/obj/item/ammo_magazine/revolver/t500/slavs
@@ -114,6 +111,6 @@
desc = "A revolver speed loader for the R-76 Magnum, mind your shoulder, will stun most moderately sized targets on impact."
default_ammo = /datum/ammo/bullet/revolver/t76
max_rounds = 5
- caliber = CALIBER_12x7
+ caliber = CALIBER_12X7
icon_state = "t76"
icon_state_mini = "mag_revolver_red"
diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm
index 08defd211f7..6bbc909a885 100644
--- a/code/modules/projectiles/magazines/rifles.dm
+++ b/code/modules/projectiles/magazines/rifles.dm
@@ -1,10 +1,7 @@
-
-
-
//-------------------------------------------------------
//M41A PULSE RIFLE AMMUNITION
-/obj/item/ammo_magazine/rifle/
+/obj/item/ammo_magazine/rifle
name = "\improper PR-412 magazine (10x24mm)"
desc = "A 10mm assault rifle magazine."
caliber = CALIBER_10X24_CASELESS
@@ -13,30 +10,31 @@
w_class = WEIGHT_CLASS_NORMAL
default_ammo = /datum/ammo/bullet/rifle
max_rounds = 40
+ ammo_band_icon = "m412_band"
/obj/item/ammo_magazine/rifle/extended
name = "\improper PR-412 extended magazine (10x24mm)"
desc = "A 10mm assault extended rifle magazine."
- icon_state = "m412_ext"
icon_state_mini = "mag_rifle_big_yellow"
max_rounds = 60
bonus_overlay = "m412_ex"
+ ammo_band_color = AMMO_BAND_COLOR_EXTENDED
/obj/item/ammo_magazine/rifle/incendiary
name = "\improper PR-412 incendiary magazine (10x24mm)"
desc = "A 10mm assault rifle magazine."
- icon_state = "m412_incendiary"
icon_state_mini = "mag_rifle_big_red"
default_ammo = /datum/ammo/bullet/rifle/incendiary
bonus_overlay = "m412_incend"
+ ammo_band_color = AMMO_BAND_COLOR_INCENDIARY
/obj/item/ammo_magazine/rifle/ap
name = "\improper PR-412 AP magazine (10x24mm)"
desc = "A 10mm armor piercing magazine."
- icon_state = "m412_ap"
icon_state_mini = "mag_rifle_big_green"
default_ammo = /datum/ammo/bullet/rifle/ap
bonus_overlay = "m412_ap"
+ ammo_band_color = AMMO_BAND_COLOR_AP
//-------------------------------------------------------
//ar18 Carbine
@@ -52,6 +50,24 @@
default_ammo = /datum/ammo/bullet/rifle
max_rounds = 36
+/obj/item/ammo_magazine/rifle/ar18/ap
+ name = "\improper AR-18 AP magazine (10x24mm)"
+ desc = "A 10mm armor piercing carbine magazine."
+ ammo_band_color = AMMO_BAND_COLOR_AP
+ default_ammo = /datum/ammo/bullet/rifle/ap
+
+/obj/item/ammo_magazine/rifle/ar18/incendiary
+ name = "\improper AR-18 incendiary magazine (10x24mm)"
+ desc = "A 10mm incendiary carbine magazine."
+ ammo_band_color = AMMO_BAND_COLOR_INCENDIARY
+ default_ammo = /datum/ammo/bullet/rifle/incendiary
+
+/obj/item/ammo_magazine/rifle/ar18/hp
+ name = "\improper AR-18 HP magazine (10x24mm)"
+ desc = "A 10mm hollow-point carbine magazine."
+ ammo_band_color = AMMO_BAND_COLOR_HOLLOWPOINT
+ default_ammo = /datum/ammo/bullet/rifle/hp
+
//-------------------------------------------------------
//AR12 Assault Rifle
@@ -66,13 +82,31 @@
default_ammo = /datum/ammo/bullet/rifle
max_rounds = 50
+/obj/item/ammo_magazine/rifle/ar12/ap
+ name = "\improper AR-12 AP magazine (10x24mm)"
+ desc = "A 10mm armor piercing assault rifle magazine."
+ ammo_band_color = AMMO_BAND_COLOR_AP
+ default_ammo = /datum/ammo/bullet/rifle/ap
+
+/obj/item/ammo_magazine/rifle/ar12/incendiary
+ name = "\improper AR-12 incendiary magazine (10x24mm)"
+ desc = "A 10mm incendiary assault rifle magazine."
+ ammo_band_color = AMMO_BAND_COLOR_INCENDIARY
+ default_ammo = /datum/ammo/bullet/rifle/incendiary
+
+/obj/item/ammo_magazine/rifle/ar12/hp
+ name = "\improper AR-12 HP magazine (10x24mm)"
+ desc = "A 10mm hollow-point assault rifle magazine."
+ ammo_band_color = AMMO_BAND_COLOR_HOLLOWPOINT
+ default_ammo = /datum/ammo/bullet/rifle/hp
+
//-------------------------------------------------------
//DMR37
/obj/item/ammo_magazine/rifle/dmr37
name = "\improper DMR-37 magazine (10x27mm)"
desc = "A 10mm DMR magazine."
- caliber = CALIBER_10x27_CASELESS
+ caliber = CALIBER_10X27_CASELESS
icon_state = "t37"
icon_state_mini = "mag_rifle_big"
w_class = WEIGHT_CLASS_NORMAL
@@ -85,12 +119,19 @@
/obj/item/ammo_magazine/rifle/br64
name = "\improper BR-64 magazine (10x26.5mm)"
desc = "A 10mm battle rifle magazine."
- caliber = CALIBER_10x265_CASELESS
+ caliber = CALIBER_10X265_CASELESS
icon_state = "t64"
icon_state_mini = "mag_rifle_big"
w_class = WEIGHT_CLASS_NORMAL
default_ammo = /datum/ammo/bullet/rifle/br64
max_rounds = 36
+ ammo_band_icon = "t64_band"
+
+/obj/item/ammo_magazine/rifle/br64/ap
+ name = "\improper BR-64 AP magazine (10x26.5mm)"
+ desc = "A 10mm armor piercing battle rifle magazine."
+ default_ammo = /datum/ammo/bullet/rifle/br64/ap
+ ammo_band_color = AMMO_BAND_COLOR_AP
//-------------------------------------------------------
//M41A TRUE AND ORIGINAL
@@ -233,7 +274,7 @@
desc = "A belt box for the MG-60 general purpose machinegun."
icon_state = "t60"
icon_state_mini = "mag_gpmg"
- caliber = CALIBER_10x26_CASELESS
+ caliber = CALIBER_10X26_CASELESS
default_ammo = /datum/ammo/bullet/rifle/machinegun
w_class = WEIGHT_CLASS_NORMAL
max_rounds = 200
@@ -305,11 +346,11 @@
/obj/item/ammo_magazine/sg29
name = "\improper SG-29 drum magazine"
desc = "A wide drum magazine carefully filled to capacity with 10x26mm specialized smart rounds."
- caliber = CALIBER_10x26_CASELESS
+ caliber = CALIBER_10X26_CASELESS
icon_state = "sg29"
icon_state_mini = "mag_sg29"
w_class = WEIGHT_CLASS_NORMAL
- default_ammo = /datum/ammo/bullet/sg29
+ default_ammo = /datum/ammo/bullet/rifle/t25
max_rounds = 250
reload_delay = 1.3 SECONDS
@@ -319,7 +360,7 @@
/obj/item/ammo_magazine/rifle/sg62
name = "\improper SG-62 magazine (10x27mm HV)"
desc = "A magazine filled with 10x27mm specialized smart rounds."
- caliber = CALIBER_10x27_CASELESS
+ caliber = CALIBER_10X27_CASELESS
icon_state = "sg62"
w_class = WEIGHT_CLASS_NORMAL
default_ammo = /datum/ammo/bullet/sg62
@@ -332,7 +373,7 @@
/obj/item/ammo_magazine/rifle/sg153
name = "\improper SG-153 magazine (12x7mm)"
desc = "A magazine filled with 12x7mm lethal smart rounds, these will do nothing other than pack a big punch."
- caliber = CALIBER_12x7
+ caliber = CALIBER_12X7
icon_state = "sg153"
w_class = WEIGHT_CLASS_SMALL
default_ammo = /datum/ammo/bullet/sg153
@@ -399,14 +440,15 @@
default_ammo = /datum/ammo/bullet/sniper/pfc
max_rounds = 10
bonus_overlay = "tl127_mag"
+ ammo_band_icon = "tl127_band"
/obj/item/ammo_magazine/rifle/sr127/flak
name = "SR-127 bolt action rifle flak magazine"
desc = "A box magazine filled with 8.6x70mm rifle flak rounds for the SR-127."
- icon_state = "tl127_flak"
icon_state_mini = "mag_sniper_blue"
default_ammo = /datum/ammo/bullet/sniper/pfc/flak
bonus_overlay = "tl127_flak"
+ ammo_band_color = AMMO_BAND_COLOR_IMPACT
//-------------------------------------------------------
//Marine magazine automatic sniper, or the SR-81.
@@ -442,6 +484,33 @@
default_ammo = /datum/ammo/bullet/rifle/heavy
max_rounds = 30
+/obj/item/ammo_magazine/rifle/ar21/extended
+ name = "\improper AR-21 extended skirmish rifle magazine"
+ desc = "A extended magazine filled with 10x25mm rifle rounds for the AR-21."
+ icon_state = "t21_ext"
+ max_rounds = 50
+ icon_state_mini = "mag_rifle_big_yellow"
+ ammo_band_color = AMMO_BAND_COLOR_EXTENDED
+ bonus_overlay = "t21_ext"
+
+/obj/item/ammo_magazine/rifle/ar21/ap
+ name = "\improper AR-21 skirmish AP rifle magazine"
+ desc = "A magazine filled with 10x25mm armor piercing rifle rounds for the AR-21."
+ ammo_band_color = AMMO_BAND_COLOR_AP
+ default_ammo = /datum/ammo/bullet/rifle/heavy/ap
+
+/obj/item/ammo_magazine/rifle/ar21/incendiary
+ name = "\improper AR-21 skirmish incendiary rifle magazine"
+ desc = "A magazine filled with 10x25mm incendiary rifle rounds for the AR-21."
+ ammo_band_color = AMMO_BAND_COLOR_INCENDIARY
+ default_ammo = /datum/ammo/bullet/rifle/heavy/incendiary
+
+/obj/item/ammo_magazine/rifle/ar21/hp
+ name = "\improper AR-21 skirmish HP rifle magazine"
+ desc = "A magazine filled with 10x25mm armor-piercing rifle rounds for the AR-21."
+ ammo_band_color = AMMO_BAND_COLOR_HOLLOWPOINT
+ default_ammo = /datum/ammo/bullet/rifle/heavy/hp
+
//ALF-51B
/obj/item/ammo_magazine/rifle/alf_machinecarbine
@@ -473,6 +542,7 @@
name = "\improper 20mm airburst grenade magazine"
desc = "A 20mm magazine loaded with airburst grenades. For use with the GL-54 or AR-55."
caliber = CALIBER_20MM
+ icon = 'icons/obj/items/ammo/misc.dmi'
icon_state = "tx54_airburst"
icon_state_mini = "mag_sniper_blue"
w_class = WEIGHT_CLASS_NORMAL
@@ -485,7 +555,6 @@
name = "\improper 20mm incendiary grenade magazine"
desc = "A 20mm magazine loaded with incendiary grenades. For use with the GL-54 or AR-55."
default_ammo = /datum/ammo/tx54/incendiary
- icon_state = "tx54_airburst"
icon_state_mini = "mag_sniper_orange"
greyscale_colors = COLOR_AMMO_INCENDIARY
@@ -493,7 +562,6 @@
name = "\improper 20mm tactical smoke grenade magazine"
desc = "A 20mm magazine loaded with tactical smoke grenades. For use with the GL-54 or AR-55."
default_ammo = /datum/ammo/tx54/smoke
- icon_state = "tx54_airburst"
icon_state_mini = "mag_sniper_green"
greyscale_colors = COLOR_AMMO_TACTICAL_SMOKE
@@ -501,7 +569,6 @@
name = "\improper 20mm smoke grenade magazine"
desc = "A 20mm magazine loaded with smoke grenades. For use with the GL-54 or AR-55."
default_ammo = /datum/ammo/tx54/smoke/dense
- icon_state = "tx54_airburst"
icon_state_mini = "mag_sniper_cyan"
greyscale_colors = COLOR_AMMO_SMOKE
@@ -509,7 +576,6 @@
name = "\improper 20mm tanglefoot grenade magazine"
desc = "A 20mm magazine loaded with tanglefoot grenades. For use with the GL-54 or AR-55."
default_ammo = /datum/ammo/tx54/smoke/tangle
- icon_state = "tx54_airburst"
icon_state_mini = "mag_sniper_purple"
greyscale_colors = COLOR_AMMO_TANGLEFOOT
@@ -517,7 +583,6 @@
name = "\improper 20mm razorburn grenade magazine"
desc = "A 20mm magazine loaded with razorburn grenades. For use with the GL-54 or AR-55."
default_ammo = /datum/ammo/tx54/razor
- icon_state = "tx54_airburst"
icon_state_mini = "mag_sniper_yellow"
greyscale_colors = COLOR_AMMO_RAZORBURN
@@ -545,23 +610,21 @@
w_class = WEIGHT_CLASS_NORMAL
default_ammo = /datum/ammo/bullet/rifle
max_rounds = 50
+ ammo_band_icon = "v31_band"
/obj/item/ammo_magazine/rifle/som/ap
name = "\improper V-31 AP magazine (10x24mm)"
desc = "A 10mm rifle magazine designed for the V-31, loaded with armor piercing rounds."
- caliber = CALIBER_10X24_CASELESS
- icon_state = "v31_ap"
icon_state_mini = "mag_thin_green"
- w_class = WEIGHT_CLASS_NORMAL
default_ammo = /datum/ammo/bullet/rifle/hv
- max_rounds = 50
+ ammo_band_color = AMMO_BAND_COLOR_AP
/obj/item/ammo_magazine/rifle/som/incendiary
name = "\improper V-31 incendiary magazine (10x24mm)"
desc = "A 10mm rifle magazine designed for the V-31, loaded with incendiary rounds."
- icon_state = "v31_incend"
icon_state_mini = "mag_thin_red"
default_ammo = /datum/ammo/bullet/rifle/incendiary
+ ammo_band_color = AMMO_BAND_COLOR_INCENDIARY
//-------------------------------------------------------
//V-41 Machine Gun
@@ -571,7 +634,7 @@
desc = "A drum magazine for the V-41 machinegun."
icon_state = "v41"
icon_state_mini = "mag_drum_big_long"
- caliber = CALIBER_10x26_CASELESS
+ caliber = CALIBER_10X26_CASELESS
default_ammo = /datum/ammo/bullet/rifle/som_machinegun
w_class = WEIGHT_CLASS_NORMAL
max_rounds = 200
@@ -583,7 +646,7 @@
/obj/item/ammo_magazine/rifle/icc_sharpshooter
name = "\improper L-11 sharpshooter rifle magazine (10x27mm)"
desc = "A 10mm DMR magazine."
- caliber = CALIBER_10x27_CASELESS
+ caliber = CALIBER_10X27_CASELESS
icon_state = "l11"
icon_state_mini = "mag_rifle"
w_class = WEIGHT_CLASS_NORMAL
@@ -652,23 +715,13 @@
/obj/item/ammo_magazine/rifle/t25
name = "\improper T-25 magazine (10x26mm)"
desc = "A 10mm assault rifle magazine."
- caliber = CALIBER_10x26_CASELESS
- icon = 'icons/obj/items/ammo.dmi'
+ caliber = CALIBER_10X26_CASELESS
icon_state = "t25"
w_class = WEIGHT_CLASS_NORMAL
default_ammo = /datum/ammo/bullet/rifle/t25
max_rounds = 80
icon_state_mini = "mag_rifle_big"
-/obj/item/ammo_magazine/rifle/ar21/extended
- name = "\improper AR-21 extended skirmish rifle magazine"
- desc = "A extended magazine filled with 10x25mm rifle rounds for the AR-21."
- icon = 'icons/obj/items/ammo.dmi'
- icon_state = "t21_ext"
- max_rounds = 50
- icon_state_mini = "mag_rifle_big_yellow"
- bonus_overlay = "t21_ext"
-
/obj/item/ammo_magazine/rifle/t25/extended
name = "\improper T-25 extended magazine (10x26mm)"
desc = "A 10mm extended assault rifle magazine."
@@ -676,76 +729,3 @@
max_rounds = 120
icon_state_mini = "mag_rifle_big_yellow"
bonus_overlay = "t25_ext"
-
-/obj/item/ammo_magazine/rifle/ar18/ap
- name = "\improper AR-18 AP magazine (10x24mm)"
- desc = "A 10mm armor piercing carbine magazine."
- ammo_band_color = AMMO_BAND_COLOR_AP
- default_ammo = /datum/ammo/bullet/rifle/ap
-
-/obj/item/ammo_magazine/rifle/ar18/incendiary
- name = "\improper AR-18 incendiary magazine (10x24mm)"
- desc = "A 10mm incendiary carbine magazine."
- ammo_band_color = AMMO_BAND_COLOR_INCENDIARY
- default_ammo = /datum/ammo/bullet/rifle/incendiary
-
-/obj/item/ammo_magazine/rifle/ar18/hp
- name = "\improper AR-18 HP magazine (10x24mm)"
- desc = "A 10mm hollow-point carbine magazine."
- ammo_band_color = AMMO_BAND_COLOR_HOLLOWPOINT
- default_ammo = /datum/ammo/bullet/rifle/hp
-
-/obj/item/ammo_magazine/rifle/ar12/ap
- name = "\improper AR-12 AP magazine (10x24mm)"
- desc = "A 10mm armor piercing assault rifle magazine."
- ammo_band_color = AMMO_BAND_COLOR_AP
- default_ammo = /datum/ammo/bullet/rifle/ap
-
-/obj/item/ammo_magazine/rifle/ar12/incendiary
- name = "\improper AR-12 incendiary magazine (10x24mm)"
- desc = "A 10mm incendiary assault rifle magazine."
- ammo_band_color = AMMO_BAND_COLOR_INCENDIARY
- default_ammo = /datum/ammo/bullet/rifle/incendiary
-
-/obj/item/ammo_magazine/rifle/ar12/hp
- name = "\improper AR-12 HP magazine (10x24mm)"
- desc = "A 10mm hollow-point assault rifle magazine."
- ammo_band_color = AMMO_BAND_COLOR_HOLLOWPOINT
- default_ammo = /datum/ammo/bullet/rifle/hp
-
-/obj/item/ammo_magazine/rifle/br64/ap
- name = "\improper BR-64 AP magazine (10x26.5mm)"
- desc = "A 10mm armor piercing battle rifle magazine."
- caliber = CALIBER_10x265_CASELESS
- icon = 'icons/obj/items/ammo.dmi'
- icon_state = "t64_ap"
- default_ammo = /datum/ammo/bullet/rifle/br64/ap
- icon_state_mini = "mag_rifle_big"
-
-/obj/item/ammo_magazine/rifle/ar21/ap
- name = "\improper AR-21 skirmish AP rifle magazine"
- desc = "A magazine filled with 10x25mm armor piercing rifle rounds for the AR-21."
- ammo_band_color = AMMO_BAND_COLOR_AP
- default_ammo = /datum/ammo/bullet/rifle/heavy/ap
-
-/obj/item/ammo_magazine/rifle/ar21/incendiary
- name = "\improper AR-21 skirmish incendiary rifle magazine"
- desc = "A magazine filled with 10x25mm incendiary rifle rounds for the AR-21."
- ammo_band_color = AMMO_BAND_COLOR_INCENDIARY
- default_ammo = /datum/ammo/bullet/rifle/heavy/incendiary
-
-/obj/item/ammo_magazine/rifle/ar21/hp
- name = "\improper AR-21 skirmish HP rifle magazine"
- desc = "A magazine filled with 10x25mm armor-piercing rifle rounds for the AR-21."
- ammo_band_color = AMMO_BAND_COLOR_HOLLOWPOINT
- default_ammo = /datum/ammo/bullet/rifle/heavy/hp
-
-/obj/item/ammo_magazine/rifle/som/ap
- name = "\improper V-31 AP magazine (10x24mm)"
- desc = "A 10mm rifle magazine designed for the V-31, loaded with armor piercing rounds."
- caliber = CALIBER_10X24_CASELESS
- icon_state = "v31_ap"
- w_class = WEIGHT_CLASS_NORMAL
- default_ammo = /datum/ammo/bullet/rifle/hv
- max_rounds = 50
- icon_state_mini = "mag_rifle_big_green"
diff --git a/code/modules/projectiles/magazines/sentries.dm b/code/modules/projectiles/magazines/sentries.dm
index f27d0ae7c79..0dd6d5b033e 100644
--- a/code/modules/projectiles/magazines/sentries.dm
+++ b/code/modules/projectiles/magazines/sentries.dm
@@ -2,7 +2,8 @@
name = "\improper Магазин TUR-B (10x28мм)"
desc = "Коробчатый магазин на 200 безгильзовых патронов 10х28 мм для турели \"Базис\". Вставьте в порт турели в случае отстутсвия боеприпасов."
w_class = WEIGHT_CLASS_NORMAL
- icon_state = "sentry_mag"
+ icon = 'icons/obj/items/ammo/stationary.dmi'
+ icon_state = "sentry"
flags_magazine = NONE //can't be refilled or emptied by hand
caliber = CALIBER_10X28
max_rounds = 200
@@ -12,7 +13,8 @@
name = "\improper Магазин TUR-M (10x20мм)"
desc = "Коробчатый магазин на 300 безгильзовых патронов 10х20 мм для турели \"Гном\". Вставьте в порт турели в случае отстутсвия боеприпасов."
w_class = WEIGHT_CLASS_NORMAL
- icon_state = "minisentry_mag"
+ icon = 'icons/obj/items/ammo/stationary.dmi'
+ icon_state = "minisentry"
flags_magazine = NONE //can't be refilled or emptied by hand
caliber = CALIBER_10X20
max_rounds = 300
@@ -35,7 +37,7 @@
/obj/item/ammo_magazine/sentry/sniper
name = "\improper Магазин TUR-SN (9x39мм)"
desc = "Коробчатый магазин на 50 безгильзовых патронов 9х39 мм для турели \"Оса\". Вставьте в порт турели в случае отстутсвия боеприпасов."
- icon_state = "sentry_sniper_mag"
+ icon_state = "sentry_sniper"
max_rounds = 50
default_ammo = /datum/ammo/bullet/turret/sniper
@@ -43,7 +45,7 @@
name = "\improper Магазин TUR-SH (12G)"
desc = "Коробчатый магазин на 75 специализированных патронов 12 калибра для турели \"Бык\". Вставьте в порт турели в случае отстутсвия боеприпасов."
caliber = CALIBER_12G
- icon_state = "sentry_shotgun_mag"
+ icon_state = "sentry_shotgun"
max_rounds = 75
default_ammo = /datum/ammo/bullet/turret/buckshot
@@ -52,7 +54,7 @@
/obj/item/ammo_magazine/flamer_tank/large/sentry
name = "\improper Малый бак TUR-F (Горючее)"
desc = "Малый бак на 5 литров горючего для турели \"Феникс\". Вставьте в порт турели в случае отстутсвия горючего."
- icon_state = "sentry_flamer_mag"
+ icon_state = "sentry_flamer"
w_class = WEIGHT_CLASS_NORMAL
max_rounds = 75
current_rounds = 75
diff --git a/code/modules/projectiles/magazines/shotguns.dm b/code/modules/projectiles/magazines/shotguns.dm
index ca99c0ffb21..6eddfa28088 100644
--- a/code/modules/projectiles/magazines/shotguns.dm
+++ b/code/modules/projectiles/magazines/shotguns.dm
@@ -10,6 +10,7 @@ one type of shotgun ammo, but I think it helps in referencing it. ~N
/obj/item/ammo_magazine/shotgun
name = "box of 12 gauge shotgun slugs"
desc = "A box filled with heavy shotgun shells. A timeless classic. 12 Gauge."
+ icon = 'icons/obj/items/ammo/packet.dmi'
icon_state = "slugs"
default_ammo = /datum/ammo/bullet/shotgun/slug
caliber = CALIBER_12G //All shotgun rounds are 12g right now.
@@ -55,6 +56,7 @@ one type of shotgun ammo, but I think it helps in referencing it. ~N
/obj/item/ammo_magazine/rifle/bolt
name = "box of 7.62x54mmR rifle rounds"
desc = "A box filled with rifle bullets."
+ icon = 'icons/obj/items/ammo/packet.dmi'
icon_state = "7.62" //Thank you Alterist
default_ammo = /datum/ammo/bullet/sniper/svd
caliber = CALIBER_762X54 //Cyka Blyat
@@ -75,6 +77,7 @@ one type of shotgun ammo, but I think it helps in referencing it. ~N
/obj/item/ammo_magazine/rifle/martini
name = "box of .557/440 rifle rounds"
desc = "A box filled with rifle bullets."
+ icon = 'icons/obj/items/ammo/packet.dmi'
icon_state = ".557"
default_ammo = /datum/ammo/bullet/sniper/martini
caliber = CALIBER_557
@@ -90,6 +93,7 @@ one type of shotgun ammo, but I think it helps in referencing it. ~N
/obj/item/ammo_magazine/pistol/derringer
name = "box of .40 rimfire pistol rounds"
desc = "A box filled with pistol bullets."
+ icon = 'icons/obj/items/ammo/packet.dmi'
icon_state = "derringer_box"
default_ammo = /datum/ammo/bullet/pistol/superheavy/derringer
caliber = CALIBER_41RIM
diff --git a/code/modules/projectiles/magazines/smgs.dm b/code/modules/projectiles/magazines/smgs.dm
index 176bedb0d0f..0a2924cc21e 100644
--- a/code/modules/projectiles/magazines/smgs.dm
+++ b/code/modules/projectiles/magazines/smgs.dm
@@ -3,6 +3,7 @@
desc = "A submachinegun magazine."
default_ammo = /datum/ammo/bullet/smg
max_rounds = 30
+ icon = 'icons/obj/items/ammo/smg.dmi'
icon_state_mini = "mag_smg"
//-------------------------------------------------------
@@ -15,20 +16,21 @@
icon_state = "m25"
max_rounds = 60
w_class = WEIGHT_CLASS_SMALL
+ ammo_band_icon = "m25_band"
/obj/item/ammo_magazine/smg/m25/ap
name = "\improper SMG-25 AP magazine (10x20mm)"
- icon_state = "m25_ap"
default_ammo = /datum/ammo/bullet/smg/ap
icon_state_mini = "mag_smg_green"
bonus_overlay = "m25_ap"
+ ammo_band_color = AMMO_BAND_COLOR_AP
/obj/item/ammo_magazine/smg/m25/extended
name = "\improper SMG-25 extended magazine (10x20mm)"
- icon_state = "m25_ext"
max_rounds = 90
icon_state_mini = "mag_smg_yellow"
bonus_overlay = "m25_ex"
+ ammo_band_color = AMMO_BAND_COLOR_EXTENDED
//-------------------------------------------------------
//MP-19 Machinepistol ammo
@@ -132,20 +134,21 @@
icon_state_mini = "mag_smg"
max_rounds = 50
w_class = WEIGHT_CLASS_SMALL
+ ammo_band_icon = "v21_band"
/obj/item/ammo_magazine/smg/som/ap
name = "\improper V-21 AP submachinegun magazine (10x20mm)"
desc = "A 10x20mm caseless submachinegun magazine, loaded in armor piercing rounds."
- icon_state = "v21_ap"
default_ammo = /datum/ammo/bullet/smg/ap
icon_state_mini = "mag_smg_green"
+ ammo_band_color = AMMO_BAND_COLOR_AP
/obj/item/ammo_magazine/smg/som/incendiary
name = "\improper V-21 incendiary submachinegun magazine (10x20mm)"
desc = "A 10x20mm caseless submachinegun magazine, loaded in incendiary rounds."
- icon_state = "v21_incend"
default_ammo = /datum/ammo/bullet/smg/incendiary
icon_state_mini = "mag_smg_red"
+ ammo_band_color = AMMO_BAND_COLOR_INCENDIARY
/obj/item/ammo_magazine/smg/som/extended
name = "\improper V-21 extended submachinegun magazine (10x20mm)"
@@ -155,6 +158,7 @@
icon_state_mini = "mag_smg_yellow"
w_class = WEIGHT_CLASS_NORMAL
aim_speed_mod = 0.1
+ ammo_band_color = AMMO_BAND_COLOR_EXTENDED
/obj/item/ammo_magazine/smg/som/rad
name = "\improper V-21 radioactive submachinegun magazine (10x20mm)"
@@ -175,16 +179,14 @@
default_ammo = /datum/ammo/bullet/smg/ap
max_rounds = 32
w_class = WEIGHT_CLASS_SMALL
+ ammo_band_icon = "pl38_band"
/obj/item/ammo_magazine/smg/icc_machinepistol/hp
name = "\improper PL-38 HP machinepistol magazine (10x20mm)"
desc = "A 10x20mm caseless hollow point machine pistol magazine."
- caliber = CALIBER_10X20_CASELESS
- icon_state = "pl38_hp"
icon_state_mini = "mag_smg_dark_blue"
default_ammo = /datum/ammo/bullet/smg/hollow
- max_rounds = 32
- w_class = WEIGHT_CLASS_SMALL
+ ammo_band_color = AMMO_BAND_COLOR_HOLLOWPOINT
//-------------------------------------------------------
//L-40, ICC PDW
diff --git a/code/modules/projectiles/magazines/specialist.dm b/code/modules/projectiles/magazines/specialist.dm
index 042f81290cf..b927614f300 100644
--- a/code/modules/projectiles/magazines/specialist.dm
+++ b/code/modules/projectiles/magazines/specialist.dm
@@ -12,21 +12,21 @@
default_ammo = /datum/ammo/bullet/sniper
reload_delay = 3
icon_state_mini = "mag_sniper"
-
+ ammo_band_icon = "t26_band"
/obj/item/ammo_magazine/sniper/incendiary
name = "\improper SR-26 incendiary magazine (10x28mm)"
default_ammo = /datum/ammo/bullet/sniper/incendiary
- icon_state = "t26_inc"
icon_state_mini = "mag_sniper_red"
bonus_overlay = "t26_incend"
+ ammo_band_color = AMMO_BAND_COLOR_INCENDIARY
/obj/item/ammo_magazine/sniper/flak
name = "\improper SR-26 flak magazine (10x28mm)"
default_ammo = /datum/ammo/bullet/sniper/flak
- icon_state = "t26_flak"
icon_state_mini = "mag_sniper_blue"
bonus_overlay = "t26_flak"
+ ammo_band_color = AMMO_BAND_COLOR_IMPACT
//SR-42 magazine
@@ -62,24 +62,24 @@
default_ammo = /datum/ammo/bullet/rifle/tx8
max_rounds = 25
icon_state_mini = "mag_rifle_big"
+ ammo_band_icon = "tx8_band"
/obj/item/ammo_magazine/rifle/tx8/incendiary
name = "\improper high velocity incendiary magazine (10x28mm)"
desc = "A magazine of overpressuered high velocity incendiary rounds for use in the BR-8 battle rifle. The BR-8 battle rifle is the only gun that can chamber these rounds."
caliber = CALIBER_10X28_CASELESS
- icon_state = "tx8_incend"
default_ammo = /datum/ammo/bullet/rifle/tx8/incendiary
icon_state_mini = "mag_rifle_big_red"
bonus_overlay = "tx8_incend"
+ ammo_band_color = AMMO_BAND_COLOR_INCENDIARY
/obj/item/ammo_magazine/rifle/tx8/impact
name = "\improper high velocity impact magazine (10x28mm)"
desc = "A magazine of overpressuered high velocity impact rounds for use in the BR-8 battle rifle. The BR-8 battle rifle is the only gun that can chamber these rounds."
- icon_state = "tx8_impact"
default_ammo = /datum/ammo/bullet/rifle/tx8/impact
icon_state_mini = "mag_rifle_big_blue"
bonus_overlay = "tx8_impact"
-
+ ammo_band_color = AMMO_BAND_COLOR_IMPACT
//-------------------------------------------------------
//M5 RPG
@@ -88,6 +88,7 @@
name = "\improper generic high-explosive rocket"
desc = "A precursor to all kinds of rocket ammo unfit for normal use. How did you get this anyway?"
caliber = CALIBER_84MM
+ icon = 'icons/obj/items/ammo/rocket.dmi'
icon_state = "rocket"
w_class = WEIGHT_CLASS_NORMAL
flags_magazine = MAGAZINE_REFUND_IN_CHAMBER
@@ -358,6 +359,7 @@
name = "railgun canister (Armor Piercing Discarding Sabot)"
desc = "A canister holding a tungsten projectile to be used inside a railgun. APDS is written across the canister, this round will penetrate through most armor, but will not leave much of a hole."
caliber = CALIBER_RAILGUN
+ icon = 'icons/obj/items/ammo/misc.dmi'
icon_state = "railgun"
default_ammo = /datum/ammo/bullet/railgun
max_rounds = 3
@@ -385,6 +387,7 @@
name = "pepperball canister (SAN balls)"
desc = "A canister holding a projectile to be used inside a pepperball gun."
caliber = CALIBER_PEPPERBALL
+ icon = 'icons/obj/items/ammo/misc.dmi'
icon_state = "pepperball"
default_ammo = /datum/ammo/bullet/pepperball
max_rounds = 100
@@ -431,9 +434,9 @@
icon_state = "powerpacksg"
flags_magazine = MAGAZINE_WORN|MAGAZINE_REFILLABLE
default_ammo = /datum/ammo/bullet/smart_minigun
- current_rounds = 2000
- max_rounds = 2000
- caliber = CALIBER_10x26_CASELESS
+ current_rounds = 1000
+ max_rounds = 1000
+ caliber = CALIBER_10X26_CASELESS
flags_item_map_variant = null
diff --git a/code/modules/projectiles/magazines/unmanned_vehicle.dm b/code/modules/projectiles/magazines/unmanned_vehicle.dm
index aa1a14595a1..45ba0ef21c5 100644
--- a/code/modules/projectiles/magazines/unmanned_vehicle.dm
+++ b/code/modules/projectiles/magazines/unmanned_vehicle.dm
@@ -2,6 +2,7 @@
name = "box of 12x40mm"
desc = "A box containing 200 rounds of 12x40mm caseless."
caliber = CALIBER_12X40
+ icon = 'icons/obj/items/ammo/misc.dmi'
icon_state = "ltbcannon_4"
w_class = WEIGHT_CLASS_NORMAL
default_ammo = /datum/ammo/bullet/machinegun
@@ -13,6 +14,7 @@
name = "box of 11x35mm"
desc = "A box containing 200 rounds of 11x35mm caseless."
caliber = CALIBER_11X35
+ icon = 'icons/obj/items/ammo/misc.dmi'
icon_state = "ltbcannon_4"
w_class = WEIGHT_CLASS_NORMAL
default_ammo = /datum/ammo/bullet/smg
diff --git a/code/modules/reagents/reagents/medical.dm b/code/modules/reagents/reagents/medical.dm
index 82b46c0f1a1..12fce353b35 100644
--- a/code/modules/reagents/reagents/medical.dm
+++ b/code/modules/reagents/reagents/medical.dm
@@ -149,7 +149,6 @@
name = "Oxycodone"
description = "An effective and very addictive painkiller."
color = COLOR_REAGENT_OXYCODONE
- custom_metabolism = REAGENTS_METABOLISM * 1.25
overdose_threshold = REAGENTS_OVERDOSE * 0.5
overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL * 0.5
scannable = TRUE
diff --git a/code/modules/reqs/_supply.dm b/code/modules/reqs/_supply.dm
index 6eeb1a5cbee..8fac9089dcd 100644
--- a/code/modules/reqs/_supply.dm
+++ b/code/modules/reqs/_supply.dm
@@ -1,10 +1,3 @@
-GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
- /mob/living,
- /obj/item/disk/nuclear,
- /obj/item/radio/beacon,
- /obj/vehicle,
- )))
-
/datum/supply_order
var/id
var/orderer
@@ -16,174 +9,6 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
///What faction ordered this
var/faction = FACTION_TERRAGOV
-/obj/item/paper/manifest
- name = "Supply Manifest"
-
-/obj/docking_port/stationary/supply
- id = "supply_home"
- roundstart_template = /datum/map_template/shuttle/supply
- width = 5
- dwidth = 2
- dheight = 2
- height = 5
-
-/obj/docking_port/mobile/supply
- name = "supply shuttle"
- id = SHUTTLE_SUPPLY
- callTime = 15 SECONDS
-
- dir = WEST
- port_direction = EAST
- width = 5
- dwidth = 2
- dheight = 2
- height = 5
- movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
- use_ripples = FALSE
- var/list/gears = list()
- var/list/obj/machinery/door/poddoor/railing/railings = list()
- ///The faction of this docking port (aka, on which ship it is located)
- var/faction = FACTION_TERRAGOV
- /// Id of the home docking port
- var/home_id = "supply_home"
- ///prefix for railings and gear todo should probbaly be defines instead?
- var/railing_gear_name = "supply"
-
-/obj/docking_port/mobile/supply/Destroy(force)
- for(var/i in railings)
- var/obj/machinery/door/poddoor/railing/railing = i
- railing.linked_pad = null
- railings.Cut()
- return ..()
-
-
-/obj/docking_port/mobile/supply/afterShuttleMove()
- . = ..()
- if(getDockedId() == home_id)
- for(var/j in railings)
- var/obj/machinery/door/poddoor/railing/R = j
- R.open()
-
-/obj/docking_port/mobile/supply/on_ignition()
- if(getDockedId() == home_id)
- for(var/j in railings)
- var/obj/machinery/door/poddoor/railing/R = j
- R.close()
- for(var/i in gears)
- var/obj/machinery/gear/G = i
- G.start_moving(NORTH)
- else
- for(var/i in gears)
- var/obj/machinery/gear/G = i
- G.start_moving(SOUTH)
-
-/obj/docking_port/mobile/supply/register()
- . = ..()
- for(var/obj/machinery/gear/G in GLOB.machines)
- if(G.id == (railing_gear_name+"_elevator_gear"))
- gears += G
- RegisterSignal(G, COMSIG_QDELETING, PROC_REF(clean_gear))
- for(var/obj/machinery/door/poddoor/railing/R in GLOB.machines)
- if(R.id == (railing_gear_name+"_elevator_railing"))
- railings += R
- RegisterSignal(R, COMSIG_QDELETING, PROC_REF(clean_railing))
- R.linked_pad = src
- R.open()
-
-///Signal handler when a gear is destroyed
-/obj/docking_port/mobile/supply/proc/clean_gear(datum/source)
- SIGNAL_HANDLER
- gears -= source
-
-///Signal handler when a railing is destroyed
-/obj/docking_port/mobile/supply/proc/clean_railing(datum/source)
- SIGNAL_HANDLER
- railings -= source
-
-/obj/docking_port/mobile/supply/canMove()
- if(is_station_level(z))
- return check_blacklist(shuttle_areas)
- return ..()
-
-/obj/docking_port/mobile/supply/proc/check_blacklist(areaInstances)
- if(!areaInstances)
- areaInstances = shuttle_areas
- for(var/place in areaInstances)
- var/area/shuttle/shuttle_area = place
- for(var/trf in shuttle_area)
- var/turf/T = trf
- for(var/a in T.GetAllContents())
- if(isxeno(a))
- var/mob/living/L = a
- if(L.stat == DEAD)
- continue
- if(ishuman(a))
- var/mob/living/carbon/human/human_to_sell = a
- if(human_to_sell.stat == DEAD && can_sell_human_body(human_to_sell, faction))
- continue
- if(is_type_in_typecache(a, GLOB.blacklisted_cargo_types))
- return FALSE
- return TRUE
-
-/obj/docking_port/mobile/supply/request(obj/docking_port/stationary/S)
- if(mode != SHUTTLE_IDLE)
- return 2
- return ..()
-
-/obj/docking_port/mobile/supply/proc/buy(mob/user, datum/supply_ui/supply_ui)
- if(!length(SSpoints.shoppinglist[faction]))
- return
- log_game("Supply pack orders have been purchased by [key_name(user)]")
-
- var/list/empty_turfs = list()
- for(var/place in shuttle_areas)
- var/area/shuttle/shuttle_area = place
- for(var/turf/open/floor/T in shuttle_area)
- if(is_blocked_turf(T))
- continue
- empty_turfs += T
-
- for(var/i in SSpoints.shoppinglist[faction])
- if(!length(empty_turfs))
- break
- var/datum/supply_order/SO = LAZYACCESSASSOC(SSpoints.shoppinglist, faction, i)
-
- var/datum/supply_packs/firstpack = SO.pack[1]
-
- var/obj/structure/crate_type = firstpack.containertype || firstpack.contains[1]
-
- var/obj/structure/A = new crate_type(pick_n_take(empty_turfs))
- if(firstpack.containertype)
- A.name = "Order #[SO.id] for [SO.orderer]"
-
-
- var/list/contains = list()
- //spawn the stuff, finish generating the manifest while you're at it
- for(var/P in SO.pack)
- var/datum/supply_packs/SP = P
- // yes i know
- if(SP.access)
- A.req_access = list()
- A.req_access += text2num(SP.access)
-
- if(SP.randomised_num_contained)
- if(length(SP.contains))
- for(var/j in 1 to SP.randomised_num_contained)
- contains += pick(SP.contains)
- else
- contains += SP.contains
-
- for(var/typepath in contains)
- if(!typepath)
- continue
- if(!firstpack.containertype)
- break
- new typepath(A)
-
- SSpoints.shoppinglist[faction] -= "[SO.id]"
- SSpoints.shopping_history += SO
-
-
/datum/export_report
/// How many points from that export
var/points
@@ -196,833 +21,3 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
points = _points
export_name = _export_name
faction = _faction
-
-/obj/docking_port/mobile/supply/proc/sell()
- for(var/place in shuttle_areas)
- var/area/shuttle/shuttle_area = place
- for(var/atom/movable/AM in shuttle_area)
- if(AM.anchored)
- continue
- var/datum/export_report = AM.supply_export(faction)
- if(export_report)
- SSpoints.export_history += export_report
- qdel(AM)
-
-/obj/item/supplytablet
- name = "ASRS tablet"
- desc = "A tablet for an Automated Storage and Retrieval System"
- icon = 'icons/Marine/marine-navigation.dmi'
- icon_state = "req_tablet_off"
- req_access = list(ACCESS_MARINE_CARGO)
- flags_equip_slot = ITEM_SLOT_POCKET
- w_class = WEIGHT_CLASS_NORMAL
- var/datum/supply_ui/SU
- ///Id of the shuttle controlled
- var/shuttle_id = SHUTTLE_SUPPLY
- /// Id of the home docking port
- var/home_id = "supply_home"
- /// Faction of the tablet
- var/faction = FACTION_TERRAGOV
-
-/obj/item/supplytablet/interact(mob/user)
- . = ..()
- if(.)
- return
- if(!allowed(user))
- return
- if(!SU)
- SU = new(src)
- SU.shuttle_id = shuttle_id
- SU.home_id = home_id
- SU.faction = faction
- return SU.interact(user)
-
-/obj/machinery/computer/supplycomp
- name = "ASRS console"
- desc = "A console for an Automated Storage and Retrieval System"
- icon = 'icons/obj/machines/computer.dmi'
- icon_state = "computer"
- screen_overlay = "supply"
- req_access = list(ACCESS_MARINE_CARGO)
- circuit = /obj/item/circuitboard/computer/supplycomp
- var/datum/supply_ui/SU
- ///Id of the shuttle controlled
- var/shuttle_id = SHUTTLE_SUPPLY
- /// Id of the home docking port
- var/home_id = "supply_home"
- /// Faction of the computer
- var/faction = FACTION_TERRAGOV
-
-/obj/machinery/computer/supplycomp/interact(mob/user)
- . = ..()
- if(.)
- return
- if(isliving(user) && !allowed(user))
- return
- if(!SU)
- SU = new(src)
- SU.shuttle_id = shuttle_id
- SU.home_id = home_id
- SU.faction = faction
- return SU.interact(user)
-
-/datum/supply_ui
- interaction_flags = INTERACT_MACHINE_TGUI
- var/atom/source_object
- var/tgui_name = "Cargo"
- ///Id of the shuttle controlled
- var/shuttle_id = ""
- ///Reference to the supply shuttle
- var/obj/docking_port/mobile/supply/supply_shuttle
- ///Faction of the supply console linked
- var/faction = FACTION_TERRAGOV
- ///Id of the home port
- var/home_id = ""
-
-/datum/supply_ui/New(atom/source_object)
- . = ..()
- src.source_object = source_object
- RegisterSignal(source_object, COMSIG_QDELETING, PROC_REF(clean_ui))
-
-///Signal handler to delete the ui when the source object is deleting
-/datum/supply_ui/proc/clean_ui()
- SIGNAL_HANDLER
- qdel(src)
-
-/datum/supply_ui/Destroy(force)
- source_object = null
- return ..()
-
-/datum/supply_ui/ui_host()
- return source_object
-
-/datum/supply_ui/can_interact(mob/user)
- . = ..()
- if(!.)
- return FALSE
- if(!user.CanReach(source_object))
- return FALSE
- return TRUE
-
-/datum/supply_ui/ui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
-
- if(!ui)
- if(shuttle_id)
- supply_shuttle = SSshuttle.getShuttle(shuttle_id)
- supply_shuttle.home_id = home_id
- supply_shuttle.faction = faction
- ui = new(user, src, tgui_name, source_object.name)
- ui.open()
-
-/datum/supply_ui/ui_static_data(mob/user)
- . = list()
- .["categories"] = GLOB.all_supply_groups
- .["supplypacks"] = SSpoints.supply_packs_ui
- .["supplypackscontents"] = SSpoints.supply_packs_contents
- .["elevator_size"] = supply_shuttle?.return_number_of_turfs()
-
-/datum/supply_ui/ui_data(mob/living/user)
- . = list()
- .["currentpoints"] = round(SSpoints.supply_points[user.faction])
- .["personalpoints"] = round(SSpoints.personal_supply_points[user.ckey])
- .["requests"] = list()
- for(var/key in SSpoints.requestlist)
- var/datum/supply_order/SO = SSpoints.requestlist[key]
- if(SO.faction != user.faction)
- continue
- var/list/packs = list()
- var/cost = 0
- for(var/P in SO.pack)
- var/datum/supply_packs/SP = P
- if(packs[SP.type])
- packs[SP.type] += 1
- else
- packs[SP.type] = 1
- cost += SP.cost
- .["requests"] += list(list("id" = SO.id, "orderer" = SO.orderer, "orderer_rank" = SO.orderer_rank, "reason" = SO.reason, "cost" = cost, "packs" = packs, "authed_by" = SO.authorised_by))
- .["deniedrequests"] = list()
- for(var/i in length(SSpoints.deniedrequests) to 1 step -1)
- var/datum/supply_order/SO = SSpoints.deniedrequests[SSpoints.deniedrequests[i]]
- if(SO.faction != user.faction)
- continue
- var/list/packs = list()
- var/cost = 0
- for(var/P in SO.pack)
- var/datum/supply_packs/SP = P
- if(packs[SP.type])
- packs[SP.type] += 1
- else
- packs[SP.type] = 1
- cost += SP.cost
- .["deniedrequests"] += list(list("id" = SO.id, "orderer" = SO.orderer, "orderer_rank" = SO.orderer_rank, "reason" = SO.reason, "cost" = cost, "packs" = packs, "authed_by" = SO.authorised_by))
- .["approvedrequests"] = list()
- for(var/i in length(SSpoints.approvedrequests) to 1 step -1)
- var/datum/supply_order/SO = SSpoints.approvedrequests[SSpoints.approvedrequests[i]]
- if(SO.faction != user.faction)
- continue
- var/list/packs = list()
- var/cost = 0
- for(var/P in SO.pack)
- var/datum/supply_packs/SP = P
- if(packs[SP.type])
- packs[SP.type] += 1
- else
- packs[SP.type] = 1
- cost += SP.cost
- .["approvedrequests"] += list(list("id" = SO.id, "orderer" = SO.orderer, "orderer_rank" = SO.orderer_rank, "reason" = SO.reason, "cost" = cost, "packs" = packs, "authed_by" = SO.authorised_by))
- .["awaiting_delivery"] = list()
- .["awaiting_delivery_orders"] = 0
- for(var/key in SSpoints.shoppinglist[faction])
- var/datum/supply_order/SO = LAZYACCESSASSOC(SSpoints.shoppinglist, faction, key)
- .["awaiting_delivery_orders"]++
- var/list/packs = list()
- var/cost = 0
- for(var/P in SO.pack)
- var/datum/supply_packs/SP = P
- if(packs[SP.type])
- packs[SP.type] += 1
- else
- packs[SP.type] = 1
- cost += SP.cost
- .["awaiting_delivery"] += list(list("id" = SO.id, "orderer" = SO.orderer, "orderer_rank" = SO.orderer_rank, "reason" = SO.reason, "cost" = cost, "packs" = packs, "authed_by" = SO.authorised_by))
- .["export_history"] = list()
- var/id = 0
- var/lastexport = ""
- for(var/datum/export_report/report AS in SSpoints.export_history)
- if(report.faction != user.faction)
- continue
- if(report.points == 0)
- continue
- if(report.export_name == lastexport)
- .["export_history"][id]["amount"] += 1
- .["export_history"][id]["total"] += report.points
- else
- .["export_history"] += list(list("id" = id, "name" = report.export_name, "points" = report.points, "amount" = 1, total = report.points))
- id++
- lastexport = report.export_name
- .["shopping_history"] = list()
- for(var/datum/supply_order/SO AS in SSpoints.shopping_history)
- if(SO.faction != user.faction)
- continue
- var/list/packs = list()
- var/cost = 0
- for(var/P in SO.pack)
- var/datum/supply_packs/SP = P
- if(packs[SP.type])
- packs[SP.type] += 1
- else
- packs[SP.type] = 1
- cost += SP.cost
- .["shopping_history"] += list(list("id" = SO.id, "orderer" = SO.orderer, "orderer_rank" = SO.orderer_rank, "reason" = SO.reason, "cost" = cost, "packs" = packs, "authed_by" = SO.authorised_by))
- .["shopping_list_cost"] = 0
- .["shopping_list_items"] = 0
- .["shopping_list"] = list()
- for(var/i in SSpoints.shopping_cart)
- var/datum/supply_packs/SP = SSpoints.supply_packs[i]
- .["shopping_list_items"] += SSpoints.shopping_cart[i]
- .["shopping_list_cost"] += SP.cost * SSpoints.shopping_cart[SP.type]
- .["shopping_list"][SP.type] = list("count" = SSpoints.shopping_cart[SP.type])
- if(supply_shuttle)
- if(supply_shuttle?.mode == SHUTTLE_CALL)
- if(is_mainship_level(supply_shuttle.destination.z))
- .["elevator"] = "Raising"
- .["elevator_dir"] = "up"
- else
- .["elevator"] = "Lowering"
- .["elevator_dir"] = "down"
- else if(supply_shuttle?.mode == SHUTTLE_IDLE)
- if(is_mainship_level(supply_shuttle.z))
- .["elevator"] = "Raised"
- .["elevator_dir"] = "down"
- else
- .["elevator"] = "Lowered"
- .["elevator_dir"] = "up"
- else
- if(is_mainship_level(supply_shuttle.z))
- .["elevator"] = "Lowering"
- .["elevator_dir"] = "down"
- else
- .["elevator"] = "Raising"
- .["elevator_dir"] = "up"
- else
- .["elevator"] = "MISSING!"
- .["beacon"] = length(GLOB.supply_beacon) ? TRUE : FALSE
-
-/datum/supply_ui/proc/get_shopping_cart(mob/user)
- return SSpoints.shopping_cart
-
-/datum/supply_ui/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
- . = ..()
- if(.)
- return
- switch(action)
- if("cart")
- var/datum/supply_packs/P = SSpoints.supply_packs[text2path(params["id"])]
- if(!P)
- return
- var/shopping_cart = get_shopping_cart(ui.user)
- switch(params["mode"])
- if("removeall")
- shopping_cart -= P.type
- if("removeone")
- if(shopping_cart[P.type] > 1)
- shopping_cart[P.type]--
- else
- shopping_cart -= P.type
- if("addone")
- if(shopping_cart[P.type])
- shopping_cart[P.type]++
- else
- shopping_cart[P.type] = 1
- if("addall")
- var/mob/living/ui_user = ui.user
- var/cart_cost = 0
- for(var/i in shopping_cart)
- var/datum/supply_packs/SP = SSpoints.supply_packs[i]
- cart_cost += SP.cost * shopping_cart[SP.type]
- var/excess_points = SSpoints.supply_points[ui_user.faction] - cart_cost
- var/number_to_buy = min(round(excess_points / P.cost), 20) //hard cap at 20
- if(shopping_cart[P.type])
- shopping_cart[P.type] += number_to_buy
- else
- shopping_cart[P.type] = number_to_buy
- . = TRUE
- if("send")
- if(supply_shuttle.mode != SHUTTLE_IDLE)
- return
- if(is_mainship_level(supply_shuttle.z))
- if (!supply_shuttle.check_blacklist())
- to_chat(usr, "For safety reasons, the Automated Storage and Retrieval System cannot store live, friendlies, classified nuclear weaponry or homing beacons.")
- playsound(supply_shuttle.return_center_turf(), 'sound/machines/buzz-two.ogg', 50, 0)
- else
- playsound(supply_shuttle.return_center_turf(), 'sound/machines/elevator_move.ogg', 50, 0)
- SSshuttle.moveShuttleToTransit(shuttle_id, TRUE)
- addtimer(CALLBACK(supply_shuttle, TYPE_PROC_REF(/obj/docking_port/mobile/supply, sell)), 15 SECONDS)
- else
- var/obj/docking_port/D = SSshuttle.getDock(home_id)
- supply_shuttle.buy(usr, src)
- playsound(D.return_center_turf(), 'sound/machines/elevator_move.ogg', 50, 0)
- SSshuttle.moveShuttle(shuttle_id, home_id, TRUE)
- . = TRUE
- if("approve")
- var/datum/supply_order/O = SSpoints.requestlist["[params["id"]]"]
- if(!O)
- O = SSpoints.deniedrequests["[params["id"]]"]
- if(!O)
- return
- SSpoints.approve_request(O, ui.user)
- . = TRUE
- if("deny")
- var/datum/supply_order/O = SSpoints.requestlist["[params["id"]]"]
- if(!O)
- return
- SSpoints.deny_request(O)
- . = TRUE
- if("approveall")
- for(var/i in SSpoints.requestlist)
- var/datum/supply_order/O = SSpoints.requestlist[i]
- SSpoints.approve_request(O, ui.user)
- . = TRUE
- if("denyall")
- for(var/i in SSpoints.requestlist)
- var/datum/supply_order/O = SSpoints.requestlist[i]
- SSpoints.deny_request(O)
- . = TRUE
- if("buycart")
- SSpoints.buy_cart(ui.user)
- . = TRUE
- if("clearcart")
- var/list/shopping_cart = get_shopping_cart(ui.user)
- shopping_cart.Cut()
- . = TRUE
- if("buypersonal")
- SSpoints.buy_using_psp(ui.user)
- . = TRUE
- if("delivery")
- var/datum/supply_order/O = SSpoints.shoppinglist[faction]["[params["id"]]"]
- if(!O)
- return
- SSpoints.fast_delivery(O, ui.user)
- . = TRUE
-
-/datum/supply_ui/requests
- tgui_name = "CargoRequest"
-
-// yes these are copy pasted from above because SPEEEEEEEEEEEEED
-/datum/supply_ui/requests/ui_static_data(mob/user)
- . = list()
- .["categories"] = GLOB.all_supply_groups
- .["supplypacks"] = SSpoints.supply_packs_ui
- .["supplypackscontents"] = SSpoints.supply_packs_contents
-
-/datum/supply_ui/requests/ui_data(mob/living/user)
- . = list()
- .["currentpoints"] = round(SSpoints.supply_points[user.faction])
- .["personalpoints"] = round(SSpoints.personal_supply_points[user.ckey])
- .["requests"] = list()
- for(var/i in SSpoints.requestlist)
- var/datum/supply_order/SO = SSpoints.requestlist[i]
- if(SO.faction != user.faction)
- continue
- var/list/packs = list()
- var/cost = 0
- for(var/P in SO.pack)
- var/datum/supply_packs/SP = P
- if(packs[SP.type])
- packs[SP.type] += 1
- else
- packs[SP.type] = 1
- cost += SP.cost
- .["requests"] += list(list("id" = SO.id, "orderer" = SO.orderer, "orderer_rank" = SO.orderer_rank, "reason" = SO.reason, "cost" = cost, "packs" = packs, "authed_by" = SO.authorised_by))
- .["deniedrequests"] = list()
- for(var/i in length(SSpoints.deniedrequests) to 1 step -1)
- var/datum/supply_order/SO = SSpoints.deniedrequests[SSpoints.deniedrequests[i]]
- if(SO.faction != user.faction)
- continue
- var/list/packs = list()
- var/cost = 0
- for(var/P in SO.pack)
- var/datum/supply_packs/SP = P
- if(packs[SP.type])
- packs[SP.type] += 1
- else
- packs[SP.type] = 1
- cost += SP.cost
- .["deniedrequests"] += list(list("id" = SO.id, "orderer" = SO.orderer, "orderer_rank" = SO.orderer_rank, "reason" = SO.reason, "cost" = cost, "packs" = packs, "authed_by" = SO.authorised_by))
- .["approvedrequests"] = list()
- for(var/i in length(SSpoints.approvedrequests) to 1 step -1)
- var/datum/supply_order/SO = SSpoints.approvedrequests[SSpoints.approvedrequests[i]]
- if(SO.faction != user.faction)
- continue
- var/list/packs = list()
- var/cost = 0
- for(var/P in SO.pack)
- var/datum/supply_packs/SP = P
- if(packs[SP.type])
- packs[SP.type] += 1
- else
- packs[SP.type] = 1
- cost += SP.cost
- .["approvedrequests"] += list(list("id" = SO.id, "orderer" = SO.orderer, "orderer_rank" = SO.orderer_rank, "reason" = SO.reason, "cost" = cost, "packs" = packs, "authed_by" = SO.authorised_by))
- .["awaiting_delivery"] = list()
- .["awaiting_delivery_orders"] = 0
- for(var/key in SSpoints.shoppinglist[faction])
- //only own orders
- var/datum/supply_order/SO = LAZYACCESSASSOC(SSpoints.shoppinglist, faction, key)
- if(user.real_name == SO.orderer)
- .["awaiting_delivery_orders"]++
- var/list/packs = list()
- var/cost = 0
- for(var/P in SO.pack)
- var/datum/supply_packs/SP = P
- if(packs[SP.type])
- packs[SP.type] += 1
- else
- packs[SP.type] = 1
- cost += SP.cost
- .["awaiting_delivery"] += list(list("id" = SO.id, "orderer" = SO.orderer, "orderer_rank" = SO.orderer_rank, "reason" = SO.reason, "cost" = cost, "packs" = packs, "authed_by" = SO.authorised_by))
- if(!SSpoints.request_shopping_cart[user.ckey])
- SSpoints.request_shopping_cart[user.ckey] = list()
- .["shopping_list_cost"] = 0
- .["shopping_list_items"] = 0
- .["shopping_list"] = list()
- for(var/i in SSpoints.request_shopping_cart[user.ckey])
- var/datum/supply_packs/SP = SSpoints.supply_packs[i]
- .["shopping_list_items"] += SSpoints.request_shopping_cart[user.ckey][i]
- .["shopping_list_cost"] += SP.cost * SSpoints.request_shopping_cart[user.ckey][SP.type]
- .["shopping_list"][SP.type] = list("count" = SSpoints.request_shopping_cart[user.ckey][SP.type])
- .["beacon"] = length(GLOB.supply_beacon) ? TRUE : FALSE
-
-/datum/supply_ui/requests/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
- . = ..()
- if(.)
- return TRUE
- switch(action)
- if("submitrequest")
- SSpoints.submit_request(ui.user, params["reason"])
- . = TRUE
-
-/datum/supply_ui/requests/get_shopping_cart(mob/user)
- return SSpoints.request_shopping_cart[user.ckey]
-
-/obj/machinery/computer/ordercomp
- name = "Supply ordering console"
- icon = 'icons/obj/machines/computer.dmi'
- icon_state = "computer"
- screen_overlay = "request"
- broken_icon = "computer_orange_broken"
- circuit = /obj/item/circuitboard/computer/ordercomp
- var/datum/supply_ui/requests/SU
-
-/obj/machinery/computer/ordercomp/interact(mob/user)
- . = ..()
- if(.)
- return
- if(!allowed(user))
- return
- if(!SU)
- SU = new(src)
- return SU.interact(user)
-
-/obj/item/storage/backpack/marine/radiopack
- name = "\improper TGMC radio operator backpack"
- desc = "A backpack that resembles the ones old-age radio operator marines would use. It has a supply ordering console installed on it, and a retractable antenna to receive supply drops."
- icon_state = "radiopack"
- item_state = "radiopack"
- ///Var for the window pop-up
- var/datum/supply_ui/requests/supply_interface
- /// Reference to the datum used by the supply drop console
- var/datum/supply_beacon/beacon_datum
-
-/obj/item/storage/backpack/marine/radiopack/Destroy()
- if(beacon_datum)
- UnregisterSignal(beacon_datum, COMSIG_QDELETING)
- QDEL_NULL(beacon_datum)
- return ..()
-
-/obj/item/storage/backpack/marine/radiopack/examine(mob/user)
- . = ..()
- . += span_notice("Right-Click with empty hand to open requisitions interface.")
- . += span_notice("Activate in hand to create a supply beacon signal.")
-
-/obj/item/storage/backpack/marine/radiopack/attack_hand_alternate(mob/living/user)
- if(!allowed(user))
- return ..()
- if(!supply_interface)
- supply_interface = new(src)
- return supply_interface.interact(user)
-
-/obj/item/storage/backpack/marine/radiopack/attack_self(mob/living/user)
- if(beacon_datum)
- UnregisterSignal(beacon_datum, COMSIG_QDELETING)
- QDEL_NULL(beacon_datum)
- user.show_message(span_warning("The [src] beeps and states, \"Your last position is no longer accessible by the supply console"), EMOTE_AUDIBLE, span_notice("The [src] vibrates but you can not hear it!"))
- return
- if(!is_ground_level(user.z))
- to_chat(user, span_warning("You have to be on the planet to use this or it won't transmit."))
- return FALSE
- var/turf/location = get_turf(src)
- beacon_datum = new /datum/supply_beacon(user.name, user.loc, user.faction, 4 MINUTES)
- RegisterSignal(beacon_datum, COMSIG_QDELETING, PROC_REF(clean_beacon_datum))
- user.show_message(span_notice("The [src] beeps and states, \"Your current coordinates were registered by the supply console. LONGITUDE [location.x]. LATITUDE [location.y]. Area ID: [get_area(src)]\""), EMOTE_AUDIBLE, span_notice("The [src] vibrates but you can not hear it!"))
- addtimer(CALLBACK(src, PROC_REF(update_beacon_location)), 5 SECONDS)
-
-/obj/item/storage/backpack/marine/radiopack/proc/update_beacon_location()
- if(beacon_datum)
- beacon_datum.drop_location = get_turf(src)
- addtimer(CALLBACK(src, PROC_REF(update_beacon_location), beacon_datum), 5 SECONDS)
-
-/// Signal handler to nullify beacon datum
-/obj/item/storage/backpack/marine/radiopack/proc/clean_beacon_datum()
- SIGNAL_HANDLER
- beacon_datum = null
-
-/obj/docking_port/mobile/supply/vehicle
- railing_gear_name = "vehicle"
- id = SHUTTLE_VEHICLE_SUPPLY
- home_id = "vehicle_home"
-
-/obj/docking_port/mobile/supply/vehicle/buy(mob/user, datum/supply_ui/supply_ui)
- var/datum/supply_ui/vehicles/veh_ui = supply_ui
- if(!veh_ui || !veh_ui.current_veh_type)
- return
- var/obj/vehicle/sealed/armored/tanktype = veh_ui.current_veh_type
- var/is_assault = initial(tanktype.flags_armored) & ARMORED_PURCHASABLE_ASSAULT
- if(GLOB.purchased_tanks[user.faction]?["[is_assault]"])
- to_chat(usr, span_danger("A vehicle of this type has already been purchased!"))
- return
- if(!GLOB.purchased_tanks[user.faction])
- GLOB.purchased_tanks[user.faction] = list()
- GLOB.purchased_tanks[user.faction]["[is_assault]"] += 1
- var/obj/vehicle/sealed/armored/tank = new tanktype(loc)
- if(veh_ui.current_primary)
- var/obj/item/armored_weapon/gun = new veh_ui.current_primary(loc)
- gun.attach(tank, TRUE)
- if(veh_ui.current_secondary)
- var/obj/item/armored_weapon/gun = new veh_ui.current_secondary(loc)
- gun.attach(tank, FALSE)
- if(veh_ui.current_driver_mod)
- var/obj/item/tank_module/mod = new veh_ui.current_driver_mod(loc)
- mod.on_equip(tank)
- if(veh_ui.current_gunner_mod)
- var/obj/item/tank_module/mod = new veh_ui.current_gunner_mod(loc)
- mod.on_equip(tank)
- if(length(veh_ui.primary_ammo))
- var/turf/dumploc = get_step(get_step(loc, NORTH), NORTH) // todo should autoload depending on tank prolly
- for(var/ammo in veh_ui.primary_ammo)
- for(var/i=1 to veh_ui.primary_ammo[ammo])
- new ammo(dumploc)
- if(length(veh_ui.secondary_ammo))
- var/turf/dumploc = get_step(get_step(loc, NORTH), NORTH) // todo should autoload depending on tank prolly
- for(var/ammo in veh_ui.secondary_ammo)
- for(var/i=1 to veh_ui.secondary_ammo[ammo])
- new ammo(dumploc)
-
-/obj/docking_port/stationary/supply/vehicle
- id = "vehicle_home"
- roundstart_template = /datum/map_template/shuttle/supply/vehicle
-
-
-
-GLOBAL_LIST_EMPTY(armored_gunammo)
-GLOBAL_LIST_EMPTY(armored_modtypes)
-GLOBAL_LIST_INIT(armored_guntypes, armored_init_guntypes())
-GLOBAL_LIST_EMPTY(purchased_tanks)
-#define DEFAULT_MAX_ARMORED_AMMO 20
-
-///im a lazy bum who cant use initial on lists, so we just load everything into a list
-/proc/armored_init_guntypes()
- . = list()
- for(var/obj/vehicle/sealed/armored/vehtype AS in typesof(/obj/vehicle/sealed/armored))
- vehtype = new vehtype
- GLOB.armored_modtypes[vehtype.type] = vehtype.permitted_mods
- .[vehtype.type] = vehtype.permitted_weapons
- qdel(vehtype)
- for(var/obj/item/armored_weapon/gun AS in typesof(/obj/item/armored_weapon))
- gun = new gun
- GLOB.armored_gunammo[gun.type] = gun.accepted_ammo
- qdel(gun)
-
-/datum/supply_ui/vehicles
- tgui_name = "VehicleSupply"
- shuttle_id = SHUTTLE_VEHICLE_SUPPLY
- home_id = "vehicle_home"
- /// current selected vehicles typepath
- var/current_veh_type
- /// current selected primary weapons typepath
- var/current_primary
- /// current selected secondaryies typepath
- var/current_secondary
- /// current driver mod typepath
- var/current_driver_mod
- /// current gunner mod typepath
- var/current_gunner_mod
- /// current primary ammo list, type = count
- var/list/primary_ammo = list()
- /// current secondary ammo list, type = count
- var/list/secondary_ammo = list()
-
-/datum/supply_ui/vehicles/ui_static_data(mob/user)
- var/list/data = list()
- for(var/obj/vehicle/sealed/armored/vehtype AS in typesof(/obj/vehicle/sealed/armored))
- var/flags = vehtype::flags_armored
-
- if(flags & ARMORED_PURCHASABLE_TRANSPORT)
- if(user.skills.getRating(SKILL_LARGE_VEHICLE) < SKILL_LARGE_VEHICLE_EXPERIENCED)
- continue
- else if(flags & ARMORED_PURCHASABLE_ASSAULT)
- if(user.skills.getRating(SKILL_LARGE_VEHICLE) < SKILL_LARGE_VEHICLE_VETERAN)
- continue
- else
- continue
-
- data["vehicles"] += list(list("name" = initial(vehtype.name), "desc" = initial(vehtype.desc), "type" = "[vehtype]", "isselected" = (vehtype == current_veh_type)))
- if(vehtype != current_veh_type)
- continue
- for(var/obj/item/armored_weapon/gun AS in GLOB.armored_guntypes[vehtype])
- var/primary_selected = (current_primary == gun)
- var/secondary_selected = (current_secondary == gun)
- if(initial(gun.weapon_slot) & MODULE_PRIMARY)
- data["primaryWeapons"] += list(list(
- "name" = initial(gun.name),
- "desc" = initial(gun.desc),
- "type" = gun,
- "isselected" = primary_selected,
- ))
- if(primary_selected)
- for(var/obj/item/ammo_magazine/mag AS in primary_ammo)
- data["primaryammotypes"] += list(list(
- "name" = initial(mag.name),
- "type" = mag,
- "current" = primary_ammo[mag],
- "max" = DEFAULT_MAX_ARMORED_AMMO, //TODO make vehicle ammo dynamic instead of fixed number
- ))
-
- if(initial(gun.weapon_slot) & MODULE_SECONDARY)
- data["secondaryWeapons"] += list(list(
- "name" = initial(gun.name),
- "desc" = initial(gun.desc),
- "type" = gun,
- "isselected" = secondary_selected,
- ))
- if(secondary_selected)
- for(var/obj/item/ammo_magazine/mag AS in secondary_ammo)
- data["secondarymmotypes"] += list(list(
- "name" = initial(mag.name),
- "type" = mag,
- "current" = secondary_ammo[mag],
- "max" = DEFAULT_MAX_ARMORED_AMMO, //TODO make vehicle ammo dynamic instead of fixed number
- ))
-
- for(var/obj/item/tank_module/mod AS in GLOB.armored_modtypes[vehtype])
- if(initial(mod.is_driver_module))
- data["driverModules"] += list(list(
- "name" = initial(mod.name),
- "desc" = initial(mod.desc),
- "type" = mod,
- "isselected" = (current_driver_mod == mod),
- ))
- else
- data["gunnerModules"] += list(list(
- "name" = initial(mod.name),
- "desc" = initial(mod.desc),
- "type" = mod,
- "isselected" = (current_gunner_mod == mod),
- ))
- return data
-
-/datum/supply_ui/vehicles/ui_data(mob/living/user)
- var/list/data = list()
- if(supply_shuttle)
- if(supply_shuttle?.mode == SHUTTLE_CALL)
- if(is_mainship_level(supply_shuttle.destination.z))
- data["elevator"] = "Raising"
- data["elevator_dir"] = "up"
- else
- data["elevator"] = "Lowering"
- data["elevator_dir"] = "down"
- else if(supply_shuttle?.mode == SHUTTLE_IDLE)
- if(is_mainship_level(supply_shuttle.z))
- data["elevator"] = "Raised"
- data["elevator_dir"] = "down"
- else if(current_veh_type)
- data["elevator"] = "Purchase"
- data["elevator_dir"] = "store"
- else
- data["elevator"] = "Lowered"
- data["elevator_dir"] = "up"
- else
- if(is_mainship_level(supply_shuttle.z))
- data["elevator"] = "Lowering"
- data["elevator_dir"] = "down"
- else
- data["elevator"] = "Raising"
- data["elevator_dir"] = "up"
- else
- data["elevator"] = "MISSING!"
- return data
-
-/datum/supply_ui/vehicles/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
- . = ..()
- if(.)
- return
-
- switch(action)
- if("setvehicle")
- var/newtype = text2path(params["type"])
- if(!ispath(newtype, /obj/vehicle/sealed/armored))
- return
- var/obj/vehicle/sealed/armored/tank_type = newtype
- var/is_assault = initial(tank_type.flags_armored) & ARMORED_PURCHASABLE_ASSAULT
- if(GLOB.purchased_tanks[usr.faction]?["[is_assault]"])
- to_chat(usr, span_danger("A vehicle of this type has already been purchased!"))
- return
- current_veh_type = newtype
- current_primary = null // set everything to null, to avoid bugs
- current_secondary = null
- current_driver_mod = null
- current_gunner_mod = null
- primary_ammo = list()
- secondary_ammo = list()
- . = TRUE
-
- if("setprimary")
- if(!current_veh_type)
- return
- var/newtype = text2path(params["type"])
- if(!(newtype in GLOB.armored_guntypes[current_veh_type]))
- return
- current_primary = newtype
- var/list/assoc_cast = GLOB.armored_gunammo[newtype]
- primary_ammo = assoc_cast.Copy()
- for(var/ammo in primary_ammo)
- primary_ammo[ammo] = 0
- . = TRUE
-
- if("setsecondary")
- if(!current_veh_type)
- return
- var/newtype = text2path(params["type"])
- if(!(newtype in GLOB.armored_guntypes[current_veh_type]))
- return
- current_secondary = newtype
- var/list/assoc_cast = GLOB.armored_gunammo[newtype]
- secondary_ammo = assoc_cast.Copy()
- for(var/ammo in secondary_ammo)
- secondary_ammo[ammo] = 0
- . = TRUE
-
- if("set_ammo_primary")
- if(!current_primary)
- return
- var/newtype = text2path(params["type"])
- if(!(newtype in primary_ammo))
- return
- var/non_adjusted_total = 0
- for(var/ammo in primary_ammo)
- if(ammo == newtype)
- continue
- non_adjusted_total += primary_ammo[ammo]
- var/newvalue = clamp(params["new_value"], 0, DEFAULT_MAX_ARMORED_AMMO-non_adjusted_total)
- primary_ammo[newtype] = newvalue
- . = TRUE
-
- if("set_ammo_secondary")
- if(!current_secondary)
- return
- var/newtype = text2path(params["type"])
- if(!(newtype in secondary_ammo))
- return
- var/non_adjusted_total = 0
- for(var/ammo in secondary_ammo)
- if(ammo == newtype)
- continue
- non_adjusted_total += secondary_ammo[ammo]
- var/newvalue = clamp(params["new_value"], 0, DEFAULT_MAX_ARMORED_AMMO-non_adjusted_total)
- secondary_ammo[newtype] = newvalue
- . = TRUE
-
- if("set_driver_mod")
- if(!current_veh_type)
- return
- var/newtype = text2path(params["type"])
- if(!ispath(newtype, /obj/item/tank_module))
- return
- if(!(newtype in GLOB.armored_modtypes[current_veh_type]))
- return
- current_driver_mod = newtype
- . = TRUE
-
- if("set_gunner_mod")
- if(!current_veh_type)
- return
- var/newtype = text2path(params["type"])
- if(!ispath(newtype, /obj/item/tank_module))
- return
- if(!(newtype in GLOB.armored_modtypes[current_veh_type]))
- return
- current_gunner_mod = newtype
- . = TRUE
-
- if("deploy")
- if(supply_shuttle.mode != SHUTTLE_IDLE)
- to_chat(usr, span_danger("Elevator moving!"))
- return
- if(is_mainship_level(supply_shuttle.z))
- to_chat(usr, span_danger("Elevator raised. Lower to deploy vehicle."))
- return
- supply_shuttle.buy(usr, src)
- ui_act("send", params, ui, state)
- SStgui.close_user_uis(usr, src)
- current_veh_type = null
- current_primary = null
- current_secondary = null
- current_driver_mod = null
- current_gunner_mod = null
- primary_ammo = list()
- secondary_ammo = list()
- update_static_data(usr)
-
- if(.)
- update_static_data(usr)
diff --git a/code/modules/reqs/computer.dm b/code/modules/reqs/computer.dm
new file mode 100644
index 00000000000..7adbdd8b4d2
--- /dev/null
+++ b/code/modules/reqs/computer.dm
@@ -0,0 +1,47 @@
+/obj/machinery/computer/supplycomp
+ name = "ASRS console"
+ desc = "A console for an Automated Storage and Retrieval System"
+ icon = 'icons/obj/machines/computer.dmi'
+ icon_state = "computer"
+ screen_overlay = "supply"
+ req_access = list(ACCESS_MARINE_CARGO)
+ circuit = /obj/item/circuitboard/computer/supplycomp
+ var/datum/supply_ui/supply_ui
+ ///Id of the shuttle controlled
+ var/shuttle_id = SHUTTLE_SUPPLY
+ /// Id of the home docking port
+ var/home_id = "supply_home"
+ /// Faction of the computer
+ var/faction = FACTION_TERRAGOV
+
+/obj/machinery/computer/supplycomp/interact(mob/user)
+ . = ..()
+ if(.)
+ return
+ if(isliving(user) && !allowed(user))
+ return
+ if(!supply_ui)
+ supply_ui = new(src)
+ supply_ui.shuttle_id = shuttle_id
+ supply_ui.home_id = home_id
+ supply_ui.faction = faction
+ return supply_ui.interact(user)
+
+/obj/machinery/computer/ordercomp
+ name = "Supply ordering console"
+ icon = 'icons/obj/machines/computer.dmi'
+ icon_state = "computer"
+ screen_overlay = "request"
+ broken_icon = "computer_orange_broken"
+ circuit = /obj/item/circuitboard/computer/ordercomp
+ var/datum/supply_ui/requests/supply_ui
+
+/obj/machinery/computer/ordercomp/interact(mob/user)
+ . = ..()
+ if(.)
+ return
+ if(!allowed(user))
+ return
+ if(!supply_ui)
+ supply_ui = new(src)
+ return supply_ui.interact(user)
diff --git a/code/modules/reqs/elevator.dm b/code/modules/reqs/elevator.dm
new file mode 100644
index 00000000000..53362324d42
--- /dev/null
+++ b/code/modules/reqs/elevator.dm
@@ -0,0 +1,227 @@
+GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
+ /mob/living,
+ /obj/item/disk/nuclear,
+ /obj/item/radio/beacon,
+ /obj/vehicle,
+)))
+
+/obj/docking_port/stationary/supply
+ id = "supply_home"
+ roundstart_template = /datum/map_template/shuttle/supply
+ width = 5
+ dwidth = 2
+ dheight = 2
+ height = 5
+
+/obj/docking_port/mobile/supply
+ name = "supply shuttle"
+ id = SHUTTLE_SUPPLY
+ callTime = 15 SECONDS
+
+ dir = WEST
+ port_direction = EAST
+ width = 5
+ dwidth = 2
+ dheight = 2
+ height = 5
+ movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
+ use_ripples = FALSE
+ var/list/gears = list()
+ var/list/obj/machinery/door/poddoor/railing/railings = list()
+ ///The faction of this docking port (aka, on which ship it is located)
+ var/faction = FACTION_TERRAGOV
+ /// Id of the home docking port
+ var/home_id = "supply_home"
+ ///prefix for railings and gear todo should probbaly be defines instead?
+ var/railing_gear_name = "supply"
+
+/obj/docking_port/mobile/supply/Destroy(force)
+ for(var/i in railings)
+ var/obj/machinery/door/poddoor/railing/railing = i
+ railing.linked_pad = null
+ railings.Cut()
+ return ..()
+
+/obj/docking_port/mobile/supply/afterShuttleMove()
+ . = ..()
+ if(getDockedId() != home_id)
+ return
+ for(var/j in railings)
+ var/obj/machinery/door/poddoor/railing/our_railing = j
+ our_railing.open()
+
+/obj/docking_port/mobile/supply/on_ignition()
+ if(getDockedId() == home_id)
+ for(var/j in railings)
+ var/obj/machinery/door/poddoor/railing/our_railing = j
+ our_railing.close()
+ for(var/i in gears)
+ var/obj/machinery/gear/our_gear = i
+ our_gear.start_moving(NORTH)
+ else
+ for(var/i in gears)
+ var/obj/machinery/gear/our_gear = i
+ our_gear.start_moving(SOUTH)
+
+/obj/docking_port/mobile/supply/register()
+ . = ..()
+ for(var/obj/machinery/gear/our_gear in GLOB.machines)
+ if(our_gear.id != (railing_gear_name + "_elevator_gear"))
+ continue
+ gears += our_gear
+ RegisterSignal(our_gear, COMSIG_QDELETING, PROC_REF(clean_gear))
+ for(var/obj/machinery/door/poddoor/railing/our_railing in GLOB.machines)
+ if(our_railing.id != (railing_gear_name + "_elevator_railing"))
+ continue
+ railings += our_railing
+ RegisterSignal(our_railing, COMSIG_QDELETING, PROC_REF(clean_railing))
+ our_railing.linked_pad = src
+ our_railing.open()
+
+///Signal handler when a gear is destroyed
+/obj/docking_port/mobile/supply/proc/clean_gear(datum/source)
+ SIGNAL_HANDLER
+ gears -= source
+
+///Signal handler when a railing is destroyed
+/obj/docking_port/mobile/supply/proc/clean_railing(datum/source)
+ SIGNAL_HANDLER
+ railings -= source
+
+/obj/docking_port/mobile/supply/canMove()
+ if(is_station_level(z))
+ return check_blacklist(shuttle_areas)
+ return ..()
+
+/obj/docking_port/mobile/supply/proc/check_blacklist(areaInstances)
+ if(!areaInstances)
+ areaInstances = shuttle_areas
+ for(var/place in areaInstances)
+ var/area/shuttle/shuttle_area = place
+ for(var/trf in shuttle_area)
+ var/turf/T = trf
+ for(var/a in T.GetAllContents())
+ if(isxeno(a))
+ var/mob/living/L = a
+ if(L.stat == DEAD)
+ continue
+ if(ishuman(a))
+ var/mob/living/carbon/human/human_to_sell = a
+ if(human_to_sell.stat == DEAD && can_sell_human_body(human_to_sell, faction))
+ continue
+ if(is_type_in_typecache(a, GLOB.blacklisted_cargo_types))
+ return FALSE
+ return TRUE
+
+/obj/docking_port/mobile/supply/request(obj/docking_port/stationary/S)
+ if(mode != SHUTTLE_IDLE)
+ return 2
+ return ..()
+
+/obj/docking_port/mobile/supply/proc/buy(mob/user, datum/supply_ui/supply_ui)
+ if(!length(SSpoints.shoppinglist[faction]))
+ return
+ log_game("Supply pack orders have been purchased by [key_name(user)]")
+
+ var/list/empty_turfs = list()
+ for(var/place in shuttle_areas)
+ var/area/shuttle/shuttle_area = place
+ for(var/turf/open/floor/T in shuttle_area)
+ if(is_blocked_turf(T))
+ continue
+ empty_turfs += T
+
+ for(var/i in SSpoints.shoppinglist[faction])
+ if(!length(empty_turfs))
+ break
+ var/datum/supply_order/our_order = LAZYACCESSASSOC(SSpoints.shoppinglist, faction, i)
+
+ var/datum/supply_packs/firstpack = our_order.pack[1]
+
+ var/obj/structure/crate_type = firstpack.containertype || firstpack.contains[1]
+
+ var/obj/structure/our_structure = new crate_type(pick_n_take(empty_turfs))
+ if(firstpack.containertype)
+ our_structure.name = "Order #[our_order.id] for [our_order.orderer]"
+
+ var/list/contains = list()
+ //spawn the stuff, finish generating the manifest while you're at it
+ for(var/P in our_order.pack)
+ var/datum/supply_packs/our_pack = P
+ // yes i know
+ if(our_pack.access)
+ our_structure.req_access = list()
+ our_structure.req_access += text2num(our_pack.access)
+
+ if(our_pack.randomised_num_contained)
+ if(length(our_pack.contains))
+ for(var/j in 1 to our_pack.randomised_num_contained)
+ contains += pick(our_pack.contains)
+ else
+ contains += our_pack.contains
+
+ for(var/typepath in contains)
+ if(!typepath)
+ continue
+ if(!firstpack.containertype)
+ break
+ new typepath(our_structure)
+
+ SSpoints.shoppinglist[faction] -= "[our_order.id]"
+ SSpoints.shopping_history += our_order
+
+/obj/docking_port/mobile/supply/proc/sell()
+ for(var/place in shuttle_areas)
+ var/area/shuttle/shuttle_area = place
+ for(var/atom/movable/AM in shuttle_area)
+ if(AM.anchored)
+ continue
+ var/datum/export_report = AM.supply_export(faction)
+ if(export_report)
+ SSpoints.export_history += export_report
+ qdel(AM)
+
+/obj/docking_port/mobile/supply/vehicle
+ railing_gear_name = "vehicle"
+ id = SHUTTLE_VEHICLE_SUPPLY
+ home_id = "vehicle_home"
+
+/obj/docking_port/mobile/supply/vehicle/buy(mob/user, datum/supply_ui/supply_ui)
+ var/datum/supply_ui/vehicles/veh_ui = supply_ui
+ if(!veh_ui || !veh_ui.current_veh_type)
+ return
+ var/obj/vehicle/sealed/armored/tanktype = veh_ui.current_veh_type
+ var/is_assault = initial(tanktype.flags_armored) & ARMORED_PURCHASABLE_ASSAULT
+ if(GLOB.purchased_tanks[user.faction]?["[is_assault]"])
+ to_chat(usr, span_danger("A vehicle of this type has already been purchased!"))
+ return
+ if(!GLOB.purchased_tanks[user.faction])
+ GLOB.purchased_tanks[user.faction] = list()
+ GLOB.purchased_tanks[user.faction]["[is_assault]"] += 1
+ var/obj/vehicle/sealed/armored/tank = new tanktype(loc)
+ if(veh_ui.current_primary)
+ var/obj/item/armored_weapon/gun = new veh_ui.current_primary(loc)
+ gun.attach(tank, TRUE)
+ if(veh_ui.current_secondary)
+ var/obj/item/armored_weapon/gun = new veh_ui.current_secondary(loc)
+ gun.attach(tank, FALSE)
+ if(veh_ui.current_driver_mod)
+ var/obj/item/tank_module/mod = new veh_ui.current_driver_mod(loc)
+ mod.on_equip(tank)
+ if(veh_ui.current_gunner_mod)
+ var/obj/item/tank_module/mod = new veh_ui.current_gunner_mod(loc)
+ mod.on_equip(tank)
+ if(length(veh_ui.primary_ammo))
+ var/turf/dumploc = get_step(get_step(loc, NORTH), NORTH) // todo should autoload depending on tank prolly
+ for(var/ammo in veh_ui.primary_ammo)
+ for(var/i=1 to veh_ui.primary_ammo[ammo])
+ new ammo(dumploc)
+ if(length(veh_ui.secondary_ammo))
+ var/turf/dumploc = get_step(get_step(loc, NORTH), NORTH) // todo should autoload depending on tank prolly
+ for(var/ammo in veh_ui.secondary_ammo)
+ for(var/i=1 to veh_ui.secondary_ammo[ammo])
+ new ammo(dumploc)
+
+/obj/docking_port/stationary/supply/vehicle
+ id = "vehicle_home"
+ roundstart_template = /datum/map_template/shuttle/supply/vehicle
diff --git a/code/modules/reqs/_supplypacks.dm b/code/modules/reqs/supplypacks/_supplypacks.dm
similarity index 100%
rename from code/modules/reqs/_supplypacks.dm
rename to code/modules/reqs/supplypacks/_supplypacks.dm
diff --git a/code/modules/reqs/armor.dm b/code/modules/reqs/supplypacks/armor.dm
similarity index 99%
rename from code/modules/reqs/armor.dm
rename to code/modules/reqs/supplypacks/armor.dm
index 0c44b1efb7f..6df2f7c5286 100644
--- a/code/modules/reqs/armor.dm
+++ b/code/modules/reqs/supplypacks/armor.dm
@@ -86,7 +86,7 @@
/obj/item/armor_module/module/mimir_environment_protection/mimir_helmet,
/obj/item/armor_module/module/mimir_environment_protection,
)
- cost = 120
+ cost = 160
/datum/supply_packs/armor/modular/attachments/artemis_mark_two
name = "Freyr Mark 2 helmet module"
diff --git a/code/modules/reqs/clothing.dm b/code/modules/reqs/supplypacks/clothing.dm
similarity index 100%
rename from code/modules/reqs/clothing.dm
rename to code/modules/reqs/supplypacks/clothing.dm
diff --git a/code/modules/reqs/engineering.dm b/code/modules/reqs/supplypacks/engineering.dm
similarity index 100%
rename from code/modules/reqs/engineering.dm
rename to code/modules/reqs/supplypacks/engineering.dm
diff --git a/code/modules/reqs/explosives.dm b/code/modules/reqs/supplypacks/explosives.dm
similarity index 100%
rename from code/modules/reqs/explosives.dm
rename to code/modules/reqs/supplypacks/explosives.dm
diff --git a/code/modules/reqs/factory.dm b/code/modules/reqs/supplypacks/factory.dm
similarity index 100%
rename from code/modules/reqs/factory.dm
rename to code/modules/reqs/supplypacks/factory.dm
diff --git a/code/modules/reqs/imports.dm b/code/modules/reqs/supplypacks/imports.dm
similarity index 100%
rename from code/modules/reqs/imports.dm
rename to code/modules/reqs/supplypacks/imports.dm
diff --git a/code/modules/reqs/launchers.dm b/code/modules/reqs/supplypacks/launchers.dm
similarity index 100%
rename from code/modules/reqs/launchers.dm
rename to code/modules/reqs/supplypacks/launchers.dm
diff --git a/code/modules/reqs/medical.dm b/code/modules/reqs/supplypacks/medical.dm
similarity index 100%
rename from code/modules/reqs/medical.dm
rename to code/modules/reqs/supplypacks/medical.dm
diff --git a/code/modules/reqs/operations.dm b/code/modules/reqs/supplypacks/operations.dm
similarity index 100%
rename from code/modules/reqs/operations.dm
rename to code/modules/reqs/supplypacks/operations.dm
diff --git a/code/modules/reqs/smartguns.dm b/code/modules/reqs/supplypacks/smartguns.dm
similarity index 100%
rename from code/modules/reqs/smartguns.dm
rename to code/modules/reqs/supplypacks/smartguns.dm
diff --git a/code/modules/reqs/stationary.dm b/code/modules/reqs/supplypacks/stationary.dm
similarity index 100%
rename from code/modules/reqs/stationary.dm
rename to code/modules/reqs/supplypacks/stationary.dm
diff --git a/code/modules/reqs/supplies.dm b/code/modules/reqs/supplypacks/supplies.dm
similarity index 100%
rename from code/modules/reqs/supplies.dm
rename to code/modules/reqs/supplypacks/supplies.dm
diff --git a/code/modules/reqs/vehicles.dm b/code/modules/reqs/supplypacks/vehicles.dm
similarity index 100%
rename from code/modules/reqs/vehicles.dm
rename to code/modules/reqs/supplypacks/vehicles.dm
diff --git a/code/modules/reqs/weapons.dm b/code/modules/reqs/supplypacks/weapons.dm
similarity index 100%
rename from code/modules/reqs/weapons.dm
rename to code/modules/reqs/supplypacks/weapons.dm
diff --git a/code/modules/reqs/tablet.dm b/code/modules/reqs/tablet.dm
new file mode 100644
index 00000000000..373413c7edc
--- /dev/null
+++ b/code/modules/reqs/tablet.dm
@@ -0,0 +1,28 @@
+/obj/item/supplytablet
+ name = "ASRS tablet"
+ desc = "A tablet for an Automated Storage and Retrieval System"
+ icon = 'icons/Marine/marine-navigation.dmi'
+ icon_state = "req_tablet_off"
+ req_access = list(ACCESS_MARINE_CARGO)
+ flags_equip_slot = ITEM_SLOT_POCKET
+ w_class = WEIGHT_CLASS_NORMAL
+ var/datum/supply_ui/supply_ui
+ ///Id of the shuttle controlled
+ var/shuttle_id = SHUTTLE_SUPPLY
+ /// Id of the home docking port
+ var/home_id = "supply_home"
+ /// Faction of the tablet
+ var/faction = FACTION_TERRAGOV
+
+/obj/item/supplytablet/interact(mob/user)
+ . = ..()
+ if(.)
+ return
+ if(!allowed(user))
+ return
+ if(!supply_ui)
+ supply_ui = new(src)
+ supply_ui.shuttle_id = shuttle_id
+ supply_ui.home_id = home_id
+ supply_ui.faction = faction
+ return supply_ui.interact(user)
diff --git a/code/modules/reqs/ui/_ui.dm b/code/modules/reqs/ui/_ui.dm
new file mode 100644
index 00000000000..495ddbdf9f3
--- /dev/null
+++ b/code/modules/reqs/ui/_ui.dm
@@ -0,0 +1,316 @@
+/datum/supply_ui
+ interaction_flags = INTERACT_MACHINE_TGUI
+ var/atom/source_object
+ var/tgui_name = "Cargo"
+ ///Id of the shuttle controlled
+ var/shuttle_id = ""
+ ///Reference to the supply shuttle
+ var/obj/docking_port/mobile/supply/supply_shuttle
+ ///Faction of the supply console linked
+ var/faction = FACTION_TERRAGOV
+ ///Id of the home port
+ var/home_id = ""
+
+/datum/supply_ui/New(atom/source_object)
+ . = ..()
+ src.source_object = source_object
+ RegisterSignal(source_object, COMSIG_QDELETING, PROC_REF(clean_ui))
+
+///Signal handler to delete the ui when the source object is deleting
+/datum/supply_ui/proc/clean_ui()
+ SIGNAL_HANDLER
+ qdel(src)
+
+/datum/supply_ui/Destroy(force)
+ source_object = null
+ return ..()
+
+/datum/supply_ui/ui_host()
+ return source_object
+
+/datum/supply_ui/can_interact(mob/user)
+ . = ..()
+ if(!.)
+ return FALSE
+ if(!user.CanReach(source_object))
+ return FALSE
+ return TRUE
+
+/datum/supply_ui/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+
+ if(ui)
+ return
+ if(shuttle_id)
+ supply_shuttle = SSshuttle.getShuttle(shuttle_id)
+ supply_shuttle.home_id = home_id
+ supply_shuttle.faction = faction
+ ui = new(user, src, tgui_name, source_object.name)
+ ui.open()
+
+/datum/supply_ui/ui_static_data(mob/user)
+ . = list()
+ .["categories"] = GLOB.all_supply_groups
+ .["supplypacks"] = SSpoints.supply_packs_ui
+ .["supplypackscontents"] = SSpoints.supply_packs_contents
+ .["elevator_size"] = supply_shuttle?.return_number_of_turfs()
+
+/datum/supply_ui/ui_data(mob/living/user)
+ . = list()
+ .["currentpoints"] = round(SSpoints.supply_points[user.faction])
+ .["personalpoints"] = round(SSpoints.personal_supply_points[user.ckey])
+ .["requests"] = list()
+ for(var/key in SSpoints.requestlist)
+ var/datum/supply_order/our_order = SSpoints.requestlist[key]
+ if(our_order.faction != user.faction)
+ continue
+ var/list/packs = list()
+ var/cost = 0
+ for(var/P in our_order.pack)
+ var/datum/supply_packs/our_pack = P
+ if(packs[our_pack.type])
+ packs[our_pack.type] += 1
+ else
+ packs[our_pack.type] = 1
+ cost += our_pack.cost
+ .["requests"] += list(list("id" = our_order.id, "orderer" = our_order.orderer, "orderer_rank" = our_order.orderer_rank, "reason" = our_order.reason, "cost" = cost, "packs" = packs, "authed_by" = our_order.authorised_by))
+ .["deniedrequests"] = list()
+ for(var/i in length(SSpoints.deniedrequests) to 1 step -1)
+ var/datum/supply_order/our_order = SSpoints.deniedrequests[SSpoints.deniedrequests[i]]
+ if(our_order.faction != user.faction)
+ continue
+ var/list/packs = list()
+ var/cost = 0
+ for(var/P in our_order.pack)
+ var/datum/supply_packs/our_pack = P
+ if(packs[our_pack.type])
+ packs[our_pack.type] += 1
+ else
+ packs[our_pack.type] = 1
+ cost += our_pack.cost
+ .["deniedrequests"] += list(list(
+ "id" = our_order.id,
+ "orderer" = our_order.orderer,
+ "orderer_rank" = our_order.orderer_rank,
+ "reason" = our_order.reason,
+ "cost" = cost, "packs" = packs,
+ "authed_by" = our_order.authorised_by
+ ))
+ .["approvedrequests"] = list()
+ for(var/i in length(SSpoints.approvedrequests) to 1 step -1)
+ var/datum/supply_order/our_order = SSpoints.approvedrequests[SSpoints.approvedrequests[i]]
+ if(our_order.faction != user.faction)
+ continue
+ var/list/packs = list()
+ var/cost = 0
+ for(var/P in our_order.pack)
+ var/datum/supply_packs/our_pack = P
+ if(packs[our_pack.type])
+ packs[our_pack.type] += 1
+ else
+ packs[our_pack.type] = 1
+ cost += our_pack.cost
+ .["approvedrequests"] += list(list(
+ "id" = our_order.id,
+ "orderer" = our_order.orderer,
+ "orderer_rank" = our_order.orderer_rank,
+ "reason" = our_order.reason,
+ "cost" = cost, "packs" = packs,
+ "authed_by" = our_order.authorised_by
+ ))
+ .["awaiting_delivery"] = list()
+ .["awaiting_delivery_orders"] = 0
+ for(var/key in SSpoints.shoppinglist[faction])
+ var/datum/supply_order/our_order = LAZYACCESSASSOC(SSpoints.shoppinglist, faction, key)
+ .["awaiting_delivery_orders"]++
+ var/list/packs = list()
+ var/cost = 0
+ for(var/P in our_order.pack)
+ var/datum/supply_packs/our_pack = P
+ if(packs[our_pack.type])
+ packs[our_pack.type] += 1
+ else
+ packs[our_pack.type] = 1
+ cost += our_pack.cost
+ .["awaiting_delivery"] += list(list(
+ "id" = our_order.id,
+ "orderer" = our_order.orderer,
+ "orderer_rank" = our_order.orderer_rank,
+ "reason" = our_order.reason,
+ "cost" = cost,
+ "packs" = packs,
+ "authed_by" = our_order.authorised_by
+ ))
+ .["export_history"] = list()
+ var/id = 0
+ var/lastexport = ""
+ for(var/datum/export_report/report AS in SSpoints.export_history)
+ if(report.faction != user.faction)
+ continue
+ if(report.points == 0)
+ continue
+ if(report.export_name == lastexport)
+ .["export_history"][id]["amount"] += 1
+ .["export_history"][id]["total"] += report.points
+ else
+ .["export_history"] += list(list(
+ "id" = id,
+ "name" = report.export_name,
+ "points" = report.points,
+ "amount" = 1,
+ total = report.points
+ ))
+ id++
+ lastexport = report.export_name
+ .["shopping_history"] = list()
+ for(var/datum/supply_order/our_order AS in SSpoints.shopping_history)
+ if(our_order.faction != user.faction)
+ continue
+ var/list/packs = list()
+ var/cost = 0
+ for(var/P in our_order.pack)
+ var/datum/supply_packs/our_pack = P
+ if(packs[our_pack.type])
+ packs[our_pack.type] += 1
+ else
+ packs[our_pack.type] = 1
+ cost += our_pack.cost
+ .["shopping_history"] += list(list(
+ "id" = our_order.id,
+ "orderer" = our_order.orderer,
+ "orderer_rank" = our_order.orderer_rank,
+ "reason" = our_order.reason,
+ "cost" = cost,
+ "packs" = packs,
+ "authed_by" = our_order.authorised_by
+ ))
+ .["shopping_list_cost"] = 0
+ .["shopping_list_items"] = 0
+ .["shopping_list"] = list()
+ for(var/i in SSpoints.shopping_cart)
+ var/datum/supply_packs/our_pack = SSpoints.supply_packs[i]
+ .["shopping_list_items"] += SSpoints.shopping_cart[i]
+ .["shopping_list_cost"] += our_pack.cost * SSpoints.shopping_cart[our_pack.type]
+ .["shopping_list"][our_pack.type] = list("count" = SSpoints.shopping_cart[our_pack.type])
+ if(supply_shuttle)
+ if(supply_shuttle?.mode == SHUTTLE_CALL)
+ if(is_mainship_level(supply_shuttle.destination.z))
+ .["elevator"] = "Raising"
+ .["elevator_dir"] = "up"
+ else
+ .["elevator"] = "Lowering"
+ .["elevator_dir"] = "down"
+ else if(supply_shuttle?.mode == SHUTTLE_IDLE)
+ if(is_mainship_level(supply_shuttle.z))
+ .["elevator"] = "Raised"
+ .["elevator_dir"] = "down"
+ else
+ .["elevator"] = "Lowered"
+ .["elevator_dir"] = "up"
+ else
+ if(is_mainship_level(supply_shuttle.z))
+ .["elevator"] = "Lowering"
+ .["elevator_dir"] = "down"
+ else
+ .["elevator"] = "Raising"
+ .["elevator_dir"] = "up"
+ else
+ .["elevator"] = "MISSING!"
+ .["beacon"] = length(GLOB.supply_beacon) ? TRUE : FALSE
+
+/datum/supply_ui/proc/get_shopping_cart(mob/user)
+ return SSpoints.shopping_cart
+
+/datum/supply_ui/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
+ switch(action)
+ if("cart")
+ var/datum/supply_packs/P = SSpoints.supply_packs[text2path(params["id"])]
+ if(!P)
+ return
+ var/shopping_cart = get_shopping_cart(ui.user)
+ switch(params["mode"])
+ if("removeall")
+ shopping_cart -= P.type
+ if("removeone")
+ if(shopping_cart[P.type] > 1)
+ shopping_cart[P.type]--
+ else
+ shopping_cart -= P.type
+ if("addone")
+ if(shopping_cart[P.type])
+ shopping_cart[P.type]++
+ else
+ shopping_cart[P.type] = 1
+ if("addall")
+ var/mob/living/ui_user = ui.user
+ var/cart_cost = 0
+ for(var/i in shopping_cart)
+ var/datum/supply_packs/SP = SSpoints.supply_packs[i]
+ cart_cost += SP.cost * shopping_cart[SP.type]
+ var/excess_points = SSpoints.supply_points[ui_user.faction] - cart_cost
+ var/number_to_buy = min(round(excess_points / P.cost), 20) //hard cap at 20
+ if(shopping_cart[P.type])
+ shopping_cart[P.type] += number_to_buy
+ else
+ shopping_cart[P.type] = number_to_buy
+ . = TRUE
+ if("send")
+ if(supply_shuttle.mode != SHUTTLE_IDLE)
+ return
+ if(is_mainship_level(supply_shuttle.z))
+ if (!supply_shuttle.check_blacklist())
+ to_chat(usr, "For safety reasons, the Automated Storage and Retrieval System cannot store live, friendlies, classified nuclear weaponry or homing beacons.")
+ playsound(supply_shuttle.return_center_turf(), 'sound/machines/buzz-two.ogg', 50, 0)
+ else
+ playsound(supply_shuttle.return_center_turf(), 'sound/machines/elevator_move.ogg', 50, 0)
+ SSshuttle.moveShuttleToTransit(shuttle_id, TRUE)
+ addtimer(CALLBACK(supply_shuttle, TYPE_PROC_REF(/obj/docking_port/mobile/supply, sell)), 15 SECONDS)
+ else
+ var/obj/docking_port/D = SSshuttle.getDock(home_id)
+ supply_shuttle.buy(usr, src)
+ playsound(D.return_center_turf(), 'sound/machines/elevator_move.ogg', 50, 0)
+ SSshuttle.moveShuttle(shuttle_id, home_id, TRUE)
+ . = TRUE
+ if("approve")
+ var/datum/supply_order/O = SSpoints.requestlist["[params["id"]]"]
+ if(!O)
+ O = SSpoints.deniedrequests["[params["id"]]"]
+ if(!O)
+ return
+ SSpoints.approve_request(O, ui.user)
+ . = TRUE
+ if("deny")
+ var/datum/supply_order/O = SSpoints.requestlist["[params["id"]]"]
+ if(!O)
+ return
+ SSpoints.deny_request(O)
+ . = TRUE
+ if("approveall")
+ for(var/i in SSpoints.requestlist)
+ var/datum/supply_order/O = SSpoints.requestlist[i]
+ SSpoints.approve_request(O, ui.user)
+ . = TRUE
+ if("denyall")
+ for(var/i in SSpoints.requestlist)
+ var/datum/supply_order/O = SSpoints.requestlist[i]
+ SSpoints.deny_request(O)
+ . = TRUE
+ if("buycart")
+ SSpoints.buy_cart(ui.user)
+ . = TRUE
+ if("clearcart")
+ var/list/shopping_cart = get_shopping_cart(ui.user)
+ shopping_cart.Cut()
+ . = TRUE
+ if("buypersonal")
+ SSpoints.buy_using_psp(ui.user)
+ . = TRUE
+ if("delivery")
+ var/datum/supply_order/O = SSpoints.shoppinglist[faction]["[params["id"]]"]
+ if(!O)
+ return
+ SSpoints.fast_delivery(O, ui.user)
+ . = TRUE
diff --git a/code/modules/reqs/ui/request.dm b/code/modules/reqs/ui/request.dm
new file mode 100644
index 00000000000..f9b92be3cca
--- /dev/null
+++ b/code/modules/reqs/ui/request.dm
@@ -0,0 +1,133 @@
+
+/datum/supply_ui/requests
+ tgui_name = "CargoRequest"
+
+// yes these are copy pasted from above because SPEEEEEEEEEEEEED
+/datum/supply_ui/requests/ui_static_data(mob/user)
+ . = list()
+ .["categories"] = GLOB.all_supply_groups
+ .["supplypacks"] = SSpoints.supply_packs_ui
+ .["supplypackscontents"] = SSpoints.supply_packs_contents
+
+/datum/supply_ui/requests/ui_data(mob/living/user)
+ . = list()
+ .["currentpoints"] = round(SSpoints.supply_points[user.faction])
+ .["personalpoints"] = round(SSpoints.personal_supply_points[user.ckey])
+ .["requests"] = list()
+ for(var/i in SSpoints.requestlist)
+ var/datum/supply_order/our_order = SSpoints.requestlist[i]
+ if(our_order.faction != user.faction)
+ continue
+ var/list/packs = list()
+ var/cost = 0
+ for(var/P in our_order.pack)
+ var/datum/supply_packs/our_pack = P
+ if(packs[our_pack.type])
+ packs[our_pack.type] += 1
+ else
+ packs[our_pack.type] = 1
+ cost += our_pack.cost
+ .["requests"] += list(list(
+ "id" = our_order.id,
+ "orderer" = our_order.orderer,
+ "orderer_rank" = our_order.orderer_rank,
+ "reason" = our_order.reason,
+ "cost" = cost,
+ "packs" = packs,
+ "authed_by" = our_order.authorised_by
+ ))
+ .["deniedrequests"] = list()
+ for(var/i in length(SSpoints.deniedrequests) to 1 step -1)
+ var/datum/supply_order/our_order = SSpoints.deniedrequests[SSpoints.deniedrequests[i]]
+ if(our_order.faction != user.faction)
+ continue
+ var/list/packs = list()
+ var/cost = 0
+ for(var/P in our_order.pack)
+ var/datum/supply_packs/our_pack = P
+ if(packs[our_pack.type])
+ packs[our_pack.type] += 1
+ else
+ packs[our_pack.type] = 1
+ cost += our_pack.cost
+ .["deniedrequests"] += list(list(
+ "id" = our_order.id,
+ "orderer" = our_order.orderer,
+ "orderer_rank" = our_order.orderer_rank,
+ "reason" = our_order.reason,
+ "cost" = cost,
+ "packs" = packs,
+ "authed_by" = our_order.authorised_by
+ ))
+ .["approvedrequests"] = list()
+ for(var/i in length(SSpoints.approvedrequests) to 1 step -1)
+ var/datum/supply_order/our_order = SSpoints.approvedrequests[SSpoints.approvedrequests[i]]
+ if(our_order.faction != user.faction)
+ continue
+ var/list/packs = list()
+ var/cost = 0
+ for(var/P in our_order.pack)
+ var/datum/supply_packs/our_pack = P
+ if(packs[our_pack.type])
+ packs[our_pack.type] += 1
+ else
+ packs[our_pack.type] = 1
+ cost += our_pack.cost
+ .["approvedrequests"] += list(list(
+ "id" = our_order.id,
+ "orderer" = our_order.orderer,
+ "orderer_rank" = our_order.orderer_rank,
+ "reason" = our_order.reason,
+ "cost" = cost,
+ "packs" = packs,
+ "authed_by" = our_order.authorised_by
+ ))
+ .["awaiting_delivery"] = list()
+ .["awaiting_delivery_orders"] = 0
+ for(var/key in SSpoints.shoppinglist[faction])
+ //only own orders
+ var/datum/supply_order/our_order = LAZYACCESSASSOC(SSpoints.shoppinglist, faction, key)
+ if(user.real_name != our_order.orderer)
+ continue
+ .["awaiting_delivery_orders"]++
+ var/list/packs = list()
+ var/cost = 0
+ for(var/P in our_order.pack)
+ var/datum/supply_packs/our_pack = P
+ if(packs[our_pack.type])
+ packs[our_pack.type] += 1
+ else
+ packs[our_pack.type] = 1
+ cost += our_pack.cost
+ .["awaiting_delivery"] += list(list(
+ "id" = our_order.id,
+ "orderer" = our_order.orderer,
+ "orderer_rank" = our_order.orderer_rank,
+ "reason" = our_order.reason,
+ "cost" = cost,
+ "packs" = packs,
+ "authed_by" = our_order.authorised_by
+ ))
+ if(!SSpoints.request_shopping_cart[user.ckey])
+ SSpoints.request_shopping_cart[user.ckey] = list()
+ .["shopping_list_cost"] = 0
+ .["shopping_list_items"] = 0
+ .["shopping_list"] = list()
+ for(var/i in SSpoints.request_shopping_cart[user.ckey])
+ var/datum/supply_packs/our_pack = SSpoints.supply_packs[i]
+ .["shopping_list_items"] += SSpoints.request_shopping_cart[user.ckey][i]
+ .["shopping_list_cost"] += our_pack.cost * SSpoints.request_shopping_cart[user.ckey][our_pack.type]
+ .["shopping_list"][our_pack.type] = list("count" = SSpoints.request_shopping_cart[user.ckey][our_pack.type])
+ .["beacon"] = length(GLOB.supply_beacon) ? TRUE : FALSE
+
+/datum/supply_ui/requests/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return TRUE
+ switch(action)
+ if("submitrequest")
+ SSpoints.submit_request(ui.user, params["reason"])
+ . = TRUE
+
+/datum/supply_ui/requests/get_shopping_cart(mob/user)
+ return SSpoints.request_shopping_cart[user.ckey]
diff --git a/code/modules/reqs/ui/vehicle.dm b/code/modules/reqs/ui/vehicle.dm
new file mode 100644
index 00000000000..8b08be0395f
--- /dev/null
+++ b/code/modules/reqs/ui/vehicle.dm
@@ -0,0 +1,264 @@
+#define DEFAULT_MAX_ARMORED_AMMO 20
+
+GLOBAL_LIST_EMPTY(armored_gunammo)
+GLOBAL_LIST_EMPTY(armored_modtypes)
+GLOBAL_LIST_INIT(armored_guntypes, armored_init_guntypes())
+GLOBAL_LIST_EMPTY(purchased_tanks)
+
+///im a lazy bum who cant use initial on lists, so we just load everything into a list
+/proc/armored_init_guntypes()
+ . = list()
+ for(var/obj/vehicle/sealed/armored/vehtype AS in typesof(/obj/vehicle/sealed/armored))
+ vehtype = new vehtype
+ GLOB.armored_modtypes[vehtype.type] = vehtype.permitted_mods
+ .[vehtype.type] = vehtype.permitted_weapons
+ qdel(vehtype)
+ for(var/obj/item/armored_weapon/gun AS in typesof(/obj/item/armored_weapon))
+ gun = new gun
+ GLOB.armored_gunammo[gun.type] = gun.accepted_ammo
+ qdel(gun)
+
+/datum/supply_ui/vehicles
+ tgui_name = "VehicleSupply"
+ shuttle_id = SHUTTLE_VEHICLE_SUPPLY
+ home_id = "vehicle_home"
+ /// current selected vehicles typepath
+ var/current_veh_type
+ /// current selected primary weapons typepath
+ var/current_primary
+ /// current selected secondaryies typepath
+ var/current_secondary
+ /// current driver mod typepath
+ var/current_driver_mod
+ /// current gunner mod typepath
+ var/current_gunner_mod
+ /// current primary ammo list, type = count
+ var/list/primary_ammo = list()
+ /// current secondary ammo list, type = count
+ var/list/secondary_ammo = list()
+
+/datum/supply_ui/vehicles/ui_static_data(mob/user)
+ var/list/data = list()
+ for(var/obj/vehicle/sealed/armored/vehtype AS in typesof(/obj/vehicle/sealed/armored))
+ var/flags = vehtype::flags_armored
+
+ if(flags & ARMORED_PURCHASABLE_TRANSPORT)
+ if(user.skills.getRating(SKILL_LARGE_VEHICLE) < SKILL_LARGE_VEHICLE_EXPERIENCED)
+ continue
+ else if(flags & ARMORED_PURCHASABLE_ASSAULT)
+ if(user.skills.getRating(SKILL_LARGE_VEHICLE) < SKILL_LARGE_VEHICLE_VETERAN)
+ continue
+ else
+ continue
+
+ data["vehicles"] += list(list("name" = initial(vehtype.name), "desc" = initial(vehtype.desc), "type" = "[vehtype]", "isselected" = (vehtype == current_veh_type)))
+ if(vehtype != current_veh_type)
+ continue
+ for(var/obj/item/armored_weapon/gun AS in GLOB.armored_guntypes[vehtype])
+ var/primary_selected = (current_primary == gun)
+ var/secondary_selected = (current_secondary == gun)
+ if(initial(gun.weapon_slot) & MODULE_PRIMARY)
+ data["primaryWeapons"] += list(list(
+ "name" = initial(gun.name),
+ "desc" = initial(gun.desc),
+ "type" = gun,
+ "isselected" = primary_selected,
+ ))
+ if(primary_selected)
+ for(var/obj/item/ammo_magazine/mag AS in primary_ammo)
+ data["primaryammotypes"] += list(list(
+ "name" = initial(mag.name),
+ "type" = mag,
+ "current" = primary_ammo[mag],
+ "max" = DEFAULT_MAX_ARMORED_AMMO, //TODO make vehicle ammo dynamic instead of fixed number
+ ))
+
+ if(initial(gun.weapon_slot) & MODULE_SECONDARY)
+ data["secondaryWeapons"] += list(list(
+ "name" = initial(gun.name),
+ "desc" = initial(gun.desc),
+ "type" = gun,
+ "isselected" = secondary_selected,
+ ))
+ if(secondary_selected)
+ for(var/obj/item/ammo_magazine/mag AS in secondary_ammo)
+ data["secondarymmotypes"] += list(list(
+ "name" = initial(mag.name),
+ "type" = mag,
+ "current" = secondary_ammo[mag],
+ "max" = DEFAULT_MAX_ARMORED_AMMO, //TODO make vehicle ammo dynamic instead of fixed number
+ ))
+
+ for(var/obj/item/tank_module/mod AS in GLOB.armored_modtypes[vehtype])
+ if(initial(mod.is_driver_module))
+ data["driverModules"] += list(list(
+ "name" = initial(mod.name),
+ "desc" = initial(mod.desc),
+ "type" = mod,
+ "isselected" = (current_driver_mod == mod),
+ ))
+ else
+ data["gunnerModules"] += list(list(
+ "name" = initial(mod.name),
+ "desc" = initial(mod.desc),
+ "type" = mod,
+ "isselected" = (current_gunner_mod == mod),
+ ))
+ return data
+
+/datum/supply_ui/vehicles/ui_data(mob/living/user)
+ var/list/data = list()
+ if(supply_shuttle)
+ if(supply_shuttle?.mode == SHUTTLE_CALL)
+ if(is_mainship_level(supply_shuttle.destination.z))
+ data["elevator"] = "Raising"
+ data["elevator_dir"] = "up"
+ else
+ data["elevator"] = "Lowering"
+ data["elevator_dir"] = "down"
+ else if(supply_shuttle?.mode == SHUTTLE_IDLE)
+ if(is_mainship_level(supply_shuttle.z))
+ data["elevator"] = "Raised"
+ data["elevator_dir"] = "down"
+ else if(current_veh_type)
+ data["elevator"] = "Purchase"
+ data["elevator_dir"] = "store"
+ else
+ data["elevator"] = "Lowered"
+ data["elevator_dir"] = "up"
+ else
+ if(is_mainship_level(supply_shuttle.z))
+ data["elevator"] = "Lowering"
+ data["elevator_dir"] = "down"
+ else
+ data["elevator"] = "Raising"
+ data["elevator_dir"] = "up"
+ else
+ data["elevator"] = "MISSING!"
+ return data
+
+/datum/supply_ui/vehicles/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("setvehicle")
+ var/newtype = text2path(params["type"])
+ if(!ispath(newtype, /obj/vehicle/sealed/armored))
+ return
+ var/obj/vehicle/sealed/armored/tank_type = newtype
+ var/is_assault = initial(tank_type.flags_armored) & ARMORED_PURCHASABLE_ASSAULT
+ if(GLOB.purchased_tanks[usr.faction]?["[is_assault]"])
+ to_chat(usr, span_danger("A vehicle of this type has already been purchased!"))
+ return
+ current_veh_type = newtype
+ current_primary = null // set everything to null, to avoid bugs
+ current_secondary = null
+ current_driver_mod = null
+ current_gunner_mod = null
+ primary_ammo = list()
+ secondary_ammo = list()
+ . = TRUE
+
+ if("setprimary")
+ if(!current_veh_type)
+ return
+ var/newtype = text2path(params["type"])
+ if(!(newtype in GLOB.armored_guntypes[current_veh_type]))
+ return
+ current_primary = newtype
+ var/list/assoc_cast = GLOB.armored_gunammo[newtype]
+ primary_ammo = assoc_cast.Copy()
+ for(var/ammo in primary_ammo)
+ primary_ammo[ammo] = 0
+ . = TRUE
+
+ if("setsecondary")
+ if(!current_veh_type)
+ return
+ var/newtype = text2path(params["type"])
+ if(!(newtype in GLOB.armored_guntypes[current_veh_type]))
+ return
+ current_secondary = newtype
+ var/list/assoc_cast = GLOB.armored_gunammo[newtype]
+ secondary_ammo = assoc_cast.Copy()
+ for(var/ammo in secondary_ammo)
+ secondary_ammo[ammo] = 0
+ . = TRUE
+
+ if("set_ammo_primary")
+ if(!current_primary)
+ return
+ var/newtype = text2path(params["type"])
+ if(!(newtype in primary_ammo))
+ return
+ var/non_adjusted_total = 0
+ for(var/ammo in primary_ammo)
+ if(ammo == newtype)
+ continue
+ non_adjusted_total += primary_ammo[ammo]
+ var/newvalue = clamp(params["new_value"], 0, DEFAULT_MAX_ARMORED_AMMO-non_adjusted_total)
+ primary_ammo[newtype] = newvalue
+ . = TRUE
+
+ if("set_ammo_secondary")
+ if(!current_secondary)
+ return
+ var/newtype = text2path(params["type"])
+ if(!(newtype in secondary_ammo))
+ return
+ var/non_adjusted_total = 0
+ for(var/ammo in secondary_ammo)
+ if(ammo == newtype)
+ continue
+ non_adjusted_total += secondary_ammo[ammo]
+ var/newvalue = clamp(params["new_value"], 0, DEFAULT_MAX_ARMORED_AMMO-non_adjusted_total)
+ secondary_ammo[newtype] = newvalue
+ . = TRUE
+
+ if("set_driver_mod")
+ if(!current_veh_type)
+ return
+ var/newtype = text2path(params["type"])
+ if(!ispath(newtype, /obj/item/tank_module))
+ return
+ if(!(newtype in GLOB.armored_modtypes[current_veh_type]))
+ return
+ current_driver_mod = newtype
+ . = TRUE
+
+ if("set_gunner_mod")
+ if(!current_veh_type)
+ return
+ var/newtype = text2path(params["type"])
+ if(!ispath(newtype, /obj/item/tank_module))
+ return
+ if(!(newtype in GLOB.armored_modtypes[current_veh_type]))
+ return
+ current_gunner_mod = newtype
+ . = TRUE
+
+ if("deploy")
+ if(supply_shuttle.mode != SHUTTLE_IDLE)
+ to_chat(usr, span_danger("Elevator moving!"))
+ return
+ if(is_mainship_level(supply_shuttle.z))
+ to_chat(usr, span_danger("Elevator raised. Lower to deploy vehicle."))
+ return
+ supply_shuttle.buy(usr, src)
+ ui_act("send", params, ui, state)
+ SStgui.close_user_uis(usr, src)
+ current_veh_type = null
+ current_primary = null
+ current_secondary = null
+ current_driver_mod = null
+ current_gunner_mod = null
+ primary_ammo = list()
+ secondary_ammo = list()
+ update_static_data(usr)
+
+ if(.)
+ update_static_data(usr)
+
+#undef DEFAULT_MAX_ARMORED_AMMO
diff --git a/code/modules/reqtorio/assembly_crafts.dm b/code/modules/reqtorio/assembly_crafts.dm
index 8591ceca2ed..f57c6e362c8 100644
--- a/code/modules/reqtorio/assembly_crafts.dm
+++ b/code/modules/reqtorio/assembly_crafts.dm
@@ -75,7 +75,7 @@ GLOBAL_LIST_INIT(all_assembly_craft_groups, list("Operations", "Weapons", "Explo
name = "Clearing junk in phoron and glass? Explosion transformation power!"
craft_time = 15 SECONDS
input = list(/obj/item/stack/sheet/mineral/junk = 4) // 20 points
- output = list(/obj/item/stack/sheet/glass = 3, /obj/item/stack/sheet/mineral/phoron = 1) //that expensive! but automized!
+ output = list(/obj/item/stack/sheet/glass/glass = 3, /obj/item/stack/sheet/mineral/phoron = 1) //that expensive! but automized!
//one in one craft cuz junk is multi use resource
/datum/assembly_craft/engineering/junk_phoron_iron
@@ -87,7 +87,7 @@ GLOBAL_LIST_INIT(all_assembly_craft_groups, list("Operations", "Weapons", "Explo
/datum/assembly_craft/engineering/drop_pod
name = "Zeus orbital drop pod"
craft_time = 20 SECONDS
- input = list(/obj/item/stack/sheet/plasteel = 5, /obj/item/stack/sheet/glass = 3) // 40 + 6
+ input = list(/obj/item/stack/sheet/plasteel = 5, /obj/item/stack/sheet/glass/glass = 3) // 40 + 6
output = list(/obj/structure/droppod = 1) //40 points
/*******************************************************************************
@@ -98,7 +98,7 @@ CLOTHING
/datum/assembly_craft/clothing/swat_mask
name = "SWAT mask"
- input = list(/obj/item/stack/sheet/plasteel = 3, /obj/item/stack/sheet/glass = 3) // 24 + 6 points
+ input = list(/obj/item/stack/sheet/plasteel = 3, /obj/item/stack/sheet/glass/glass = 3) // 24 + 6 points
output = list(/obj/item/clothing/mask/gas/swat = 1) // 25 points from old factory
diff --git a/code/modules/requisitions/supply_export.dm b/code/modules/requisitions/supply_export.dm
index dfcd0c4d500..750d96a83b0 100644
--- a/code/modules/requisitions/supply_export.dm
+++ b/code/modules/requisitions/supply_export.dm
@@ -18,46 +18,46 @@
if(!.)
return FALSE
- var/list/points = get_export_value()
- GLOB.round_statistics.points_from_xenos += points[1]
+ var/points = get_export_value()
+ GLOB.round_statistics.points_from_xenos += points
-/atom/movable/proc/get_export_value()
- return 0
+/atom/movable/proc/get_export_value(export_value = 0)
+ return export_value
-/mob/living/carbon/human/get_export_value()
+/mob/living/carbon/human/get_export_value(export_value)
if(!job)
- return 0
+ return export_value
switch(job.job_category)
if(JOB_CAT_CIVILIAN)
- . = 10
+ export_value = 10
if(JOB_CAT_ENGINEERING, JOB_CAT_MEDICAL, JOB_CAT_REQUISITIONS)
- . = 150
+ export_value = 150
if(JOB_CAT_MARINE)
- . = 100
+ export_value = 100
if(JOB_CAT_SILICON)
- . = 800
+ export_value = 800
if(JOB_CAT_COMMAND)
- . = 1000
- return 0
+ export_value = 1000
+ return export_value
/mob/living/carbon/human/species/yautja/get_export_value()
return 3000
-/mob/living/carbon/xenomorph/get_export_value()
+/mob/living/carbon/xenomorph/get_export_value(export_value)
switch(tier)
if(XENO_TIER_MINION)
- . = 50
+ export_value = 50
if(XENO_TIER_ZERO)
- . = 70
+ export_value = 70
if(XENO_TIER_ONE)
- . = 150
+ export_value = 150
if(XENO_TIER_TWO)
- . = 300
+ export_value = 300
if(XENO_TIER_THREE)
- . = 500
+ export_value = 500
if(XENO_TIER_FOUR)
- . = 1000
- return
+ export_value = 1000
+ return export_value
//I hate it but it's how it was so I'm not touching it further than this
/mob/living/carbon/xenomorph/shrike/get_export_value()
diff --git a/code/modules/screen_alert/command_alert.dm b/code/modules/screen_alert/command_alert.dm
index b489b9fb9bc..4f4afd9f118 100644
--- a/code/modules/screen_alert/command_alert.dm
+++ b/code/modules/screen_alert/command_alert.dm
@@ -24,6 +24,9 @@
var/skill_min = SKILL_LEAD_EXPERT
/datum/action/innate/message_squad/should_show()
+ . = ..()
+ if(!.)
+ return
return owner.skills.getRating(skill_name) >= skill_min
/datum/action/innate/message_squad/can_use_action()
@@ -39,7 +42,7 @@
if(!can_use_action())
return
var/mob/living/carbon/human/human_owner = owner
- var/text = tgui_input_text(human_owner, "Maximum message length [MAX_COMMAND_MESSAGE_LEN]", "Send message to squad", max_length = MAX_COMMAND_MESSAGE_LEN, multiline = TRUE)
+ var/text = tgui_input_text(human_owner, "Максимальная длина [MAX_COMMAND_MESSAGE_LEN]", "Отправить сообщение отряду", max_length = MAX_COMMAND_MESSAGE_LEN, multiline = TRUE)
if(!text)
return
var/filter_result = CAN_BYPASS_FILTER(human_owner) ? null : is_ic_filtered(text)
@@ -53,7 +56,9 @@
return
var/sound/S = sound('sound/misc/notice2.ogg')
S.channel = CHANNEL_ANNOUNCEMENTS
- TIMER_COOLDOWN_START(owner, COOLDOWN_HUD_ORDER, ORDER_COOLDOWN)
+ TIMER_COOLDOWN_START(owner, COOLDOWN_HUD_ORDER, CIC_ORDER_COOLDOWN)
+ addtimer(CALLBACK(src, PROC_REF(update_button_icon)), CIC_ORDER_COOLDOWN + 1)
+ update_button_icon()
log_game("[key_name(human_owner)] has broadcasted the hud message [text] at [AREACOORD(human_owner)]")
var/override_color // for squad colors
var/list/alert_receivers = (GLOB.alive_human_list + GLOB.ai_list + GLOB.observer_list) // for full faction alerts, do this so that faction's AI and ghosts can hear aswell
@@ -70,21 +75,21 @@
else
override_color = "grey"
for(var/mob/living/carbon/human/marine AS in human_owner.assigned_squad.marines_list | GLOB.observer_list)
- marine.play_screen_text("
SQUAD ANNOUNCEMENT:" + text, /atom/movable/screen/text/screen_text/command_order)
+ marine.play_screen_text("
ПРИКАЗ ОТРЯДУ:" + text, /atom/movable/screen/text/screen_text/command_order)
to_chat(marine, assemble_alert(
- title = "Squad [human_owner.assigned_squad.name] Announcement",
- subtitle = "Sent by [human_owner.real_name]",
+ title = "Приказ отряду [human_owner.assigned_squad.name]",
+ subtitle = "Отправлен [human_owner.real_name]",
message = text,
color_override = override_color
))
return
for(var/mob/faction_receiver in alert_receivers)
if(faction_receiver.faction == human_owner.faction || isdead(faction_receiver))
- var/faction_title = GLOB.faction_to_acronym[human_owner.faction] ? GLOB.faction_to_acronym[human_owner.faction] + " Command" : "Unknown Faction" + " Command"
- faction_receiver.play_screen_text("
[uppertext(faction_title)] ANNOUNCEMENT:" + text, /atom/movable/screen/text/screen_text/command_order)
+ var/faction_title = GLOB.faction_to_acronym[human_owner.faction] ? "Командования " + GLOB.faction_to_acronym[human_owner.faction] : "Командования" + " Неизвестной Фракции"
+ faction_receiver.play_screen_text("
ПРИКАЗ [uppertext(faction_title)]:" + text, /atom/movable/screen/text/screen_text/command_order)
to_chat(faction_receiver, assemble_alert(
- title = "[faction_title] Announcement",
- subtitle = "Sent by [human_owner.job.title] [human_owner.real_name]",
+ title = "Сообщение от [faction_title]",
+ subtitle = "Отправлен [human_owner.job.title] [human_owner.real_name]",
message = text
))
SEND_SOUND(faction_receiver, S)
diff --git a/code/modules/shuttle/marine_dropship.dm b/code/modules/shuttle/marine_dropship.dm
index 89fa792a981..e47e4026de6 100644
--- a/code/modules/shuttle/marine_dropship.dm
+++ b/code/modules/shuttle/marine_dropship.dm
@@ -261,7 +261,7 @@
if(hijack_state != HIJACK_STATE_NORMAL)
return
cycle_timer = addtimer(CALLBACK(src, PROC_REF(go_to_previous_destination)), 20 SECONDS, TIMER_STOPPABLE)
- priority_announce("The Alamo will depart towards [previous.name] in 20 seconds.", "Dropship Automatic Departure", color_override = "grey", playing_sound = FALSE)
+ priority_announce("Десантный шаттл взлетает через 20 секунд по направлению к [previous.name]", "Автопилот Нормандии", color_override = "grey", playing_sound = FALSE)
///Send the dropship to its previous dock
/obj/docking_port/mobile/marine_dropship/proc/go_to_previous_destination()
@@ -324,7 +324,7 @@
/obj/docking_port/mobile/marine_dropship/on_prearrival()
. = ..()
if(hijack_state == HIJACK_STATE_CRASHING)
- priority_announce("DROPSHIP ON COLLISION COURSE. CRASH IMMINENT.", "EMERGENCY", sound = 'sound/AI/dropship_emergency.ogg', color_override = "red")
+ priority_announce("ДЕСАНТНЫЙ ШАТТЛ НА КУРСЕ СТОЛКНОВЕНИЯ. АВАРИЯ НЕИЗБЕЖНА.", "ТРЕВОГА", sound = 'sound/AI/dropship_emergency.ogg', color_override = "red")
for(var/obj/machinery/landinglight/light AS in GLOB.landing_lights)
if(light.linked_port == destination)
light.turn_on()
@@ -376,7 +376,7 @@
message_admins("[ADMIN_TPMONTY(src)] has summoned the dropship")
log_admin("[key_name(src)] has summoned the dropship")
hive?.xeno_message("[src] has summoned down the metal bird to [port], gather to her now!")
- priority_announce("Unknown external interference with dropship control. Shutting down autopilot.", "Critical Dropship Alert", type = ANNOUNCEMENT_PRIORITY, color_override = "red")
+ priority_announce("Неизвестное вмешательство в управление десантным шаттлом. Выключение автопилота...", "Неисправность Шаттла", type = ANNOUNCEMENT_PRIORITY, color_override = "red", sound = 'sound/AI/dropship_wrong.ogg')
#define ALIVE_HUMANS_FOR_CALLDOWN 0.1
@@ -414,37 +414,37 @@
locked_sides++
break
if(!locked_sides)
- to_chat(user, span_warning("The bird is already on the ground, open and vulnerable."))
+ to_chat(user, span_warning("Птица уже на земле, открыта и уязвимая."))
return FALSE
if(locked_sides < 3 && !isdropshiparea(get_area(user)))
- to_chat(user, span_warning("At least one side is still unlocked!"))
+ to_chat(user, span_warning("По крайней мере одна сторона все еще разблокирована!"))
return FALSE
- to_chat(user, span_xenodanger("We crack open the metal bird's shell."))
+ to_chat(user, span_xenodanger("Мы вскрываем металлическую оболочку птицы."))
if(D.hijack_state != HIJACK_STATE_NORMAL)
return FALSE
- to_chat(user, span_warning("We begin overriding the shuttle lockdown. This will take a while..."))
+ to_chat(user, span_warning("Мы начинаем отменять блокировку шаттла. Это займет некоторое время..."))
if(!do_after(user, 30 SECONDS, FALSE, null, BUSY_ICON_DANGER, BUSY_ICON_DANGER))
- to_chat(user, span_warning("We cease overriding the shuttle lockdown."))
+ to_chat(user, span_warning("Мы прекращаем отмену блокировки шаттла."))
return FALSE
if(!is_ground_level(D.z))
- to_chat(user, span_warning("The bird has left meanwhile, try again."))
+ to_chat(user, span_warning("Птица улетела, попробуйте еще раз."))
return FALSE
D.unlock_all()
if(D.mode != SHUTTLE_IGNITING)
D.set_hijack_state(HIJACK_STATE_UNLOCKED)
D.do_start_hijack_timer(GROUND_LOCKDOWN_TIME)
- to_chat(user, span_warning("We were unable to prevent the bird from flying as it is already taking off."))
+ to_chat(user, span_warning("Мы не можем помешать птице улететь, так как она уже взлетает."))
D.silicon_lock_airlocks(TRUE)
- to_chat(user, span_warning("We have overriden the shuttle lockdown!"))
+ to_chat(user, span_warning("Мы отменили блокировку шаттла!"))
playsound(user, "alien_roar", 50)
- priority_announce("Normandy lockdown protocol compromised. Interference preventing remote control.", "Dropship Lock Alert", type = ANNOUNCEMENT_PRIORITY, color_override = "red")
+ priority_announce("Протокол блокировки Нормандии скомпрометирован. Постороннее вмешательство блокирует попытки удалённого управления.", "Шаттл Заблокирован", type = ANNOUNCEMENT_PRIORITY, color_override = "red", sound = 'sound/AI/dropship_block.ogg')
return FALSE
if(D.mode != SHUTTLE_IDLE && D.mode != SHUTTLE_RECHARGING)
- to_chat(user, span_warning("The bird's mind is currently active. We need to wait until it's more vulnerable..."))
+ to_chat(user, span_warning("Сознание птицы активно. Нужно подождать, пока она станет более уязвимым..."))
return FALSE
var/list/living_player_list = count_humans_and_xenos(SSmapping.levels_by_any_trait(list(ZTRAIT_GROUND)), COUNT_IGNORE_ALIVE_SSD)
if(length_char(GLOB.alive_human_list) && ((living_player_list[1] / length_char(GLOB.alive_human_list)) > ALIVE_HUMANS_FOR_CALLDOWN))
- to_chat(user, span_warning("There's too many tallhosts still on the ground. They interfere with our psychic field. We must dispatch them before we are able to do this."))
+ to_chat(user, span_warning("Ещё много живой добычи на земле. Они мешают нашему психическому полю. Мы должны уничтожить их, прежде чем сможем это сделать."))
return FALSE
return TRUE
@@ -695,23 +695,23 @@
if(href_list["hijack"])
if(!(X.hive.hive_flags & HIVE_CAN_HIJACK))
- to_chat(X, span_warning("Our hive lacks the psychic prowess to hijack the bird."))
+ to_chat(X, span_warning("Нашему улью не хватает экстрасенсорных способностей, чтобы украсть птицу."))
return
var/list/living_player_list = SSticker.mode.count_humans_and_xenos(list(X.z), COUNT_IGNORE_ALIVE_SSD)
if(living_player_list[1] > living_player_list[2]) // if there are more marines than xenos, we are unable to hijack
- to_chat(X, span_xenowarning("There is still prey left to hunt!"))
+ to_chat(X, span_xenowarning("Еще осталась добыча, на которую можно поохотиться!"))
return
switch(M.mode)
if(SHUTTLE_RECHARGING)
- to_chat(X, span_xenowarning("The bird is still cooling down."))
+ to_chat(X, span_xenowarning("Птица все еще остывает..."))
return
if(SHUTTLE_IDLE) //Continue.
EMPTY_BLOCK_GUARD
else
- to_chat(X, span_xenowarning("We can't do that right now."))
+ to_chat(X, span_xenowarning("Мы не можем сделать это сейчас."))
return
- var/confirm = tgui_alert(usr, "Would you like to hijack the metal bird?", "Hijack the bird?", list("Yes", "No"))
- if(confirm != "Yes")
+ var/confirm = tgui_alert(usr, "Хотите угнать металлическую птицу?", "Угнать птицу?", list("Да", "Нет"))
+ if(confirm != "Да")
return
var/obj/docking_port/stationary/marine_dropship/crash_target/CT = pick(SSshuttle.crash_targets)
if(!CT)
@@ -721,13 +721,13 @@
if(href_list["abduct"])
var/list/living_player_list = SSticker.mode.count_humans_and_xenos(list(X.z), COUNT_IGNORE_ALIVE_SSD)
if(living_player_list[1] > 5)
- to_chat(X, span_xenowarning("There is still prey left to hunt!"))
+ to_chat(X, span_xenowarning("Еще осталась добыча, на которую можно поохотиться!"))
return
- var/confirm = tgui_alert(usr, "Would you like to capture the metal bird?\n THIS WILL END THE ROUND", "Capture the ship?", list( "Yes", "No"))
- if(confirm != "Yes")
+ var/confirm = tgui_alert(usr, "Хотите захватить металлическую птицу?\n ЭТО ЗАВЕРШИТ РАУНД", "Захватить птицу?", list( "Да", "Нет"))
+ if(confirm != "Да")
return
- priority_announce("The Normandy has been captured! Losing their main mean of accessing the ground, the marines have no choice but to retreat.", title = "Normandy Captured", color_override = "orange")
+ priority_announce("Нормандия захвачена! Потеряв главный путь к земле, морпехи вынуждены отступить.", title = "Нормандия Захвачена", color_override = "orange")
var/datum/game_mode/infestation/infestation_mode = SSticker.mode
infestation_mode.round_stage = INFESTATION_DROPSHIP_CAPTURED_XENOS
return
@@ -741,7 +741,7 @@
crashing_dropship.crashing = TRUE
crashing_dropship.unlock_all()
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_DROPSHIP_HIJACKED)
- priority_announce("Unscheduled dropship departure detected from operational area. Hijack likely.", title = "Critical Dropship Alert", type = ANNOUNCEMENT_PRIORITY, sound = 'sound/AI/hijack.ogg', color_override = "red")
+ priority_announce("Зафиксирован незапланированный вылет Нормандии из зоны боевых действий. Вероятен угон.", title = "Неисправность Нормандии", type = ANNOUNCEMENT_PRIORITY, sound = 'sound/AI/hijack.ogg', color_override = "red")
to_chat(user, span_danger("A loud alarm erupts from [src]! The fleshy hosts must know that you can access it!"))
user.hive.on_shuttle_hijack(crashing_dropship)
playsound(src, 'sound/misc/queen_alarm.ogg')
@@ -749,12 +749,12 @@
SSevacuation.flags_scuttle &= ~FLAGS_SDEVAC_TIMELOCK
switch(SSshuttle.moveShuttleToDock(shuttleId, crash_target, TRUE))
if(0)
- visible_message("Shuttle departing. Please stand away from the doors.")
+ visible_message("Отправление шаттла. Осторожно, двери закрываются.")
if(1)
- to_chat(user, span_warning("Invalid shuttle requested. This shouldn't happen, please report it."))
+ to_chat(user, span_warning("Неверный запрос на шаттл. Такого не должно быть! Сообщите об этом администрации."))
CRASH("moveShuttleToDock() returned 1.")
else
- to_chat(user, span_warning("ERROR. This shouldn't happen, please report it."))
+ to_chat(user, span_warning("ОШИБКА. Такого не должно быть! Сообщите об этом администрации."))
CRASH("moveShuttleToDock() returned a non-zero-nor-one value.")
/obj/machinery/computer/shuttle/marine_dropship/one
@@ -1481,7 +1481,7 @@
if(admin_response == "deny")
TIMER_COOLDOWN_START(src, COOLDOWN_EVACUATION, 15 SECONDS)
- priority_announce("An evacuation attempt has been blocked, the engines are now restarting.", "Evacuation Attempt", ANNOUNCEMENT_COMMAND)
+ priority_announce("Попытка эвакуации заблокирована. Перезапуск двигателей...", "Попытка Эвакуации", ANNOUNCEMENT_COMMAND)
return TRUE
if(admin_response =="deny without annoncing")
TIMER_COOLDOWN_START(src, COOLDOWN_EVACUATION, 15 SECONDS)
diff --git a/code/modules/vehicles/armored/ammo_magazine.dm b/code/modules/vehicles/armored/ammo_magazine.dm
index eae4cb05ef9..6968e6c6be2 100644
--- a/code/modules/vehicles/armored/ammo_magazine.dm
+++ b/code/modules/vehicles/armored/ammo_magazine.dm
@@ -1,6 +1,7 @@
//FEB 2024 NOTE: some of these are missing loading_sounds, fix it before using these ingame
//Special ammo magazines for hardpoint modules. Some may not be here since you can use normal magazines on them
/obj/item/ammo_magazine/tank
+ icon = 'icons/obj/items/ammo/tank.dmi'
flags_magazine = NONE
///loading sound to play when
var/loading_sound
@@ -9,7 +10,7 @@
name = "high explosive LTB round"
desc = "A primary armament cannon magazine"
caliber = CALIBER_84MM
- icon_state = "ltbammo"
+ icon_state = "ltb"
w_class = WEIGHT_CLASS_GIGANTIC
default_ammo = /datum/ammo/rocket/ltb
max_rounds = 1
@@ -18,7 +19,7 @@
/obj/item/ammo_magazine/tank/ltb_cannon/apfds
name = "LTB APFDS round (105mm)"
desc = "A 105mm armor piercing shell with exceptional velocity and penetrating characteristics. Will pierce through walls and targets."
- icon_state = "ltbammo_apfds"
+ icon_state = "ltb_apfds"
default_ammo = /datum/ammo/bullet/tank_apfds
/obj/item/ammo_magazine/tank/ltaap_chaingun
@@ -36,6 +37,7 @@
desc = "A secondary armament flamethrower magazine"
caliber = CALIBER_FUEL_THICK
icon_state = "flametank_large"
+ icon = 'icons/obj/items/ammo/flamer.dmi'
w_class = WEIGHT_CLASS_GIGANTIC
default_ammo = /datum/ammo/flamethrower/tank_flamer
max_rounds = 120
@@ -45,6 +47,7 @@
desc = "A secondary armament rocket magazine"
caliber = CALIBER_68MM
icon_state = "quad_rocket"
+ icon = 'icons/obj/items/ammo/rocket.dmi'
w_class = WEIGHT_CLASS_GIGANTIC
default_ammo = /datum/ammo/rocket/ap //Fun fact, AP rockets seem to be a straight downgrade from normal rockets. Maybe I'm missing something...
max_rounds = 5
@@ -53,7 +56,7 @@
name = "M56 Cupola Magazine"
desc = "A secondary armament MG magazine"
caliber = CALIBER_10X28
- icon_state = "cupolaammo"
+ icon_state = "cupola"
loading_sound = 'sound/weapons/guns/interact/working_the_bolt.ogg'
w_class = WEIGHT_CLASS_GIGANTIC
default_ammo = /datum/ammo/bullet/cupola
diff --git a/code/modules/xenomorph/acidwell.dm b/code/modules/xenomorph/acidwell.dm
index c20a593047e..2f2778df295 100644
--- a/code/modules/xenomorph/acidwell.dm
+++ b/code/modules/xenomorph/acidwell.dm
@@ -186,9 +186,10 @@
charges_used ++
if(!isxeno(stepper))
+ var/mob/living/carbon/human/H = stepper
stepper.next_move_slowdown += charges * 2 //Acid spray has slow down so this should too; scales with charges, Min 2 slowdown, Max 10
- stepper.apply_damage(charges * 10, BURN, BODY_ZONE_PRECISE_L_FOOT, ACID, penetration = 33)
- stepper.apply_damage(charges * 10, BURN, BODY_ZONE_PRECISE_R_FOOT, ACID, penetration = 33)
+ stepper.apply_damage(charges * 10, BURN, BODY_ZONE_PRECISE_L_FOOT, ACID, penetration = 33 - 20 * H.get_permeability_protection()) //Wearing mimir MK1/2 will soften damage from wells by reducing AP
+ stepper.apply_damage(charges * 10, BURN, BODY_ZONE_PRECISE_R_FOOT, ACID, penetration = 33 - 20 * H.get_permeability_protection()) //without providing full protection against them
stepper.visible_message(span_danger("[stepper] is immersed in [src]'s acid!") , \
span_danger("We are immersed in [src]'s acid!") , null, 5)
playsound(stepper, "sound/bullets/acid_impact1.ogg", 10 * charges)
diff --git a/code/modules/xenomorph/turret.dm b/code/modules/xenomorph/turret.dm
index f686859696a..db8d94ca555 100644
--- a/code/modules/xenomorph/turret.dm
+++ b/code/modules/xenomorph/turret.dm
@@ -1,16 +1,17 @@
-/obj/structure/xeno/xeno_turret
- icon = 'icons/Xeno/acidturret.dmi'
- icon_state = XENO_TURRET_ACID_ICONSTATE
+#define TURRET_HEALTH_REGEN 8
+
+/obj/structure/xeno/turret
name = "acid turret"
desc = "A menacing looking construct of resin, it seems to be alive. It fires acid against intruders."
- bound_width = 32
- bound_height = 32
+ icon = 'icons/Xeno/acidturret.dmi'
+ icon_state = "acid_turret"
+ base_icon_state = "acid_turret"
obj_integrity = 600
max_integrity = 1500
layer = ABOVE_MOB_LAYER
density = TRUE
- resistance_flags = UNACIDABLE | DROPSHIP_IMMUNE
- xeno_structure_flags = IGNORE_WEED_REMOVAL|HAS_OVERLAY
+ resistance_flags = UNACIDABLE|DROPSHIP_IMMUNE
+ xeno_structure_flags = IGNORE_WEED_REMOVAL
allow_pass_flags = PASS_AIR|PASS_THROW
///What kind of spit it uses
var/datum/ammo/ammo = /datum/ammo/xeno/acid/heavy/turret
@@ -21,25 +22,22 @@
///Last target of the turret
var/atom/last_hostile
///Potential list of targets found by scan
- var/list/atom/potential_hostiles
+ var/list/atom/potential_hostiles = list()
///Fire rate of the target in ticks
- var/firerate = 5
- ///The last time the sentry did a scan
- var/last_scan_time
+ var/firerate = 0.5 SECONDS
///light color that gets set in initialize
var/light_initial_color = LIGHT_COLOR_GREEN
///For minimap icon change if sentry is firing
var/firing
///Change minimap icon if its firing or not firing
-/obj/structure/xeno/xeno_turret/proc/update_minimap_icon()
+/obj/structure/xeno/turret/proc/update_minimap_icon()
SSminimaps.remove_marker(src)
SSminimaps.add_marker(src, MINIMAP_FLAG_XENO, image('icons/UI_icons/map_blips.dmi', null, "xeno_turret[firing ? "_firing" : "_passive"]")) // RU TGMC edit - map blips
-/obj/structure/xeno/xeno_turret/Initialize(mapload, _hivenumber)
+/obj/structure/xeno/turret/Initialize(mapload, _hivenumber)
. = ..()
ammo = GLOB.ammo_list[ammo]
- potential_hostiles = list()
LAZYADDASSOC(GLOB.xeno_resin_turrets_by_hive, hivenumber, src)
START_PROCESSING(SSobj, src)
AddComponent(/datum/component/automatedfire/xeno_turret_autofire, firerate)
@@ -51,57 +49,52 @@
update_icon()
///Signal handler to delete the turret when the alamo is hijacked
-/obj/structure/xeno/xeno_turret/proc/destroy_on_hijack()
+/obj/structure/xeno/turret/proc/destroy_on_hijack()
SIGNAL_HANDLER
qdel(src)
-/obj/structure/xeno/xeno_turret/obj_destruction(damage_amount, damage_type, damage_flag)
+/obj/structure/xeno/turret/obj_destruction(damage_amount, damage_type, damage_flag)
if(damage_amount) //Spawn effects only if we actually get destroyed by damage
on_destruction()
+ playsound(loc,'sound/effects/alien/turret_death.ogg', 70)
return ..()
-/obj/structure/xeno/xeno_turret/proc/on_destruction()
+/obj/structure/xeno/turret/proc/on_destruction()
var/datum/effect_system/smoke_spread/xeno/smoke = new /datum/effect_system/smoke_spread/xeno/acid(src)
smoke.set_up(1, get_turf(src))
smoke.start()
-/obj/structure/xeno/xeno_turret/Destroy()
+/obj/structure/xeno/turret/Destroy()
GLOB.xeno_resin_turrets_by_hive[hivenumber] -= src
set_hostile(null)
set_last_hostile(null)
STOP_PROCESSING(SSobj, src)
- playsound(loc,'sound/effects/alien/turret_death.ogg', 70)
return ..()
-/obj/structure/xeno/xeno_turret/ex_act(severity)
+/obj/structure/xeno/turret/ex_act(severity)
take_damage(severity * 5, BRUTE, BOMB)
-/obj/structure/xeno/xeno_turret/fire_act(burn_level, flame_color)
+/obj/structure/xeno/turret/fire_act(burn_level, flame_color)
take_damage(burn_level * 2, BURN, FIRE)
ENABLE_BITFIELD(resistance_flags, ON_FIRE)
-/obj/structure/xeno/xeno_turret/update_overlays()
+/obj/structure/xeno/turret/update_overlays()
. = ..()
- if(!(xeno_structure_flags & HAS_OVERLAY))
- return
if(obj_integrity <= max_integrity * 0.5)
- . += image('icons/Xeno/acidturret.dmi', src, "+turret_damage")
+ . += image(icon, src, "[base_icon_state]_damage")
if(CHECK_BITFIELD(resistance_flags, ON_FIRE))
- . += image('icons/Xeno/acidturret.dmi', src, "+turret_on_fire")
+ . += image(icon, src, "turret_on_fire")
-/obj/structure/xeno/xeno_turret/process()
+/obj/structure/xeno/turret/process()
//Turrets regen some HP, every 2 sec
if(obj_integrity < max_integrity)
obj_integrity = min(obj_integrity + TURRET_HEALTH_REGEN, max_integrity)
update_icon()
DISABLE_BITFIELD(resistance_flags, ON_FIRE)
- if(world.time > last_scan_time + TURRET_SCAN_FREQUENCY)
- scan()
- last_scan_time = world.time
- if(!length(potential_hostiles))
+ if(!scan())
return
set_hostile(get_target())
- if (!hostile)
+ if(!hostile)
if(last_hostile)
set_last_hostile(null)
return
@@ -112,7 +105,7 @@
set_last_hostile(hostile)
SEND_SIGNAL(src, COMSIG_AUTOMATIC_SHOOTER_START_SHOOTING_AT)
-/obj/structure/xeno/xeno_turret/attackby(obj/item/I, mob/living/user, params)
+/obj/structure/xeno/turret/attackby(obj/item/I, mob/living/user, params)
if(I.flags_item & NOBLUDGEON || !isliving(user))
return attack_hand(user)
@@ -135,89 +128,87 @@
playsound(src, "alien_resin_break", 25)
///Signal handler for hard del of hostile
-/obj/structure/xeno/xeno_turret/proc/unset_hostile()
+/obj/structure/xeno/turret/proc/unset_hostile()
SIGNAL_HANDLER
hostile = null
-///Signal handler for hard del of last_hostile
-/obj/structure/xeno/xeno_turret/proc/unset_last_hostile()
- SIGNAL_HANDLER
- last_hostile = null
-
///Setter for hostile with hard del in mind
-/obj/structure/xeno/xeno_turret/proc/set_hostile(_hostile)
- if(hostile != _hostile)
- hostile = _hostile
- RegisterSignal(hostile, COMSIG_QDELETING, PROC_REF(unset_hostile))
+/obj/structure/xeno/turret/proc/set_hostile(_hostile)
+ if(hostile == _hostile)
+ return
+ hostile = _hostile
+ RegisterSignal(hostile, COMSIG_QDELETING, PROC_REF(unset_hostile))
///Setter for last_hostile with hard del in mind
-/obj/structure/xeno/xeno_turret/proc/set_last_hostile(_last_hostile)
+/obj/structure/xeno/turret/proc/set_last_hostile(_last_hostile)
if(last_hostile)
UnregisterSignal(last_hostile, COMSIG_QDELETING)
last_hostile = _last_hostile
///Look for the closest human in range and in light of sight. If no human is in range, will look for xenos of other hives
-/obj/structure/xeno/xeno_turret/proc/get_target()
- var/distance = range + 0.5 //we add 0.5 so if a potential target is at range, it is accepted by the system
- var/buffer_distance
+/obj/structure/xeno/turret/proc/get_target()
var/list/turf/path = list()
for(var/atom/nearby_hostile AS in potential_hostiles)
- if(isliving(nearby_hostile))
- var/mob/living/nearby_living_hostile = nearby_hostile
- if(nearby_living_hostile.stat == DEAD)
- continue
- if(HAS_TRAIT(nearby_hostile, TRAIT_STEALTH))
- continue
- buffer_distance = get_dist(nearby_hostile, src)
- if(distance <= buffer_distance) //If we already found a target that's closer
- continue
path = getline(src, nearby_hostile)
path -= get_turf(src)
- if(!length(path)) //Can't shoot if it's on the same turf
- continue
- var/blocked = FALSE
+ var/blocked = FALSE //LoF Broken; stop checking; we can't proceed further.
for(var/turf/T AS in path)
if(IS_OPAQUE_TURF(T) || T.density && !(T.allow_pass_flags & PASS_PROJECTILE))
blocked = TRUE
- break //LoF Broken; stop checking; we can't proceed further.
+ break
for(var/obj/machinery/MA in T)
- if(MA.opacity || MA.density && !(MA.allow_pass_flags & PASS_PROJECTILE))
- blocked = TRUE
- break //LoF Broken; stop checking; we can't proceed further.
+ if(!MA.opacity)
+ continue
+ if(!MA.density && MA.allow_pass_flags & PASS_PROJECTILE)
+ continue
+ blocked = TRUE
+ break
for(var/obj/structure/S in T)
- if(S.opacity || S.density && !(S.allow_pass_flags & PASS_PROJECTILE))
- blocked = TRUE
- break //LoF Broken; stop checking; we can't proceed further.
- if(!blocked)
- distance = buffer_distance
- . = nearby_hostile
-
-///Return TRUE if a possible target is near
-/obj/structure/xeno/xeno_turret/proc/scan()
+ if(!S.opacity)
+ continue
+ if(!S.density && S.allow_pass_flags & PASS_PROJECTILE)
+ continue
+ blocked = TRUE
+ break
+ if(blocked)
+ continue
+ return nearby_hostile
+
+///Checks the nearby mobs for eligability. If they can be targets it stores them in potential_targets. Returns TRUE if there are targets, FALSE if not.
+/obj/structure/xeno/turret/proc/scan()
potential_hostiles.Cut()
- for (var/mob/living/carbon/human/nearby_human AS in cheap_get_humans_near(src, TURRET_SCAN_RANGE))
+ for(var/mob/living/carbon/human/nearby_human AS in cheap_get_humans_near(src, range))
if(nearby_human.stat == DEAD)
continue
if(nearby_human.get_xeno_hivenumber() == hivenumber)
continue
+ if(HAS_TRAIT(nearby_human, TRAIT_STEALTH))
+ continue
potential_hostiles += nearby_human
- for (var/mob/living/carbon/xenomorph/nearby_xeno AS in cheap_get_xenos_near(src, range))
+ for(var/mob/living/carbon/xenomorph/nearby_xeno AS in cheap_get_xenos_near(src, range))
if(GLOB.hive_datums[hivenumber] == nearby_xeno.hive)
continue
if(nearby_xeno.stat == DEAD)
continue
+ if(HAS_TRAIT(nearby_xeno, TRAIT_STEALTH))
+ continue
potential_hostiles += nearby_xeno
- for(var/obj/vehicle/unmanned/vehicle AS in GLOB.unmanned_vehicles)
- if(vehicle.z == z && get_dist(vehicle, src) <= range)
- potential_hostiles += vehicle
- for(var/obj/vehicle/sealed/mecha/mech AS in GLOB.mechas_list)
- if(mech.z == z && get_dist(mech, src) <= range)
- potential_hostiles += mech
+ for(var/obj/vehicle/unmanned/nearby_unmanned_vehicle AS in cheap_get_unmanned_vehicles_near(src, range))
+ potential_hostiles += nearby_unmanned_vehicle
+ for(var/obj/vehicle/sealed/mecha/nearby_mech AS in cheap_get_mechs_near(src, range))
+ var/list/driver_list = nearby_mech.return_drivers()
+ if(!length(driver_list))
+ continue
+ var/mob/living/carbon/human/human_occupant = driver_list[1]
+ if(human_occupant.get_xeno_hivenumber() == hivenumber) // what if zombie rides a mech?
+ continue
+ potential_hostiles += nearby_mech
+ return potential_hostiles
///Signal handler to make the turret shoot at its target
-/obj/structure/xeno/xeno_turret/proc/shoot()
+/obj/structure/xeno/turret/proc/shoot()
SIGNAL_HANDLER
if(!hostile)
SEND_SIGNAL(src, COMSIG_AUTOMATIC_SHOOTER_STOP_SHOOTING_AT)
@@ -229,40 +220,67 @@
newshot.generate_bullet(ammo)
newshot.def_zone = pick(GLOB.base_miss_chance)
newshot.fire_at(hostile, null, src, ammo.max_range, ammo.shell_speed)
- if(istype(ammo, /datum/ammo/xeno/hugger))
- var/datum/ammo/xeno/hugger/hugger_ammo = ammo
- newshot.color = initial(hugger_ammo.hugger_type.color)
- hugger_ammo.hivenumber = hivenumber
firing = TRUE
update_minimap_icon()
-/obj/structure/xeno/xeno_turret/sticky
+/obj/structure/xeno/turret/sticky
name = "Sticky resin turret"
- icon = 'icons/Xeno/acidturret.dmi'
- icon_state = XENO_TURRET_STICKY_ICONSTATE
desc = "A menacing looking construct of resin, it seems to be alive. It fires resin against intruders."
+ icon_state = "resin_turret"
+ base_icon_state = "resin_turret"
light_initial_color = LIGHT_COLOR_PURPLE
ammo = /datum/ammo/xeno/sticky/turret
- firerate = 5
-/obj/structure/xeno/xeno_turret/sticky/on_destruction()
- for(var/i = 1 to 20) // maybe a bit laggy
+/obj/structure/xeno/turret/sticky/on_destruction()
+ for(var/i in 1 to 20) // maybe a bit laggy
var/obj/projectile/new_proj = new(src)
new_proj.generate_bullet(ammo)
- new_proj.fire_at(null, src, range = rand(1, 4), angle = rand(1, 360), recursivity = TRUE)
+ new_proj.fire_at(null, src, src, range = rand(1, 4), angle = rand(1, 360), recursivity = TRUE)
-/obj/structure/xeno/xeno_turret/hugger_turret
+/obj/structure/xeno/turret/facehugger
name = "hugger turret"
- icon_state = "hugger_turret"
desc = "A menacing looking construct of resin, it seems to be alive. It fires huggers against intruders."
+ icon_state = "hugger_turret"
+ base_icon_state = "hugger_turret"
obj_integrity = 400
max_integrity = 400
light_initial_color = LIGHT_COLOR_BROWN
ammo = /datum/ammo/xeno/hugger
firerate = 5 SECONDS
-/obj/structure/xeno/xeno_turret/hugger_turret/on_destruction()
- for(var/i = 1 to 5)
+/obj/structure/xeno/turret/facehugger/shoot()
+ if(!hostile)
+ SEND_SIGNAL(src, COMSIG_AUTOMATIC_SHOOTER_STOP_SHOOTING_AT)
+ firing = FALSE
+ update_minimap_icon()
+ return
+ face_atom(hostile)
+ var/obj/projectile/newshot = new(loc)
+ newshot.generate_bullet(ammo)
+ newshot.def_zone = pick(GLOB.base_miss_chance)
+ newshot.fire_at(hostile, null, src, ammo.max_range, ammo.shell_speed)
+ var/datum/ammo/xeno/hugger/hugger_ammo = ammo
+ newshot.color = initial(hugger_ammo.hugger_type.color)
+ hugger_ammo.hivenumber = hivenumber
+ firing = TRUE
+ update_minimap_icon()
+
+/obj/structure/xeno/turret/facehugger/on_destruction()
+ for(var/i in 1 to 5)
var/obj/projectile/new_proj = new(src)
new_proj.generate_bullet(ammo)
- new_proj.fire_at(null, src, range = rand(1, 3), angle = rand(1, 360), recursivity = TRUE)
+ new_proj.fire_at(null, src, src, range = rand(1, 3), angle = rand(1, 360), recursivity = TRUE)
+
+/obj/structure/xeno/turret/facehugger/attack_ghost(mob/dead/observer/user)
+ . = ..()
+
+ var/datum/hive_status/hive = GLOB.hive_datums[hivenumber]
+ if(!hive.can_spawn_as_hugger(user))
+ return FALSE
+
+ var/mob/living/carbon/xenomorph/facehugger/new_hugger = new(get_turf(src))
+ new_hugger.transfer_to_hive(hivenumber)
+ new_hugger.transfer_mob(user)
+ return TRUE
+
+#undef TURRET_HEALTH_REGEN
diff --git a/html/changelogs/AutoChangeLog-pr-739.yml b/html/changelogs/AutoChangeLog-pr-739.yml
new file mode 100644
index 00000000000..7db99ca010a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-739.yml
@@ -0,0 +1,4 @@
+author: "definitelynotspaghetti"
+delete-after: True
+changes:
+ - bugfix: "Создать спайдерлинга больше нельзя если у абилки нет зарядов"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml
index eb276bde2a3..f6fa5400fb9 100644
--- a/html/changelogs/archive/2024-11.yml
+++ b/html/changelogs/archive/2024-11.yml
@@ -515,3 +515,127 @@
\u0442 \u043F\u0430\u0442\u0440\u043E\u043D\u044B \u043D\u0430 \u0441\u043A\u0430\
\u0443\u0442\u0441\u043A\u0443\u044E \u0432\u0438\u043D\u0442\u043E\u0432\u043A\
\u0443."
+2024-11-28:
+ Helg2:
+ - bugfix: "\u0418\u0441\u043F\u0440\u0430\u0432\u0438\u043B \u0442\u043E \u0447\u0442\
+ \u043E \"Jump To Area\" \u043D\u0435 \u0440\u0430\u0431\u043E\u0442\u0430\u043B\
+ ."
+2024-11-29:
+ CheBokJam:
+ - balance: "\u0414\u043E\u0431\u0430\u0432\u0438\u043B \u0448\u0430\u0442\u0442\u0435\
+ \u0440 (\u043C\u0438\u043D\u0443\u0441 20% \u0431\u0440\u043E\u043D\u0438) \u043D\
+ \u0430 3 \u0441\u0435\u043A\u0443\u043D\u0434\u044B."
+ - balance: "\u0423\u0440\u043E\u043D 25 -> 12, \u0410\u041F -15 -> 20."
+ - balance: "\u0421\u043D\u0438\u0436\u0435\u043D\u043E \u043A\u043E\u043B-\u0432\
+ \u043E \u043F\u0430\u0442\u0440\u043E\u043D\u043E\u0432 \u0432 \u043F\u0430\u0432\
+ \u0435\u0440\u043F\u0430\u043A\u0435 \u0441 2000 \u0434\u043E 1000."
+ Helg2:
+ - map: "\u041A\u0435\u0439\u043A\u0430\u0440\u0434 \u0430\u0443\u0442\u0435\u043D\
+ \u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u044B \u0442\u0435\u043F\
+ \u0435\u0440\u044C \u0435\u0441\u0442\u044C \u043D\u0435 \u0442\u043E\u043B\u044C\
+ \u043A\u043E \u043D\u0430 \u043C\u043E\u0441\u0442\u0438\u043A\u0435, \u043D\
+ \u043E \u0438 \u0432 \u043A\u043E\u043C\u043D\u0430\u0442\u0430\u0445 \u043A\
+ \u043E\u043C\u043C\u0430\u043D\u0434\u043E\u0432\u0430\u043D\u0438\u044F."
+ - bugfix: "\u0418\u0441\u043F\u0440\u0430\u0432\u0438\u043B \u0442\u043E \u0447\u0442\
+ \u043E \u0440\u0435\u0446\u0435\u043F\u0442\u044B \u0434\u043B\u044F \u0437\u0430\
+ \u0432\u043E\u0434\u0430 \u0442\u0440\u0435\u0431\u0443\u044E\u0449\u0438\u0435\
+ \ \u0441\u0442\u0435\u043A\u043B\u043E, \u043D\u0435 \u043F\u0440\u0438\u043D\
+ \u0438\u043C\u0430\u043B\u0438 \u0441\u0442\u0435\u043A\u043B\u043E."
+ - balance: "\u0422\u043E\u0447\u043D\u0430\u044F \u0434\u0438\u0441\u0442\u0430\u043D\
+ \u0446\u0438\u044F \u0441\u0442\u0440\u0435\u043B\u044C\u0431\u044B \u0441\u0433\
+ 29 \u043F\u043E\u0434\u043D\u044F\u0442\u0430 \u0441 8 \u0434\u043E 20. \u041F\
+ \u0440\u043E\u0431\u0438\u0442\u0438\u0435 \u043F\u043E\u0434\u043D\u044F\u0442\
+ \u043E \u0441 25 \u0434\u043E 45. \u0417\u0430\u0434\u0435\u0440\u0436\u043A\
+ \u0430 \u043C\u0435\u0436\u0434\u0443 \u0432\u044B\u0441\u0442\u0440\u0435\u043B\
+ \u0430\u043C\u0438 \u0443\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u0430 \u0441\
+ \ 0.2 \u0441\u0435\u043A\u0443\u043D\u0434 \u0434\u043E 0.15."
+ - qol: "\u0418\u0437\u043C\u0435\u043D\u0438\u043B \u0434\u0435\u0444\u043E\u043B\
+ \u0442\u043D\u044B\u0439 \u043A\u0435\u0439\u0431\u0438\u043D\u0434 \u0434\u043B\
+ \u044F \u043F\u0440\u044B\u0436\u043A\u0430 \u0441 \u043F\u0440\u043E\u0431\u0435\
+ \u043B\u0430 \u043D\u0430 V."
+ - bugfix: "\u0418\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441 \u043A\u043D\u043E\
+ \u043F\u043A\u0430 \u0434\u043B\u044F \u0431\u0443\u0441\u0442\u044B \u0442\u0435\
+ \u043F\u0435\u0440\u044C \u043D\u0435 \u0432\u044B\u0431\u0438\u0432\u0430\u0435\
+ \u0442\u0441\u044F \u0438\u0437 \u043E\u0431\u0449\u0435\u0439 \u0442\u0435\u043C\
+ \u044B \u043E\u0441\u0442\u0430\u043B\u044C\u043D\u044B\u0445 \u043A\u043D\u043E\
+ \u043F\u043E\u043A."
+ - rscdel: "\u0423\u0434\u0430\u043B\u0438\u043B \u0410\u0410 \u0443 \u043A\u043B\
+ \u043E\u0443\u043D\u0430."
+ - image: "\u0414\u043E\u0431\u0430\u0432\u0438\u043B \u0437\u0435\u0440\u043A\u0430\
+ \u043B\u0430\u043C \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\
+ \u0435 \u0441\u0442\u043E\u0440\u043E\u043D."
+ homexp13:
+ - rscadd: Added steel crest defender strain
+ "\u041E\u0434\u0438\u043D\u043E\u043A\u0438\u0439 \u0410\u0441\u043A\u0435\u0442":
+ - balance: "\u041C\u0435\u0442\u0430\u0431\u043E\u043B\u0438\u0437\u0430\u0446\u0438\
+ \u044F \u041E\u043A\u0441\u0438\u043A\u043E\u0434\u043E\u043D\u0430 \u043F\u0440\
+ \u0438\u0432\u0435\u0434\u0435\u043D\u0430 \u043A \u0441\u0442\u0430\u043D\u0434\
+ \u0430\u0440\u0442\u043D\u043E\u0439."
+2024-11-30:
+ Basia:
+ - spellcheck: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u0430\u043D\u043E\u043D\
+ \u0441\u043E\u0432 \u043D\u0430 \u0440\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\
+ \u0437\u044B\u043A."
+ - sound: "\u041F\u0435\u0440\u0435\u043E\u0437\u0432\u0443\u0447\u043A\u0430 \u0430\
+ \u043D\u043E\u043D\u0441\u043E\u0432 \u043D\u0430 \u0440\u0443\u0441\u0441\u043A\
+ \u0438\u0439 \u044F\u0437\u044B\u043A."
+ CheBokJam:
+ - bugfix: "\u0411\u043E\u043B\u044C\u0448\u0435 \u0432 \u043A\u0430\u043C\u043D\u0435\
+ \ \u041A\u0438\u043D\u0433\u0430 \u043D\u0435\u043B\u044C\u0437\u044F \u0443\
+ \u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C/\u0441\u043D\u044F\u0442\
+ \u044C \u043B\u044E\u0431\u0443\u044E \u0440\u0430\u0441\u043A\u043B\u0430\u0434\
+ \u044B\u0432\u0430\u0435\u043C\u0443\u044E \u0432\u0435\u0449\u044C."
+ - balance: "\u0417\u0430\u0449\u0438\u0442\u0430 \u043C\u0438\u043C\u0438\u0440\u0430\
+ \ 1 \u043E\u0442 \u043A\u0438\u0441\u043B\u043E\u0442\u044B 5 -> 10, \u0437\u0430\
+ \u0449\u0438\u0442\u0430 \u043E\u0442 \u0433\u0430\u0437\u043E\u0432 \u0441\u043D\
+ \u0438\u0436\u0435\u043D\u0430 \u0432 \u0434\u0432\u0430 \u0440\u0430\u0437\u0430\
+ ."
+ - balance: "\u0417\u0430\u0449\u0438\u0442\u0430 \u043C\u0438\u043C\u0438\u0440\u0430\
+ \ 2 \u043E\u0442 \u043A\u0438\u0441\u043B\u043E\u0442\u044B 10 -> 25."
+ - balance: "\u0421\u043D\u0438\u0436\u0435\u043D\u0438\u0435 \u0443\u0440\u043E\u043D\
+ \u0430 \u043E\u0442 \u043A\u043E\u043B\u043E\u0434\u0446\u0435\u0432 \u0432\
+ \ \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0438 \u043E\u0442\
+ \ \u043D\u0430\u0434\u0435\u0442\u043E\u0433\u043E \u0448\u043B\u0435\u043C\u0430\
+ \ \u0441 \u043C\u0438\u043C\u0438\u0440\u043E\u043C + \u0432\u0435\u0440\u0441\
+ \u0438\u0438 \u043C\u0438\u043C\u0438\u0440\u0430."
+ - balance: "\u0426\u0435\u043D\u0430\u043C \u043C\u0438\u043C\u0438\u0440\u0430\
+ \ 2 \u0432 \u043A\u0430\u0440\u0433\u043E 120 -> 160."
+ Helg2:
+ - rscdel: "\u0423\u0434\u0430\u043B\u0438\u043B \u0437\u0430\u0442\u0435\u043C\u043D\
+ \u0435\u043D\u0438\u0435 \u043F\u0440\u0438 \u044D\u0432\u043E\u043B\u044E\u0446\
+ \u0438\u0438 \u043A\u0441\u0435\u043D\u043E\u0441\u043E\u0432."
+ - bugfix: "\u0418\u0441\u043F\u0440\u0430\u0432\u0438\u043B \u0442\u043E \u0447\u0442\
+ \u043E \u043E\u043F\u043E\u0432\u0435\u0449\u0435\u043D\u0438\u0435 \u043E \u043F\
+ \u043E\u044F\u0432\u043B\u0435\u043D\u0438\u0438 \u043F\u0440\u0430\u0432\u0438\
+ \u0442\u0435\u043B\u044F \u0445\u0430\u0439\u0432\u0430 \u043D\u0435\u043F\u0440\
+ \u0430\u0432\u0438\u043B\u044C\u043D\u043E \u043E\u0442\u043E\u0431\u0440\u0430\
+ \u0436\u0430\u043B\u043E \u0435\u0433\u043E \u0438\u043C\u044F."
+ - rscdel: "\u0423\u0434\u0430\u043B\u0438\u043B \u0431\u0435\u0441\u043F\u043B\u0430\
+ \u0442\u043D\u044B\u0435 \u043A\u0430\u0440\u0433\u043E \u0431\u043E\u0435\u043F\
+ \u0440\u0438\u043F\u0430\u0441\u044B \u0438\u0437 \u043A\u0430\u0440\u0433\u043E\
+ \ \u0432\u0435\u043D\u0434\u043E\u0440\u0430 \u0432\u043E \u0432\u043A\u043B\
+ \u0430\u0434\u043A\u0435 \"Surplus Special Equipment\" (\u0448\u0430\u0445\u0438\
+ \u0434\u043E\u043A)"
+ - bugfix: "\u0418\u0441\u043F\u0440\u0430\u0432\u0438\u043B \u0442\u043E \u0447\u0442\
+ \u043E \u0442\u0430\u0439\u043C\u0435\u0440 \u0441\u043C\u0435\u0440\u0442\u0438\
+ \ \u04224 \u043A\u0441\u0435\u043D\u043E\u0441\u043E\u0432 \u043D\u0435 \u0440\
+ \u0430\u0431\u043E\u0442\u0430\u043B."
+ - code_imp: "\u0410\u0431\u0438\u043B\u043A\u0438 \u0442\u0435\u043F\u0435\u0440\
+ \u044C \u043D\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u044F\u044E\u0442\u0441\
+ \u044F \u043A\u043E\u0433\u0434\u0430 \u043D\u0435 \u043D\u0443\u0436\u043D\u043E\
+ , \u0438 \u043E\u0431\u043D\u043E\u0432\u043B\u044F\u044E\u0442\u0441\u044F\
+ \ \u043A\u043E\u0433\u0434\u0430 \u043D\u0443\u0436\u043D\u043E."
+ - admin: "\u041F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0441\u0442\u0432\u0435\
+ \u043D\u043D\u044B\u0439 \u0430\u0433\u0435\u043D\u0442 \u0442\u0435\u043F\u0435\
+ \u0440\u044C \u0438\u043C\u0435\u0435\u0442 \u043D\u0430\u0443\u0448\u043D\u0438\
+ \u043A."
+ MalorMorfin:
+ - bugfix: "\u0425\u0430\u0439\u0432 \u041C\u0430\u0439\u043D\u0434 \u0431\u043E\u043B\
+ \u044C\u0448\u0435 \u043D\u0435 \u043E\u0441\u0442\u0430\u0432\u043B\u044F\u0435\
+ \u0442 \u043A\u0438\u0441\u043B\u043E\u0442\u043D\u044B\u0439 \u0441\u043B\u0435\
+ \u0434 \u0432 \u043F\u0440\u0438\u0437\u0440\u0430\u0447\u043D\u043E\u0439 \u0444\
+ \u043E\u0440\u043C\u0435."
+ - bugfix: "\u041A\u0441\u0435\u043D\u043E\u043C\u043E\u0440\u0444\u044B \u0432 \u0432\
+ \u0435\u043D\u0442\u0438\u043B\u044F\u0446\u0438\u0438 \u043D\u0435 \u043E\u0441\
+ \u0442\u0430\u0432\u043B\u044F\u044E\u0442 \u043A\u0438\u0441\u043B\u043E\u0442\
+ \u043D\u044B\u0439 \u0441\u043B\u0435\u0434."
diff --git a/html/changelogs/archive/2024-12.yml b/html/changelogs/archive/2024-12.yml
new file mode 100644
index 00000000000..76b297e7405
--- /dev/null
+++ b/html/changelogs/archive/2024-12.yml
@@ -0,0 +1,113 @@
+2024-12-01:
+ Helg2:
+ - image: "\u0414\u043E\u0431\u0430\u0432\u0438\u043B \u0441\u043F\u0440\u0430\u0439\
+ \u0442 \u043E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044E\u0449\u0435\
+ \u0439 \u0431\u0430\u0437\u043E\u0432\u043E\u0439 \u0440\u0430\u043A\u0435\u0442\
+ \u044B."
+ - image: "\u0421\u043F\u0440\u0430\u0439\u0442\u044B \u0434\u043B\u044F \u0431\u043E\
+ \u043B\u044C\u0448\u0438\u043D\u0441\u0442\u0432\u0430 \u0430\u043F, \u0445\u043F\
+ \ \u0438 \u0437\u0430\u0436\u0438\u0433\u0430\u0442\u0435\u043B\u044C\u043D\u044B\
+ \u0445 \u043C\u0430\u0433\u0430\u0437\u0438\u043D\u043E\u0432 \u043F\u0435\u0440\
+ \u0435\u0434\u0435\u043B\u0430\u043D\u044B \u043F\u043E\u0434 \u0433\u0440\u0435\
+ \u0439\u0441\u043A\u0435\u0439\u043B."
+ - code_imp: "\u0420\u0430\u0441\u0441\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\
+ \u043B \u0441\u043F\u0440\u0430\u0439\u0442\u044B \u0430\u043C\u0443\u043D\u0438\
+ \u0446\u0438\u0438 \u043F\u043E \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u044B\
+ \u043C \u0444\u0430\u0439\u043B\u0430\u043C."
+2024-12-02:
+ CheBokJam:
+ - map: "\u041D\u0430 \u0442\u0430\u043B\u043E\u0441 \u0434\u043E\u0431\u0430\u0432\
+ \u043B\u0435\u043D\u044B \u0437\u0430\u0440\u044F\u0434\u043D\u0438\u043A\u0438\
+ \ \u0434\u043B\u044F \u0434\u0435\u0444\u0438\u0431\u0440\u0438\u043B\u043B\u044F\
+ \u0442\u043E\u0440\u043E\u0432: \u0432 \u0431\u0443\u0434\u043A\u0435 \u0443\
+ \u0447\u0451\u043D\u043E\u0433\u043E, \u0432 \u0433\u043B\u0430\u0432\u043D\u043E\
+ \u043C \u0445\u043E\u043B\u0435 \u043C\u0435\u0434 \u043F\u0443\u043D\u043A\u0442\
+ \u0430 \u0438 \u043D\u0430 \u0441\u043A\u043B\u0430\u0434\u0435."
+ MrFloppa:
+ - rscadd: "\u0425\u0430\u0439\u0432\u043C\u0430\u0439\u043D\u0434 \u0442\u0435\u043F\
+ \u0435\u0440\u044C \u043F\u043E\u043D\u0438\u043C\u0430\u0435\u0442 \u044F\u0437\
+ \u044B\u043A \u043C\u0430\u0440\u043E\u0432"
+ mister-onion:
+ - rscadd: "Prime \u0440\u0430\u043D\u0433 \u043A\u0441\u0435\u043D\u043E\u043C\u043E\
+ \u0440\u0444\u043E\u0432 \u0431\u044B\u043B \u0438\u0437\u043C\u0435\u043D\u0435\
+ \u043D \u043D\u0430 Primal."
+ - balance: "\u043A\u0438\u043D\u0433 \u0442\u0435\u043F\u0435\u0440\u044C \u0438\
+ \u043C\u0435\u0435\u0442 \u0438\u043C\u043C\u0443\u043D\u0438\u0442\u0435\u0442\
+ \ \u043A \u043C\u043E\u043B\u043E\u0442\u043A\u0443"
+2024-12-03:
+ Helg2:
+ - bugfix: "\u041F\u0440\u043E\u0434\u0430\u0436\u0430 \u043B\u044E\u0434\u0435\u0439\
+ \ \u0432 \u043A\u0430\u0440\u0433\u043E \u0442\u0435\u043F\u0435\u0440\u044C\
+ \ \u043F\u0440\u0438\u043D\u043E\u0441\u0438\u0442 \u043E\u0447\u043A\u0438\
+ , \u043A\u0430\u043A \u0438 \u0434\u043E\u043B\u0436\u043D\u043E."
+ - bugfix: "\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430 \u043F\u043E\
+ \ \u043F\u0440\u043E\u0434\u0430\u0436\u0435 \u043A\u0441\u0435\u043D\u043E\u0441\
+ \u043E\u0432 \u0432 \u043A\u0430\u0440\u0433\u043E \u0442\u0435\u043F\u0435\u0440\
+ \u044C \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442."
+ - rscadd: "\u0418\u0437 \u0445\u0430\u0433\u0433\u0435\u0440 \u0442\u0443\u0440\u0435\
+ \u043B\u0438 \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E\
+ \ \u043F\u043E\u044F\u0432\u0438\u0442\u044C\u0441\u044F \u0432 \u0440\u043E\
+ \u043B\u0438 \u0440\u0430\u0437\u0443\u043C\u043D\u043E\u0433\u043E \u0445\u0430\
+ \u0433\u0433\u0435\u0440\u0430."
+ - balance: "\u0425\u0430\u0433\u0433\u0435\u0440\u044B \u0438\u0437 \u0445\u0430\
+ \u0433\u0433\u0435\u0440 \u0442\u0443\u0440\u0435\u043B\u0438 \u0442\u0435\u043F\
+ \u0435\u0440\u044C \u043F\u0440\u0438 \u043F\u0440\u044F\u043C\u043E\u043C \u043F\
+ \u043E\u043F\u0430\u0434\u0430\u043D\u0438\u0438 \u043F\u043E \u043C\u043E\u0431\
+ \u0443 \u0441\u0440\u0430\u0437\u0443 \u0436\u0435 \u043A \u043D\u0435\u043C\
+ \u0443 \u0446\u0435\u043F\u043B\u044F\u044E\u0442\u0441\u044F. \u041F\u0440\u0438\
+ \ \u043F\u043E\u043F\u0430\u0434\u0430\u043D\u0438\u0438 \u0432 \u043E\u0431\
+ \u044A\u0435\u043A\u0442/\u0442\u0443\u0440\u0444 \u043E\u043D\u0438 \u0432\u043C\
+ \u0435\u0441\u0442\u043E \u0442\u043E\u0433\u043E \u0447\u0442\u043E\u0431\u044B\
+ \ \u043D\u0430\u0447\u0438\u043D\u0430\u0442\u044C \u0441\u043F\u044F\u0449\u0438\
+ \u043C\u0438, \u0441\u0440\u0430\u0437\u0443 \u044F\u0432\u043B\u044F\u044E\u0442\
+ \u0441\u044F \u0430\u043A\u0442\u0438\u0432\u043D\u044B\u043C\u0438, \u0447\u0442\
+ \u043E \u0443\u043C\u0435\u043D\u044C\u0448\u0430\u0435\u0442 \u0432\u0440\u0435\
+ \u043C\u0435\u043D\u043D\u043E\u0435 \u043E\u043A\u043D\u043E \u0441 3 \u0441\
+ \u0435\u043A\u0443\u043D\u0434 \u0434\u043E 1-\u0443\u0445."
+ - bugfix: "\u0417\u0432\u0443\u043A \u0441\u043C\u0435\u0440\u0442\u0438 \u0442\u0443\
+ \u0440\u0435\u043B\u0438 \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0432\
+ \u043E\u0441\u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0441\
+ \u044F \u043F\u0440\u0438 \u0443\u0434\u0430\u043B\u0435\u043D\u0438\u0438 \u0442\
+ \u0443\u0440\u0435\u043B\u0438."
+ - bugfix: "\u0418\u0441\u043F\u0440\u0430\u0432\u0438\u043B \u0442\u043E \u0447\u0442\
+ \u043E \u0443\u043D\u0438\u0447\u0442\u043E\u0436\u0435\u043D\u0438\u0435 \u0440\
+ \u0435\u0437\u0438\u043D\u043E\u0432\u043E\u0439/\u0445\u0430\u0433\u0433\u0435\
+ \u0440 \u0442\u0443\u0440\u0435\u043B\u0438 \u043D\u0435 \u0432\u044B\u0441\u0442\
+ \u0440\u0435\u043B\u0438\u0432\u0430\u043B\u043E \u043F\u043E\u0434\u0445\u043E\
+ \u0434\u044F\u0449\u0438\u043C\u0438 \u0441\u043D\u0430\u0440\u044F\u0434\u0438\
+ \ \u0432\u043E \u0432\u0441\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B\
+ ."
+ - image: "\u041A\u0441\u0435\u043D\u043E \u0442\u0443\u0440\u0435\u043B\u044F\u043C\
+ \ \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043E\u0442\u043B\u0438\
+ \u0447\u0430\u044E\u0449\u0438\u0435\u0441\u044F \u043E\u0442 \u0434\u0440\u0443\
+ \u0433 \u0434\u0440\u0443\u0433\u0430 \u043E\u0432\u0435\u0440\u043B\u0435\u0438\
+ \ \u0434\u043B\u044F \u0440\u0435\u0433\u0435\u043D\u0430 \u0446\u0435\u043B\
+ \u043E\u0441\u0442\u043D\u043E\u0441\u0442\u0438 \u0441\u0442\u0440\u0443\u043A\
+ \u0442\u0443\u0440\u044B."
+ - code_imp: "\u041A\u0441\u0435\u043D\u043E \u0442\u0443\u0440\u0435\u043B\u0438\
+ \ \u0442\u0435\u043F\u0435\u0440\u044C \u0441\u043A\u0430\u043D\u0438\u0440\u0443\
+ \u044E\u0442 \u043E\u043A\u0440\u0443\u0433\u0443 \u043D\u0430 \u043F\u0440\u0435\
+ \u0434\u043C\u0435\u0442 \u043F\u043E\u0434\u0445\u043E\u0434\u044F\u0449\u0435\
+ \u0439 \u0446\u0435\u043B\u0438 \u043D\u0435 \u0440\u0430\u0437 \u0432 10 \u0441\
+ \u0435\u043A\u0443\u043D\u0434, \u0430 \u043A\u0430\u0436\u0434\u044B\u0439\
+ \ \u0442\u0438\u043A."
+ - code_imp: "\u0424\u0430\u0439\u043B\u044B \u0440\u0430\u0441 \u0438 \u044D\u043C\
+ \u043E\u0446\u0438\u0439 \u043B\u044E\u0434\u0435\u0439 \u0440\u0430\u0441\u0441\
+ \u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u044B \u0432 \u043E\u0442\
+ \u0434\u0435\u043B\u044C\u043D\u044B\u0435 \u043F\u0430\u043F\u043A\u0438."
+ - qol: "\u0414\u043B\u044F \u0441\u043D\u044F\u0442\u0438\u044F \u0445\u0430\u0433\
+ \u0433\u0435\u0440\u0430 \u0441 \u043B\u0438\u0446\u0430 \u0442\u0435\u043F\u0435\
+ \u0440\u044C \u0435\u0441\u0442\u044C \u0441\u043E\u0431\u0441\u0442\u0432\u0435\
+ \u043D\u043D\u043E\u0435 \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0435\u043D\
+ \u0438\u0435."
+ - code_imp: "`getflaticon()` \u043E\u0442\u0432\u0435\u0447\u0430\u044E\u0449\u0438\
+ \u0439 \u0437\u0430 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438 \u0432\
+ \ \u043F\u0440\u0435\u0444. \u043C\u0435\u043D\u044E \u0431\u044B\u043B \u043D\
+ \u0435\u043C\u043D\u043E\u0433\u043E \u043E\u043F\u0442\u0438\u043C\u0438\u0437\
+ \u0438\u0440\u043E\u0432\u0430\u043D."
+ - code_imp: "\u0420\u0430\u0441\u0441\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\
+ \u043B Supply.dm"
+ homexp13:
+ - balance: "\u043C\u0443\u0442\u0430\u0446\u0438\u0438 \u0442\u0435\u043F\u0435\u0440\
+ \u044C \u0441\u043E\u0445\u0440\u0430\u043D\u044F\u044E\u0442\u0441\u044F \u043F\
+ \u0440\u0438 \u044D\u0432\u043E\u043B\u0432\u0435."
diff --git a/icons/Xeno/acidturret.dmi b/icons/Xeno/acidturret.dmi
index eaec2436421..9fd15a13f6a 100644
Binary files a/icons/Xeno/acidturret.dmi and b/icons/Xeno/acidturret.dmi differ
diff --git a/icons/Xeno/actions.dmi b/icons/Xeno/actions.dmi
index 92e37923d6f..d1dd26d3cbc 100644
Binary files a/icons/Xeno/actions.dmi and b/icons/Xeno/actions.dmi differ
diff --git a/icons/Xeno/castes/defender/steel_crest.dmi b/icons/Xeno/castes/defender/steel_crest.dmi
new file mode 100644
index 00000000000..414a578f107
Binary files /dev/null and b/icons/Xeno/castes/defender/steel_crest.dmi differ
diff --git a/icons/effects/progressicons.dmi b/icons/effects/progressicons.dmi
index 659db025d1d..165cd4added 100644
Binary files a/icons/effects/progressicons.dmi and b/icons/effects/progressicons.dmi differ
diff --git a/icons/obj/items/ammo.dmi b/icons/obj/items/ammo.dmi
deleted file mode 100644
index 36fe7d7ebdf..00000000000
Binary files a/icons/obj/items/ammo.dmi and /dev/null differ
diff --git a/icons/obj/items/ammo/box.dmi b/icons/obj/items/ammo/box.dmi
new file mode 100644
index 00000000000..f346d1e21c5
Binary files /dev/null and b/icons/obj/items/ammo/box.dmi differ
diff --git a/icons/obj/items/ammo/energy.dmi b/icons/obj/items/ammo/energy.dmi
new file mode 100644
index 00000000000..a8d52c386b9
Binary files /dev/null and b/icons/obj/items/ammo/energy.dmi differ
diff --git a/icons/obj/items/ammo/flamer.dmi b/icons/obj/items/ammo/flamer.dmi
new file mode 100644
index 00000000000..da271eba147
Binary files /dev/null and b/icons/obj/items/ammo/flamer.dmi differ
diff --git a/icons/obj/items/ammo/handful.dmi b/icons/obj/items/ammo/handful.dmi
new file mode 100644
index 00000000000..46da9d0591f
Binary files /dev/null and b/icons/obj/items/ammo/handful.dmi differ
diff --git a/icons/obj/items/ammo/magazine.dmi b/icons/obj/items/ammo/magazine.dmi
new file mode 100644
index 00000000000..ecc7b1e2e79
Binary files /dev/null and b/icons/obj/items/ammo/magazine.dmi differ
diff --git a/icons/obj/items/ammo/misc.dmi b/icons/obj/items/ammo/misc.dmi
new file mode 100644
index 00000000000..04ccd5b9df6
Binary files /dev/null and b/icons/obj/items/ammo/misc.dmi differ
diff --git a/icons/obj/items/ammo/packet.dmi b/icons/obj/items/ammo/packet.dmi
new file mode 100644
index 00000000000..35411f5bdc6
Binary files /dev/null and b/icons/obj/items/ammo/packet.dmi differ
diff --git a/icons/obj/items/ammo/pistol.dmi b/icons/obj/items/ammo/pistol.dmi
new file mode 100644
index 00000000000..db124563518
Binary files /dev/null and b/icons/obj/items/ammo/pistol.dmi differ
diff --git a/icons/obj/items/ammo/revolver.dmi b/icons/obj/items/ammo/revolver.dmi
new file mode 100644
index 00000000000..fdf1a230b1f
Binary files /dev/null and b/icons/obj/items/ammo/revolver.dmi differ
diff --git a/icons/obj/items/ammo/rocket.dmi b/icons/obj/items/ammo/rocket.dmi
new file mode 100644
index 00000000000..41a4d64c13a
Binary files /dev/null and b/icons/obj/items/ammo/rocket.dmi differ
diff --git a/icons/obj/items/ammo/smg.dmi b/icons/obj/items/ammo/smg.dmi
new file mode 100644
index 00000000000..6ad205e3093
Binary files /dev/null and b/icons/obj/items/ammo/smg.dmi differ
diff --git a/icons/obj/items/ammo/stationary.dmi b/icons/obj/items/ammo/stationary.dmi
new file mode 100644
index 00000000000..2c516c9cd66
Binary files /dev/null and b/icons/obj/items/ammo/stationary.dmi differ
diff --git a/icons/obj/items/ammo/tank.dmi b/icons/obj/items/ammo/tank.dmi
new file mode 100644
index 00000000000..bacaad1cd53
Binary files /dev/null and b/icons/obj/items/ammo/tank.dmi differ
diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi
index c18b9c79d27..571ed69013c 100644
Binary files a/icons/obj/watercloset.dmi and b/icons/obj/watercloset.dmi differ
diff --git a/interface/interface.dm b/interface/interface.dm
index 4c9153c29f5..6691a31ea5c 100644
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -7,12 +7,11 @@
to_chat(src, span_warning("The wiki URL is not set in the server configuration."))
return
- if(alert("This will open the wiki in your browser. Are you sure?", "Wiki", "Yes", "No") != "Yes")
+ if(tgui_alert(src, "This will open the wiki in your browser. Are you sure?", "Wiki", list("Yes", "No"), 0) != "Yes")
return
DIRECT_OUTPUT(src, link(CONFIG_GET(string/wikiurl)))
-
/client/verb/boosty()
set name = "boosty"
set hidden = TRUE
@@ -21,12 +20,11 @@
to_chat(src, span_warning("The donation URL is not set in the server configuration."))
return
- if(alert("This will open the boosty in your browser. Are you sure?", "Forum", "Yes", "No") != "Yes")
+ if(tgui_alert(src, "This will open the boosty in your browser. Are you sure?", "Forum", list("Yes", "No"), 0) != "Yes")
return
DIRECT_OUTPUT(src, link(CONFIG_GET(string/donationurl)))
-
/client/verb/rules()
set name = "rules"
set hidden = TRUE
@@ -35,12 +33,11 @@
to_chat(src, span_warning("The rules URL is not set in the server configuration."))
return
- if(alert("This will open the rules in your browser. Are you sure?", "Rules", "Yes", "No") != "Yes")
+ if(tgui_alert("This will open the rules in your browser. Are you sure?", "Rules", list("Yes", "No"), 0) != "Yes")
return
DIRECT_OUTPUT(src, link(CONFIG_GET(string/rulesurl)))
-
/client/verb/discord()
set name = "discord"
set hidden = TRUE
@@ -49,12 +46,11 @@
to_chat(src, span_warning("The Discord URL is not set in the server configuration."))
return
- if(alert("This will open our Discord in your browser. Are you sure?", "Discord", "Yes", "No") != "Yes")
+ if(tgui_alert(src, "This will open our Discord in your browser. Are you sure?", "Discord", list("Yes", "No"), 0) != "Yes")
return
DIRECT_OUTPUT(src, link(CONFIG_GET(string/discordurl)))
-
/client/verb/github()
set name = "github"
set hidden = TRUE
@@ -63,12 +59,11 @@
to_chat(src, span_warning("The bug tracker URL is not set in the server configuration."))
return
- if(alert("This will open our bug tracker page in your browser. Are you sure?", "Github", "Yes", "No") != "Yes")
+ if(tgui_alert(src, "This will open our bug tracker page in your browser. Are you sure?", "Github", list("Yes", "No"), 0) != "Yes")
return
DIRECT_OUTPUT(src, link(CONFIG_GET(string/githuburl)))
-
/client/verb/webmap()
set name = "webmap"
set hidden = TRUE
@@ -79,7 +74,7 @@
return
var/map_url
- var/choice = alert("Do you want to view the ground or the ship?",,"Ship","Ground","Cancel")
+ var/choice = tgui_alert(src, "Do you want to view the ground or the ship?", "Webmap", list("Ship", "Ground"), 0)
switch(choice)
if("Ship")
map_url = SSmapping.configs[SHIP_MAP].map_file
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 488811298bb..52a7aebd567 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -154,8 +154,8 @@ window "infowindow"
is-vert = false
elem "changelog"
type = BUTTON
- pos = 6,5
- size = 94x20
+ pos = 0,5
+ size = 90x20
anchor1 = 1,0
anchor2 = 16,0
saved-params = "is-checked"
@@ -163,7 +163,7 @@ window "infowindow"
command = "changelog"
elem "discord"
type = BUTTON
- pos = 100,5
+ pos = 90,5
size = 90x20
anchor1 = 16,0
anchor2 = 30,0
@@ -172,7 +172,7 @@ window "infowindow"
command = "discord"
elem "rules"
type = BUTTON
- pos = 190,5
+ pos = 180,5
size = 90x20
anchor1 = 30,0
anchor2 = 44,0
@@ -181,7 +181,7 @@ window "infowindow"
command = "rules"
elem "wiki"
type = BUTTON
- pos = 280,5
+ pos = 270,5
size = 90x20
anchor1 = 44,0
anchor2 = 58,0
@@ -190,7 +190,7 @@ window "infowindow"
command = "wiki"
elem "boosty"
type = BUTTON
- pos = 370,5
+ pos = 360,5
size = 90x20
anchor1 = 58,0
anchor2 = 72,0
@@ -199,7 +199,7 @@ window "infowindow"
command = "boosty"
elem "github"
type = BUTTON
- pos = 460,5
+ pos = 450,5
size = 90x20
anchor1 = 72,0
anchor2 = 86,0
@@ -208,15 +208,14 @@ window "infowindow"
command = "github"
elem "webmap"
type = BUTTON
- pos = 550,5
- size = 90x20
+ pos = 540,5
+ size = 95x20
anchor1 = 86,0
anchor2 = 100,0
saved-params = "is-checked"
text = "Webmap"
command = "webmap"
-
window "outputwindow"
elem "outputwindow"
type = MAIN
diff --git a/sound/AI/aileft.ogg b/sound/AI/aileft.ogg
new file mode 100644
index 00000000000..22a0a1b9c4c
Binary files /dev/null and b/sound/AI/aileft.ogg differ
diff --git a/sound/AI/aireport.ogg b/sound/AI/aireport.ogg
index 82e4ca425de..d1138563403 100644
Binary files a/sound/AI/aireport.ogg and b/sound/AI/aireport.ogg differ
diff --git a/sound/AI/bioscan.ogg b/sound/AI/bioscan.ogg
index 3ab30d73b23..8e28931c3ba 100644
Binary files a/sound/AI/bioscan.ogg and b/sound/AI/bioscan.ogg differ
diff --git a/sound/AI/bonus_climed.ogg b/sound/AI/bonus_climed.ogg
new file mode 100644
index 00000000000..7dbec57a306
Binary files /dev/null and b/sound/AI/bonus_climed.ogg differ
diff --git a/sound/AI/bonus_found.ogg b/sound/AI/bonus_found.ogg
new file mode 100644
index 00000000000..5b9a0c3b018
Binary files /dev/null and b/sound/AI/bonus_found.ogg differ
diff --git a/sound/AI/code_blue_elevated.ogg b/sound/AI/code_blue_elevated.ogg
index d69edbda7b4..4b07b1cc1b1 100644
Binary files a/sound/AI/code_blue_elevated.ogg and b/sound/AI/code_blue_elevated.ogg differ
diff --git a/sound/AI/code_blue_lowered.ogg b/sound/AI/code_blue_lowered.ogg
index bf0a7c9113a..b71d319f2cf 100644
Binary files a/sound/AI/code_blue_lowered.ogg and b/sound/AI/code_blue_lowered.ogg differ
diff --git a/sound/AI/code_delta.ogg b/sound/AI/code_delta.ogg
new file mode 100644
index 00000000000..cf512041518
Binary files /dev/null and b/sound/AI/code_delta.ogg differ
diff --git a/sound/AI/code_green.ogg b/sound/AI/code_green.ogg
index cd4666c9917..8089daea600 100644
Binary files a/sound/AI/code_green.ogg and b/sound/AI/code_green.ogg differ
diff --git a/sound/AI/code_red_elevated.ogg b/sound/AI/code_red_elevated.ogg
index 3b2de8368ff..5def4c50878 100644
Binary files a/sound/AI/code_red_elevated.ogg and b/sound/AI/code_red_elevated.ogg differ
diff --git a/sound/AI/code_red_lowered.ogg b/sound/AI/code_red_lowered.ogg
index 4409d345bac..c2c35050ac9 100644
Binary files a/sound/AI/code_red_lowered.ogg and b/sound/AI/code_red_lowered.ogg differ
diff --git a/sound/AI/commandreport.ogg b/sound/AI/commandreport.ogg
index 9b6bb9bd6e9..4518c1c3d01 100644
Binary files a/sound/AI/commandreport.ogg and b/sound/AI/commandreport.ogg differ
diff --git a/sound/AI/crash_start.ogg b/sound/AI/crash_start.ogg
new file mode 100644
index 00000000000..809203ee67b
Binary files /dev/null and b/sound/AI/crash_start.ogg differ
diff --git a/sound/AI/distress_deny.ogg b/sound/AI/distress_deny.ogg
new file mode 100644
index 00000000000..6954ef89030
Binary files /dev/null and b/sound/AI/distress_deny.ogg differ
diff --git a/sound/AI/distressbeacon.ogg b/sound/AI/distressbeacon.ogg
index 77defb64f82..ae40764c570 100644
Binary files a/sound/AI/distressbeacon.ogg and b/sound/AI/distressbeacon.ogg differ
diff --git a/sound/AI/distressbeacon_none.ogg b/sound/AI/distressbeacon_none.ogg
new file mode 100644
index 00000000000..909c7db38e7
Binary files /dev/null and b/sound/AI/distressbeacon_none.ogg differ
diff --git a/sound/AI/distressbeaconlocked.ogg b/sound/AI/distressbeaconlocked.ogg
new file mode 100644
index 00000000000..a533d16da0c
Binary files /dev/null and b/sound/AI/distressbeaconlocked.ogg differ
diff --git a/sound/AI/distressreceived.ogg b/sound/AI/distressreceived.ogg
index 1f819146c5b..02aef2745cf 100644
Binary files a/sound/AI/distressreceived.ogg and b/sound/AI/distressreceived.ogg differ
diff --git a/sound/AI/dropship_block.ogg b/sound/AI/dropship_block.ogg
new file mode 100644
index 00000000000..d9b429a17f9
Binary files /dev/null and b/sound/AI/dropship_block.ogg differ
diff --git a/sound/AI/dropship_emergency.ogg b/sound/AI/dropship_emergency.ogg
index c8ff2903df9..cc92deedc5f 100644
Binary files a/sound/AI/dropship_emergency.ogg and b/sound/AI/dropship_emergency.ogg differ
diff --git a/sound/AI/dropship_wrong.ogg b/sound/AI/dropship_wrong.ogg
new file mode 100644
index 00000000000..e0b4cec1733
Binary files /dev/null and b/sound/AI/dropship_wrong.ogg differ
diff --git a/sound/AI/evacuate.ogg b/sound/AI/evacuate.ogg
index a0fe44536b9..de440a92428 100644
Binary files a/sound/AI/evacuate.ogg and b/sound/AI/evacuate.ogg differ
diff --git a/sound/AI/evacuate_cancelled.ogg b/sound/AI/evacuate_cancelled.ogg
index ebb74b6d4eb..c1e30c8c5a5 100644
Binary files a/sound/AI/evacuate_cancelled.ogg and b/sound/AI/evacuate_cancelled.ogg differ
diff --git a/sound/AI/evacuation_complete.ogg b/sound/AI/evacuation_complete.ogg
index d611f7c5287..c01eab7c5e8 100644
Binary files a/sound/AI/evacuation_complete.ogg and b/sound/AI/evacuation_complete.ogg differ
diff --git a/sound/AI/evacuation_confirmed.ogg b/sound/AI/evacuation_confirmed.ogg
index a1fccb0ccb4..0de76fe3762 100644
Binary files a/sound/AI/evacuation_confirmed.ogg and b/sound/AI/evacuation_confirmed.ogg differ
diff --git a/sound/AI/hijack.ogg b/sound/AI/hijack.ogg
index 774de641173..c6723229692 100644
Binary files a/sound/AI/hijack.ogg and b/sound/AI/hijack.ogg differ
diff --git a/sound/AI/musical_pause.ogg b/sound/AI/musical_pause.ogg
new file mode 100644
index 00000000000..7dc323594c3
Binary files /dev/null and b/sound/AI/musical_pause.ogg differ
diff --git a/sound/AI/orbit_change.ogg b/sound/AI/orbit_change.ogg
new file mode 100644
index 00000000000..cafda86b579
Binary files /dev/null and b/sound/AI/orbit_change.ogg differ
diff --git a/sound/AI/poweroff.ogg b/sound/AI/poweroff.ogg
index a0617d0f0e7..d334c7e9809 100644
Binary files a/sound/AI/poweroff.ogg and b/sound/AI/poweroff.ogg differ
diff --git a/sound/AI/poweron.ogg b/sound/AI/poweron.ogg
index 2598c1b7560..77b2b619baf 100644
Binary files a/sound/AI/poweron.ogg and b/sound/AI/poweron.ogg differ
diff --git a/sound/AI/selfdestruct.ogg b/sound/AI/selfdestruct.ogg
index 0dc503f865f..9a0efd64d5a 100644
Binary files a/sound/AI/selfdestruct.ogg and b/sound/AI/selfdestruct.ogg differ
diff --git a/sound/AI/selfdestruct_deactivated.ogg b/sound/AI/selfdestruct_deactivated.ogg
index b214440a349..62fb665444d 100644
Binary files a/sound/AI/selfdestruct_deactivated.ogg and b/sound/AI/selfdestruct_deactivated.ogg differ
diff --git a/sound/AI/sup_drop.ogg b/sound/AI/sup_drop.ogg
new file mode 100644
index 00000000000..eb01e3817fa
Binary files /dev/null and b/sound/AI/sup_drop.ogg differ
diff --git a/sound/AI/sup_drop_act.ogg b/sound/AI/sup_drop_act.ogg
new file mode 100644
index 00000000000..ecf8f1b4239
Binary files /dev/null and b/sound/AI/sup_drop_act.ogg differ
diff --git a/sound/AI/sup_drop_enemy.ogg b/sound/AI/sup_drop_enemy.ogg
new file mode 100644
index 00000000000..2170aeeb41b
Binary files /dev/null and b/sound/AI/sup_drop_enemy.ogg differ
diff --git a/sound/AI/supply_increase.ogg b/sound/AI/supply_increase.ogg
new file mode 100644
index 00000000000..861bfb2d42a
Binary files /dev/null and b/sound/AI/supply_increase.ogg differ
diff --git a/sound/effects/OB_warning_announce.ogg b/sound/effects/OB_warning_announce.ogg
index 788a64790f2..540e7d58f51 100644
Binary files a/sound/effects/OB_warning_announce.ogg and b/sound/effects/OB_warning_announce.ogg differ
diff --git a/tgmc.dme b/tgmc.dme
index 76026e5cf25..3419d877925 100644
--- a/tgmc.dme
+++ b/tgmc.dme
@@ -210,6 +210,7 @@
#include "code\_globalvars\lists\client.dm"
#include "code\_globalvars\lists\flavor_misc.dm"
#include "code\_globalvars\lists\hud.dm"
+#include "code\_globalvars\lists\icons.dm"
#include "code\_globalvars\lists\keybinding.dm"
#include "code\_globalvars\lists\mapping.dm"
#include "code\_globalvars\lists\mobs.dm"
@@ -390,6 +391,7 @@
#include "code\datums\actions\skill.dm"
#include "code\datums\actions\weapon_actions.dm"
#include "code\datums\actions\xeno_action.dm"
+#include "code\datums\actions\species_actions\robot_action.dm"
#include "code\datums\actions\species_actions\sectoid_action.dm"
#include "code\datums\autocells\auto_cell.dm"
#include "code\datums\autocells\explosion.dm"
@@ -1619,8 +1621,6 @@
#include "code\modules\mob\living\carbon\update_icons.dm"
#include "code\modules\mob\living\carbon\human\death.dm"
#include "code\modules\mob\living\carbon\human\dummy.dm"
-#include "code\modules\mob\living\carbon\human\emote-yautja.dm"
-#include "code\modules\mob\living\carbon\human\emote.dm"
#include "code\modules\mob\living\carbon\human\examine.dm"
#include "code\modules\mob\living\carbon\human\human.dm"
#include "code\modules\mob\living\carbon\human\human_attackhand.dm"
@@ -1636,10 +1636,13 @@
#include "code\modules\mob\living\carbon\human\login.dm"
#include "code\modules\mob\living\carbon\human\logout.dm"
#include "code\modules\mob\living\carbon\human\say.dm"
-#include "code\modules\mob\living\carbon\human\species.dm"
#include "code\modules\mob\living\carbon\human\update_icons.dm"
#include "code\modules\mob\living\carbon\human\yautja.dm"
#include "code\modules\mob\living\carbon\human\zombie.dm"
+#include "code\modules\mob\living\carbon\human\emote\human.dm"
+#include "code\modules\mob\living\carbon\human\emote\necoarc.dm"
+#include "code\modules\mob\living\carbon\human\emote\robot.dm"
+#include "code\modules\mob\living\carbon\human\emote\yautja.dm"
#include "code\modules\mob\living\carbon\human\life\handle_disabilities.dm"
#include "code\modules\mob\living\carbon\human\life\handle_environment.dm"
#include "code\modules\mob\living\carbon\human\life\handle_fire.dm"
@@ -1649,6 +1652,21 @@
#include "code\modules\mob\living\carbon\human\life\handle_regular_hud_updates.dm"
#include "code\modules\mob\living\carbon\human\life\handle_status_effects.dm"
#include "code\modules\mob\living\carbon\human\life\life_helpers.dm"
+#include "code\modules\mob\living\carbon\human\species\_species.dm"
+#include "code\modules\mob\living\carbon\human\species\early_synthetic.dm"
+#include "code\modules\mob\living\carbon\human\species\hud_data.dm"
+#include "code\modules\mob\living\carbon\human\species\human.dm"
+#include "code\modules\mob\living\carbon\human\species\monkey.dm"
+#include "code\modules\mob\living\carbon\human\species\moth.dm"
+#include "code\modules\mob\living\carbon\human\species\necoarc.dm"
+#include "code\modules\mob\living\carbon\human\species\robot.dm"
+#include "code\modules\mob\living\carbon\human\species\sectoid.dm"
+#include "code\modules\mob\living\carbon\human\species\skeleton.dm"
+#include "code\modules\mob\living\carbon\human\species\synthetic.dm"
+#include "code\modules\mob\living\carbon\human\species\unarmed_attack.dm"
+#include "code\modules\mob\living\carbon\human\species\vatborn.dm"
+#include "code\modules\mob\living\carbon\human\species\vatgrown.dm"
+#include "code\modules\mob\living\carbon\human\species\yautja.dm"
#include "code\modules\mob\living\carbon\xenomorph\abilities.dm"
#include "code\modules\mob\living\carbon\xenomorph\attack_alien.dm"
#include "code\modules\mob\living\carbon\xenomorph\charge_crush.dm"
@@ -1868,9 +1886,12 @@
#include "code\modules\predator\yautja\weapons\one_handed.dm"
#include "code\modules\predator\yautja\weapons\ranged.dm"
#include "code\modules\predator\yautja\weapons\two_handed.dm"
+#include "code\modules\projectiles\ammo_casing.dm"
#include "code\modules\projectiles\ammunition.dm"
+#include "code\modules\projectiles\big_ammo_box.dm"
#include "code\modules\projectiles\gun_helpers.dm"
#include "code\modules\projectiles\gun_system.dm"
+#include "code\modules\projectiles\handful.dm"
#include "code\modules\projectiles\mounted.dm"
#include "code\modules\projectiles\projectile.dm"
#include "code\modules\projectiles\sentries.dm"
@@ -1951,21 +1972,27 @@
#include "code\modules\recycling\recycler.dm"
#include "code\modules\recycling\sortingmachinery.dm"
#include "code\modules\reqs\_supply.dm"
-#include "code\modules\reqs\_supplypacks.dm"
-#include "code\modules\reqs\armor.dm"
-#include "code\modules\reqs\clothing.dm"
-#include "code\modules\reqs\engineering.dm"
-#include "code\modules\reqs\explosives.dm"
-#include "code\modules\reqs\factory.dm"
-#include "code\modules\reqs\imports.dm"
-#include "code\modules\reqs\launchers.dm"
-#include "code\modules\reqs\medical.dm"
-#include "code\modules\reqs\operations.dm"
-#include "code\modules\reqs\smartguns.dm"
-#include "code\modules\reqs\stationary.dm"
-#include "code\modules\reqs\supplies.dm"
-#include "code\modules\reqs\vehicles.dm"
-#include "code\modules\reqs\weapons.dm"
+#include "code\modules\reqs\computer.dm"
+#include "code\modules\reqs\elevator.dm"
+#include "code\modules\reqs\tablet.dm"
+#include "code\modules\reqs\supplypacks\_supplypacks.dm"
+#include "code\modules\reqs\supplypacks\armor.dm"
+#include "code\modules\reqs\supplypacks\clothing.dm"
+#include "code\modules\reqs\supplypacks\engineering.dm"
+#include "code\modules\reqs\supplypacks\explosives.dm"
+#include "code\modules\reqs\supplypacks\factory.dm"
+#include "code\modules\reqs\supplypacks\imports.dm"
+#include "code\modules\reqs\supplypacks\launchers.dm"
+#include "code\modules\reqs\supplypacks\medical.dm"
+#include "code\modules\reqs\supplypacks\operations.dm"
+#include "code\modules\reqs\supplypacks\smartguns.dm"
+#include "code\modules\reqs\supplypacks\stationary.dm"
+#include "code\modules\reqs\supplypacks\supplies.dm"
+#include "code\modules\reqs\supplypacks\vehicles.dm"
+#include "code\modules\reqs\supplypacks\weapons.dm"
+#include "code\modules\reqs\ui\_ui.dm"
+#include "code\modules\reqs\ui\request.dm"
+#include "code\modules\reqs\ui\vehicle.dm"
#include "code\modules\reqtorio\assembly_crafts.dm"
#include "code\modules\reqtorio\craft_components.dm"
#include "code\modules\reqtorio\howtopaper.dm"
diff --git a/tgui/packages/tgui-panel/themes.ts b/tgui/packages/tgui-panel/themes.ts
index a9443a70bfe..74970336782 100644
--- a/tgui/packages/tgui-panel/themes.ts
+++ b/tgui/packages/tgui-panel/themes.ts
@@ -59,6 +59,8 @@ export const setClientTheme = (name) => {
'github.text-color': '#000000',
'webmap.background-color': 'none',
'webmap.text-color': '#000000',
+ 'boosty.background-color': 'none',
+ 'boosty.text-color': '#000000',
// Status and verb tabs
'output.background-color': 'none',
'output.text-color': '#000000',
@@ -113,6 +115,8 @@ export const setClientTheme = (name) => {
'github.text-color': COLOR_DARK_TEXT,
'webmap.background-color': '#494949',
'webmap.text-color': COLOR_DARK_TEXT,
+ 'boosty.background-color': '#494949',
+ 'boosty.text-color': COLOR_DARK_TEXT,
// Status and verb tabs
'output.background-color': COLOR_DARK_BG_DARKER,
'output.text-color': COLOR_DARK_TEXT,
diff --git a/tgui/packages/tgui/interfaces/Changelog.jsx b/tgui/packages/tgui/interfaces/Changelog.jsx
index fc0ec60167c..7ad46b8ff99 100644
--- a/tgui/packages/tgui/interfaces/Changelog.jsx
+++ b/tgui/packages/tgui/interfaces/Changelog.jsx
@@ -26,16 +26,12 @@ const icons = {
expansion: { icon: 'check-circle', color: 'green' },
experiment: { icon: 'radiation', color: 'yellow' },
image: { icon: 'image', color: 'green' },
- imageadd: { icon: 'tg-image-plus', color: 'green' },
- imagedel: { icon: 'tg-image-minus', color: 'red' },
qol: { icon: 'hand-holding-heart', color: 'green' },
refactor: { icon: 'tools', color: 'green' },
rscadd: { icon: 'check-circle', color: 'green' },
rscdel: { icon: 'times-circle', color: 'red' },
server: { icon: 'server', color: 'purple' },
sound: { icon: 'volume-high', color: 'green' },
- soundadd: { icon: 'tg-sound-plus', color: 'green' },
- sounddel: { icon: 'tg-sound-minus', color: 'red' },
map: { icon: 'map', color: 'green' },
spellcheck: { icon: 'spell-check', color: 'green' },
tgs: { icon: 'toolbox', color: 'purple' },
diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php
index 2424cefcf80..47f046c1fa2 100644
--- a/tools/WebhookProcessor/github_webhook_processor.php
+++ b/tools/WebhookProcessor/github_webhook_processor.php
@@ -43,8 +43,8 @@
// Only these repositories will announce in game.
// Any repository that players actually care about.
$game_announce_whitelist = array(
- "tgstation",
- "TerraGov-Marine-Corps",
+ "PMC-Unga-Marines",
+ "Unga-Marines",
);
// Any repository that matches in this blacklist will not appear on Discord.
@@ -187,7 +187,6 @@ function validate_user($payload) {
$res = github_apisend('https://api.github.com/search/issues?q='.$querystring);
$res = json_decode($res, TRUE);
return $res['total_count'] >= (int)$validation_count;
-
}
function get_labels($payload){
@@ -248,6 +247,8 @@ function tag_pr($payload, $opened) {
$tags[] = 'Revert';
if(strpos(strtolower($title), 'removes') !== FALSE)
$tags[] = 'Removal';
+ if(strpos(strtolower($title), 'ports') !== FALSE)
+ $tags[] = 'Port';
}
$remove = array('Test Merge Candidate');
@@ -258,7 +259,7 @@ function tag_pr($payload, $opened) {
else if ($mergeable === FALSE)
$tags[] = 'Merge Conflict';
- $treetags = array('_maps' => 'Map Edit', 'tools' => 'Tools', 'SQL' => 'SQL', '.github' => 'GitHub');
+ $treetags = array('_maps' => 'Mapping', 'tools' => 'Tools', 'SQL' => 'SQL', '.github' => 'GitHub');
$addonlytags = array('icons' => 'Sprites', 'sound' => 'Sound', 'config' => 'Config Update', 'code/controllers/configuration/entries' => 'Config Update', 'tgui' => 'UI');
foreach($treetags as $tree => $tag)
if(has_tree_been_edited($payload, $tree))
@@ -270,7 +271,6 @@ function tag_pr($payload, $opened) {
$tags[] = $tag;
check_tag_and_replace($payload, '[dnm]', 'Do Not Merge', $tags);
- check_tag_and_replace($payload, '[no gbp]', 'GBP: No Update', $tags);
return array($tags, $remove);
}
@@ -709,21 +709,14 @@ function checkchangelog($payload, $compile = true) {
break;
case 'qol':
if($item != 'made something easier to use') {
- $tags[] = 'Quality of Life';
+ $tags[] = 'QoL';
$currentchangelogblock[] = array('type' => 'qol', 'body' => $item);
}
break;
- case 'soundadd':
+ case 'sound':
if($item != 'added a new sound thingy') {
$tags[] = 'Sound';
- $currentchangelogblock[] = array('type' => 'soundadd', 'body' => $item);
- }
- break;
- case 'sounddel':
- if($item != 'removed an old sound thingy') {
- $tags[] = 'Sound';
- $tags[] = 'Removal';
- $currentchangelogblock[] = array('type' => 'sounddel', 'body' => $item);
+ $currentchangelogblock[] = array('type' => 'sound', 'body' => $item);
}
break;
case 'add':
@@ -742,17 +735,10 @@ function checkchangelog($payload, $compile = true) {
$currentchangelogblock[] = array('type' => 'rscdel', 'body' => $item);
}
break;
- case 'imageadd':
+ case 'image':
if($item != 'added some icons and images') {
$tags[] = 'Sprites';
- $currentchangelogblock[] = array('type' => 'imageadd', 'body' => $item);
- }
- break;
- case 'imagedel':
- if($item != 'deleted some icons and images') {
- $tags[] = 'Sprites';
- $tags[] = 'Removal';
- $currentchangelogblock[] = array('type' => 'imagedel', 'body' => $item);
+ $currentchangelogblock[] = array('type' => 'image', 'body' => $item);
}
break;
case 'typo':
@@ -768,6 +754,13 @@ function checkchangelog($payload, $compile = true) {
$currentchangelogblock[] = array('type' => 'balance', 'body' => $item);
}
break;
+ case 'mapping':
+ case 'map':
+ if($item != 'added/modified/removed map content'){
+ $tags[] = 'Mapping';
+ $currentchangelogblock[] = array('type' => 'balance', 'body' => $item);
+ }
+ break;
case 'code_imp':
case 'code':
if($item != 'changed some code'){
diff --git a/tools/WebhookProcessor/secret.php b/tools/WebhookProcessor/secret.php
index 57773bffa16..8e18e728037 100644
--- a/tools/WebhookProcessor/secret.php
+++ b/tools/WebhookProcessor/secret.php
@@ -11,10 +11,10 @@
$apiKey = '209ab8d879c0f987d06a09b9d879c0f987d06a09b9d8787d0a089c';
//The repository auto-updates are sourced from.
-$repoOwnerAndName = "tgstation/tgstation";
+$repoOwnerAndName = "PMC-Unga-Marines/Unga-Marines";
//Whitelist of repository names that have PRs auto-tagged
-$repoAutoTaggerWhitelist = array("tgstation", "TerraGov-Marine-Corps");
+$repoAutoTaggerWhitelist = array("PMC-Unga-Marines", "Unga-Marines");
//Auto update settings
$enable_live_tracking = true; //auto update this file from the repository