[fugitives.len] [fugitives.len == 1 ? "fugitive" : "fugitives"] took refuge on [station_name()]!"
+
+ for(var/datum/antagonist/fugitive/antag in fugitives)
+ if(antag.owner)
+ result += "
[printplayer(antag.owner)]"
+
+ return result.Join("
")
diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm
index be343bb8bc6e9..a33e3e75df13e 100644
--- a/code/modules/antagonists/fugitive/fugitive_outfits.dm
+++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm
@@ -84,12 +84,12 @@
W.registered_name = H.real_name
W.update_label()
-/datum/outfit/frontier/hunter
+/datum/outfit/russiancorpse/hunter
name = "Frontiersman Corpse (Hunter)"
ears = /obj/item/radio/headset
r_hand = /obj/item/gun/ballistic/rifle/boltaction
-/datum/outfit/frontier/hunter/pre_equip(mob/living/carbon/human/H)
+/datum/outfit/russiancorpse/hunter/pre_equip(mob/living/carbon/human/H)
if(prob(50))
head = /obj/item/clothing/head/trapper
@@ -152,3 +152,7 @@
ears = /obj/item/radio/headset
id = /obj/item/card/id
r_hand = /obj/item/storage/firstaid/regular
+
+ backpack_contents = list(
+ /obj/item/bountytrap = 4
+ )
diff --git a/code/modules/antagonists/fugitive/fugitive_ship.dm b/code/modules/antagonists/fugitive/fugitive_ship.dm
new file mode 100644
index 0000000000000..26d8f42e94b92
--- /dev/null
+++ b/code/modules/antagonists/fugitive/fugitive_ship.dm
@@ -0,0 +1,47 @@
+//works similar to the experiment machine (experiment.dm) except it just holds more and more prisoners
+
+/obj/machinery/fugitive_capture
+ name = "bluespace capture machine"
+ desc = "Much, MUCH bigger on the inside to transport prisoners safely."
+ icon = 'icons/obj/machines/research.dmi'
+ icon_state = "bluespace-prison"
+ density = TRUE
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF //ha ha no getting out!!
+
+/obj/machinery/fugitive_capture/examine(mob/user)
+ . = ..()
+ . += "
Add a prisoner by dragging them into the machine."
+
+/obj/machinery/fugitive_capture/MouseDrop_T(mob/target, mob/user)
+ var/mob/living/fugitive_hunter = user
+ if(!isliving(fugitive_hunter))
+ return
+ if(HAS_TRAIT(fugitive_hunter, TRAIT_UI_BLOCKED) || !Adjacent(fugitive_hunter) || !target.Adjacent(fugitive_hunter) || !ishuman(target))
+ return
+ var/mob/living/carbon/human/fugitive = target
+ var/datum/antagonist/fugitive/fug_antag = fugitive.mind.has_antag_datum(/datum/antagonist/fugitive)
+ if(!fug_antag)
+ to_chat(fugitive_hunter, "
This is not a wanted fugitive!")
+ return
+ if(do_after(fugitive_hunter, 50, target = fugitive))
+ add_prisoner(fugitive, fug_antag)
+
+/obj/machinery/fugitive_capture/proc/add_prisoner(mob/living/carbon/human/fugitive, datum/antagonist/fugitive/antag)
+ fugitive.forceMove(src)
+ antag.is_captured = TRUE
+ to_chat(fugitive, "
You are thrown into a vast void of bluespace, and as you fall further into oblivion the comparatively small entrance to reality gets smaller and smaller until you cannot see it anymore. You have failed to avoid capture.")
+ fugitive.ghostize(TRUE) //so they cannot suicide, round end stuff.
+
+/obj/structure/closet/crate/eva
+ name = "EVA crate"
+
+/obj/structure/closet/crate/eva/PopulateContents()
+ ..()
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/suit/space/eva(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/head/helmet/space/eva(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/mask/breath(src)
+ for(var/i in 1 to 3)
+ new /obj/item/tank/internals/oxygen(src)
diff --git a/code/modules/antagonists/fugitive/hunter.dm b/code/modules/antagonists/fugitive/hunter.dm
new file mode 100644
index 0000000000000..090b243e53109
--- /dev/null
+++ b/code/modules/antagonists/fugitive/hunter.dm
@@ -0,0 +1,172 @@
+//The hunters!!
+/datum/antagonist/fugitive_hunter
+ name = "Fugitive Hunter"
+ roundend_category = "Fugitive"
+ silent = TRUE //greet called by the spawn
+ show_in_antagpanel = FALSE
+ prevent_roundtype_conversion = FALSE
+ antag_hud_type = ANTAG_HUD_FUGITIVE
+ antag_hud_name = "fugitive_hunter"
+ var/datum/team/fugitive_hunters/hunter_team
+ var/backstory = "error"
+
+/datum/antagonist/fugitive_hunter/apply_innate_effects(mob/living/mob_override)
+ var/mob/living/M = mob_override || owner.current
+ add_antag_hud(antag_hud_type, antag_hud_name, M)
+
+/datum/antagonist/fugitive_hunter/remove_innate_effects(mob/living/mob_override)
+ var/mob/living/M = mob_override || owner.current
+ remove_antag_hud(antag_hud_type, M)
+
+/datum/antagonist/fugitive_hunter/on_gain()
+ forge_objectives()
+ . = ..()
+
+/datum/antagonist/fugitive_hunter/proc/forge_objectives() //this isn't an actual objective because it's about round end rosters
+ var/datum/objective/capture = new /datum/objective
+ capture.owner = owner
+ capture.explanation_text = "Capture the fugitives in the station and put them into the bluespace capture machine on your ship."
+ objectives += capture
+
+/datum/antagonist/fugitive_hunter/greet()
+ switch(backstory)
+ if("space cop")
+ to_chat(owner, "
Justice has arrived. I am a member of the Spacepol!")
+ to_chat(owner, "
The criminals should be on the station, we have special huds implanted to recognize them.")
+ to_chat(owner, "
As we have lost pretty much all power over these damned lawless megacorporations, it's a mystery if their security will cooperate with us.")
+ if("russian")
+ to_chat(src, "
Ay blyat. I am a space-russian smuggler! We were mid-flight when our cargo was beamed off our ship!")
+ to_chat(src, "
We were hailed by a man in a green uniform, promising the safe return of our goods in exchange for a favor:")
+ to_chat(src, "
There is a local station housing fugitives that the man is after, he wants them returned; dead or alive.")
+ to_chat(src, "
We will not be able to make ends meet without our cargo, so we must do as he says and capture them.")
+
+ to_chat(owner, "
You are not an antagonist in that you may kill whomever you please, but you can do anything to ensure the capture of the fugitives, even if that means going through the station.")
+ owner.announce_objectives()
+
+/datum/antagonist/fugitive_hunter/create_team(datum/team/fugitive_hunters/new_team)
+ if(!new_team)
+ for(var/datum/antagonist/fugitive_hunter/H in GLOB.antagonists)
+ if(!H.owner)
+ continue
+ if(H.hunter_team)
+ hunter_team = H.hunter_team
+ return
+ hunter_team = new /datum/team/fugitive_hunters
+ hunter_team.backstory = backstory
+ hunter_team.update_objectives()
+ return
+ if(!istype(new_team))
+ stack_trace("Wrong team type passed to [type] initialization.")
+ hunter_team = new_team
+
+/datum/antagonist/fugitive_hunter/get_team()
+ return hunter_team
+
+/datum/team/fugitive_hunters
+ var/backstory = "error"
+
+/datum/team/fugitive_hunters/proc/update_objectives(initial = FALSE)
+ objectives = list()
+ var/datum/objective/O = new()
+ O.team = src
+ objectives += O
+
+/datum/team/fugitive_hunters/proc/assemble_fugitive_results()
+ var/list/fugitives_counted = list()
+ var/list/fugitives_dead = list()
+ var/list/fugitives_captured = list()
+ for(var/datum/antagonist/fugitive/A in GLOB.antagonists)
+ if(!A.owner)
+ continue
+ fugitives_counted += A
+ if(A.owner.current.stat == DEAD)
+ fugitives_dead += A
+ if(A.is_captured)
+ fugitives_captured += A
+ . = list(fugitives_counted, fugitives_dead, fugitives_captured) //okay, check out how cool this is.
+
+/datum/team/fugitive_hunters/proc/all_hunters_dead()
+ var/dead_boys = 0
+ for(var/I in members)
+ var/datum/mind/hunter_mind = I
+ if(!(ishuman(hunter_mind.current) || (hunter_mind.current.stat == DEAD)))
+ dead_boys++
+ return dead_boys >= members.len
+
+/datum/team/fugitive_hunters/proc/get_result()
+ var/list/fugitive_results = assemble_fugitive_results()
+ var/list/fugitives_counted = fugitive_results[1]
+ var/list/fugitives_dead = fugitive_results[2]
+ var/list/fugitives_captured = fugitive_results[3]
+ var/hunters_dead = all_hunters_dead()
+ //this gets a little confusing so follow the comments if it helps
+ if(!fugitives_counted.len)
+ return
+ if(fugitives_captured.len)//any captured
+ if(fugitives_captured.len == fugitives_counted.len)//if the hunters captured all the fugitives, there's a couple special wins
+ if(!fugitives_dead)//specifically all of the fugitives alive
+ return FUGITIVE_RESULT_BADASS_HUNTER
+ else if(hunters_dead)//specifically all of the hunters died (while capturing all the fugitives)
+ return FUGITIVE_RESULT_POSTMORTEM_HUNTER
+ else//no special conditional wins, so just the normal major victory
+ return FUGITIVE_RESULT_MAJOR_HUNTER
+ else if(!hunters_dead)//so some amount captured, and the hunters survived.
+ return FUGITIVE_RESULT_HUNTER_VICTORY
+ else//so some amount captured, but NO survivors.
+ return FUGITIVE_RESULT_MINOR_HUNTER
+ else//from here on out, hunters lost because they did not capture any fugitive dead or alive. there are different levels of getting beat though:
+ if(!fugitives_dead)//all fugitives survived
+ return FUGITIVE_RESULT_MAJOR_FUGITIVE
+ else if(fugitives_dead < fugitives_counted)//at least ANY fugitive lived
+ return FUGITIVE_RESULT_FUGITIVE_VICTORY
+ else if(!hunters_dead)//all fugitives died, but none were taken in by the hunters. minor win
+ return FUGITIVE_RESULT_MINOR_FUGITIVE
+ else//all fugitives died, all hunters died, nobody brought back. seems weird to not give fugitives a victory if they managed to kill the hunters but literally no progress to either goal should lead to a nobody wins situation
+ return FUGITIVE_RESULT_STALEMATE
+
+/datum/team/fugitive_hunters/roundend_report() //shows the number of fugitives, but not if they won in case there is no security
+ if(!members.len)
+ return
+
+ var/list/result = list()
+
+ result += "
...And [members.len] [backstory]s tried to hunt them down!"
+
+ for(var/datum/mind/M in members)
+ result += "[printplayer(M)]"
+
+ switch(get_result())
+ if(FUGITIVE_RESULT_BADASS_HUNTER)//use defines
+ result += "Badass [capitalize(backstory)] Victory!"
+ result += "The [backstory]s managed to capture every fugitive, alive!"
+ if(FUGITIVE_RESULT_POSTMORTEM_HUNTER)
+ result += "Postmortem [capitalize(backstory)] Victory!"
+ result += "The [backstory]s managed to capture every fugitive, but all of them died! Spooky!"
+ if(FUGITIVE_RESULT_MAJOR_HUNTER)
+ result += "Major [capitalize(backstory)] Victory"
+ result += "The [backstory]s managed to capture every fugitive, dead or alive."
+ if(FUGITIVE_RESULT_HUNTER_VICTORY)
+ result += "[capitalize(backstory)] Victory"
+ result += "The [backstory]s managed to capture a fugitive, dead or alive."
+ if(FUGITIVE_RESULT_MINOR_HUNTER)
+ result += "Minor [capitalize(backstory)] Victory"
+ result += "All the [backstory]s died, but managed to capture a fugitive, dead or alive."
+ if(FUGITIVE_RESULT_STALEMATE)
+ result += "Bloody Stalemate"
+ result += "Everyone died, and no fugitives were recovered!"
+ if(FUGITIVE_RESULT_MINOR_FUGITIVE)
+ result += "Minor Fugitive Victory"
+ result += "All the fugitives died, but none were recovered!"
+ if(FUGITIVE_RESULT_FUGITIVE_VICTORY)
+ result += "Fugitive Victory"
+ result += "A fugitive survived, and no bodies were recovered by the [backstory]s."
+ if(FUGITIVE_RESULT_MAJOR_FUGITIVE)
+ result += "Major Fugitive Victory"
+ result += "All of the fugitives survived and avoided capture!"
+ else //get_result returned null- either bugged or no fugitives showed
+ result += "Prank Call!"
+ result += "[capitalize(backstory)]s were called, yet there were no fugitives...?"
+
+ result += "
"
+
+ return result.Join("
")
diff --git a/code/modules/antagonists/pirate/pirate.dm b/code/modules/antagonists/pirate/pirate.dm
new file mode 100644
index 0000000000000..91bc063869a7d
--- /dev/null
+++ b/code/modules/antagonists/pirate/pirate.dm
@@ -0,0 +1,108 @@
+/datum/antagonist/pirate
+ name = "Space Pirate"
+ job_rank = ROLE_TRAITOR
+ roundend_category = "space pirates"
+ antagpanel_category = "Pirate"
+ show_to_ghosts = TRUE
+ var/datum/team/pirate/crew
+
+/datum/antagonist/pirate/greet()
+ to_chat(owner, "
You are a Space Pirate!")
+ to_chat(owner, "
The station refused to pay for your protection, protect the ship, siphon the credits from the station and raid it for even more loot.")
+ owner.announce_objectives()
+
+/datum/antagonist/pirate/get_team()
+ return crew
+
+/datum/antagonist/pirate/create_team(datum/team/pirate/new_team)
+ if(!new_team)
+ for(var/datum/antagonist/pirate/P in GLOB.antagonists)
+ if(!P.owner)
+ continue
+ if(P.crew)
+ crew = P.crew
+ return
+ if(!new_team)
+ crew = new /datum/team/pirate
+ crew.forge_objectives()
+ return
+ if(!istype(new_team))
+ stack_trace("Wrong team type passed to [type] initialization.")
+ crew = new_team
+
+/datum/antagonist/pirate/on_gain()
+ if(crew)
+ objectives |= crew.objectives
+ . = ..()
+
+/datum/team/pirate
+ name = "Pirate crew"
+
+/datum/team/pirate/proc/forge_objectives()
+ var/datum/objective/loot/getbooty = new()
+ getbooty.team = src
+ for(var/obj/machinery/computer/piratepad_control/P in GLOB.machines)
+ var/area/A = get_area(P)
+ if(istype(A,/area/shuttle/pirate))
+ getbooty.cargo_hold = P
+ break
+ getbooty.update_explanation_text()
+ objectives += getbooty
+ for(var/datum/mind/M in members)
+ var/datum/antagonist/pirate/P = M.has_antag_datum(/datum/antagonist/pirate)
+ if(P)
+ P.objectives |= objectives
+
+
+/datum/objective/loot
+ var/obj/machinery/computer/piratepad_control/cargo_hold
+ explanation_text = "Acquire valuable loot and store it in designated area."
+ var/target_value = 50000
+
+
+/datum/objective/loot/update_explanation_text()
+ if(cargo_hold)
+ var/area/storage_area = get_area(cargo_hold)
+ explanation_text = "Acquire loot and store [target_value] of credits worth in [storage_area.name] cargo hold."
+
+/datum/objective/loot/proc/loot_listing()
+ //Lists notable loot.
+ if(!cargo_hold || !cargo_hold.total_report)
+ return "Nothing"
+ cargo_hold.total_report.total_value = sortTim(cargo_hold.total_report.total_value, cmp = /proc/cmp_numeric_dsc, associative = TRUE)
+ var/count = 0
+ var/list/loot_texts = list()
+ for(var/datum/export/E in cargo_hold.total_report.total_value)
+ if(++count > 5)
+ break
+ loot_texts += E.total_printout(cargo_hold.total_report,notes = FALSE)
+ return loot_texts.Join(", ")
+
+/datum/objective/loot/proc/get_loot_value()
+ return cargo_hold ? cargo_hold.points : 0
+
+/datum/objective/loot/check_completion()
+ return ..() || get_loot_value() >= target_value
+
+/datum/team/pirate/roundend_report()
+ var/list/parts = list()
+
+ parts += ""
+
+ var/all_dead = TRUE
+ for(var/datum/mind/M in members)
+ if(considered_alive(M))
+ all_dead = FALSE
+ parts += printplayerlist(members)
+
+ parts += "Loot stolen: "
+ var/datum/objective/loot/L = locate() in objectives
+ parts += L.loot_listing()
+ parts += "Total loot value : [L.get_loot_value()]/[L.target_value] credits"
+
+ if(L.check_completion() && !all_dead)
+ parts += "
The pirate crew was successful!"
+ else
+ parts += "
The pirate crew has failed."
+
+ return "
[parts.Join("
")]
"
diff --git a/code/modules/cargo/bounties/medical.dm b/code/modules/cargo/bounties/medical.dm
index 38f1fea999069..5a3982f7df47c 100644
--- a/code/modules/cargo/bounties/medical.dm
+++ b/code/modules/cargo/bounties/medical.dm
@@ -26,7 +26,7 @@
/datum/bounty/item/medical/liver
name = "Livers"
- description = "Multiple high-ranking CentCom diplomats have been hospitalized with liver failure after a recent meeting. Help us out, will you?"
+ description = "Multiple high-ranking CentCom diplomats have been hospitalized with liver failure after a recent meeting with Third Soviet Union ambassadors. Help us out, will you?"
reward = 10000
required_count = 3
wanted_types = list(/obj/item/organ/liver)
diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm
index 33a5ee37be025..9bb96a14be5cb 100644
--- a/code/modules/cargo/packs/ammo.dm
+++ b/code/modules/cargo/packs/ammo.dm
@@ -22,15 +22,6 @@
/obj/item/ammo_box/magazine/m45)
cost = 1500
-/datum/supply_pack/ammo/m45_speedloader
- name = ".45 ACP Speedloader Crate"
- desc = "Contains four .45 ACP speedloaders for revolvers, each containing six rounds."
- contains = list(/obj/item/ammo_box/c45_speedloader,
- /obj/item/ammo_box/c45_speedloader,
- /obj/item/ammo_box/c45_speedloader,
- /obj/item/ammo_box/c45_speedloader)
- cost = 1500
-
/datum/supply_pack/ammo/c38_mag
name = ".38 Speedloader Crate"
desc = "Contains four .38 speedloaders for revolvers, each containing six rounds."
diff --git a/code/modules/cargo/packs/civilian.dm b/code/modules/cargo/packs/civilian.dm
index 953196411f9e7..ed723283814a5 100644
--- a/code/modules/cargo/packs/civilian.dm
+++ b/code/modules/cargo/packs/civilian.dm
@@ -199,7 +199,7 @@
/datum/supply_pack/civilian/carpet_exotic
name = "Exotic Carpet Crate"
- desc = "Exotic carpets for all your decorating needs. Contains 100 tiles each of 8 different flooring patterns."
+ desc = "Exotic carpets straight from Space Russia, for all your decorating needs. Contains 100 tiles each of 8 different flooring patterns."
cost = 3000
contains = list(/obj/item/stack/tile/carpet/blue/fifty,
/obj/item/stack/tile/carpet/blue/fifty,
diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm
index 6ca7158898552..b91fe38e0390b 100644
--- a/code/modules/cargo/packs/gun.dm
+++ b/code/modules/cargo/packs/gun.dm
@@ -39,18 +39,12 @@
/obj/item/gun/ballistic/revolver)
/datum/supply_pack/gun/detrevolver
- name = "Hunter's Pride Detective Revolver crate"
+ name = "Revolver crate"
desc = "Contains two concealable Solarian revolvers, chambered in .38."
cost = 2000
contains = list(/obj/item/gun/ballistic/revolver/detective,
/obj/item/gun/ballistic/revolver/detective)
-/datum/supply_pack/gun/cattlemanrevolver
- name = "Cattleman Revolver crate"
- desc = "Contains two concealable Cattleman revolvers, chambered in .45 ACP."
- cost = 2500
- contains = list(/obj/item/gun/ballistic/revolver/cattleman,
- /obj/item/gun/ballistic/revolver/cattleman)
/*
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 300cbc809cfcf..44710b0fd6fc7 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -137,17 +137,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if(QDELETED(real_src))
return
- //fun fact: Topic() acts like a verb and is executed at the end of the tick like other verbs. So we have to queue it if the server is
- //overloaded
- if(hsrc && hsrc != holder && DEFAULT_TRY_QUEUE_VERB(VERB_CALLBACK(src, .proc/_Topic, hsrc, href, href_list)))
- return
..() //redirect to hsrc.Topic()
-///dumb workaround because byond doesnt seem to recognize the .proc/Topic() typepath for /datum/proc/Topic() from the client Topic,
-///so we cant queue it without this
-/client/proc/_Topic(datum/hsrc, href, list/href_list)
- return hsrc.Topic(href, href_list)
-
/client/proc/is_content_unlocked()
if(!prefs.unlock_content)
to_chat(src, "Become a BYOND member to access member-perks and features, as well as support the engine that makes this game possible. Only 10 bucks for 3 months!
Click Here to find out more.")
@@ -852,7 +843,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
click_intercept_time = 0 //Reset and return. Next click should work, but not this one.
return
click_intercept_time = 0 //Just reset. Let's not keep re-checking forever.
-
var/ab = FALSE
var/list/modifiers = params2list(params)
@@ -866,16 +856,12 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
var/mcl = CONFIG_GET(number/minute_click_limit)
if (!holder && mcl)
var/minute = round(world.time, 600)
-
if (!clicklimiter)
clicklimiter = new(LIMITER_SIZE)
-
if (minute != clicklimiter[CURRENT_MINUTE])
clicklimiter[CURRENT_MINUTE] = minute
clicklimiter[MINUTE_COUNT] = 0
-
- clicklimiter[MINUTE_COUNT] += 1 + (ab)
-
+ clicklimiter[MINUTE_COUNT] += 1+(ab)
if (clicklimiter[MINUTE_COUNT] > mcl)
var/msg = "Your previous click was ignored because you've done too many in a minute."
if (minute != clicklimiter[ADMINSWARNED_AT]) //only one admin message per-minute. (if they spam the admins can just boot/ban them)
@@ -896,22 +882,14 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
var/second = round(world.time, 10)
if (!clicklimiter)
clicklimiter = new(LIMITER_SIZE)
-
if (second != clicklimiter[CURRENT_SECOND])
clicklimiter[CURRENT_SECOND] = second
clicklimiter[SECOND_COUNT] = 0
-
- clicklimiter[SECOND_COUNT] += 1 + (!!ab)
-
+ clicklimiter[SECOND_COUNT] += 1+(!!ab)
if (clicklimiter[SECOND_COUNT] > scl)
- to_chat(src, span_danger("Your previous click was ignored because you've done too many in a second"))
+ to_chat(src, "
Your previous click was ignored because you've done too many in a second")
return
- //check if the server is overloaded and if it is then queue up the click for next tick
- //yes having it call a wrapping proc on the subsystem is fucking stupid glad we agree unfortunately byond insists its reasonable
- if(!QDELETED(object) && TRY_QUEUE_VERB(VERB_CALLBACK(object, /atom/proc/_Click, location, control, params), VERB_OVERTIME_QUEUE_THRESHOLD, SSinput, control))
- return
-
if (prefs.hotkeys)
winset(src, null, "input.focus=false")
else
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 2dc357ad9478b..35960c36bbab6 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -145,7 +145,7 @@
attached_light.update_brightness()
to_chat(user, "
You toggle the helmet light [attached_light.on ? "on":"off"].")
- playsound(user, attached_light.on ? attached_light.toggle_on_sound : attached_light.toggle_off_sound, 100, TRUE)
+ playsound(user, 'sound/weapons/empty.ogg', 100, TRUE)
update_helmlight()
/obj/item/clothing/head/helmet/proc/update_helmlight()
@@ -475,9 +475,17 @@
armor = list("melee" = 20, "bullet" = 10, "laser" = 30, "energy" = 40, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 50)
strip_delay = 60
+/obj/item/clothing/head/helmet/rus_helmet
+ name = "russian helmet"
+ desc = "It can hold a bottle of vodka."
+ icon_state = "rus_helmet"
+ item_state = "rus_helmet"
+ armor = list("melee" = 25, "bullet" = 30, "laser" = 0, "energy" = 10, "bomb" = 10, "bio" = 0, "rad" = 20, "fire" = 20, "acid" = 50)
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/helmet
+
/obj/item/clothing/head/helmet/r_trapper
name = "reinforced trapper hat"
- desc = "An occasional sight on the heads of Frontiersmen stationed on cold worlds. 200% bear."
+ desc = "An occasional sight on the heads of soldiers stationed on cold worlds. 200% bear."
icon_state = "rus_ushanka"
item_state = "rus_ushanka"
body_parts_covered = HEAD
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index c532202a3df37..fc2a3d13e31b4 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -87,3 +87,12 @@
desc = "Worn by robust fighters who are willing to do anything to win."
icon_state = "luchar"
item_state = "luchar"
+
+/obj/item/clothing/mask/russian_balaclava
+ name = "russian balaclava"
+ desc = "Protects your face from snow."
+ icon_state = "rus_balaclava"
+ item_state = "rus_balaclava"
+ flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+ visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
+ w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 1d19f894f3027..c339816c7e684 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -269,6 +269,33 @@
shoes = /obj/item/clothing/shoes/sandal/marisa
head = /obj/item/clothing/head/wizard/marisa
+/datum/outfit/centcom/soviet
+ name = "Soviet Admiral"
+
+ uniform = /obj/item/clothing/under/costume/soviet
+ head = /obj/item/clothing/head/pirate/captain
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/tackler/combat/insulated
+ ears = /obj/item/radio/headset/headset_cent
+ glasses = /obj/item/clothing/glasses/thermal/eyepatch
+ suit = /obj/item/clothing/suit/pirate/captain
+ back = /obj/item/storage/backpack/satchel/leather
+ belt = /obj/item/gun/ballistic/revolver/mateba
+
+ id = /obj/item/card/id/centcom
+
+/datum/outfit/centcom/soviet/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ if(visualsOnly)
+ return
+
+ var/obj/item/card/id/W = H.wear_id
+ W.access = get_all_accesses()
+ W.access += get_centcom_access("Admiral")
+ W.assignment = "Admiral"
+ W.registered_name = H.real_name
+ W.update_label()
+ ..()
+
/datum/outfit/mobster
name = "Mobster"
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 90e9248fbe6c9..2d5301844c98a 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -374,6 +374,14 @@
active = FALSE
set_light_on(active)
+/obj/item/clothing/shoes/russian
+ name = "russian boots"
+ desc = "Comfy shoes."
+ icon_state = "rus_shoes"
+ item_state = "rus_shoes"
+ pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes
+ lace_time = 8 SECONDS
+
/obj/item/clothing/shoes/cowboy
name = "cowboy boots"
desc = "A small sticker lets you know they've been inspected for snakes, It is unclear how long ago the inspection took place..."
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 4ea59b14384a8..fbe1eceb1f65d 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -317,6 +317,23 @@
resistance_flags = FLAMMABLE
armor = list("melee" = 20, "bullet" = 10, "laser" = 30, "energy" = 40, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 40, "acid" = 50)
+/obj/item/clothing/suit/armor/vest/russian
+ name = "russian vest"
+ desc = "A bulletproof vest with forest camo. Good thing there's plenty of forests to hide in around here, right?"
+ icon_state = "armor_camo"
+ item_state = "rus_armor"
+ armor = list("melee" = 25, "bullet" = 30, "laser" = 0, "energy" = 10, "bomb" = 10, "bio" = 0, "rad" = 20, "fire" = 20, "acid" = 50)
+
+/obj/item/clothing/suit/armor/vest/russian_coat
+ name = "russian battle coat"
+ desc = "Used in extremly cold fronts, made out of real bears."
+ icon_state = "armor_coat"
+ item_state = "rus_coat"
+ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+ armor = list("melee" = 25, "bullet" = 20, "laser" = 20, "energy" = 30, "bomb" = 20, "bio" = 50, "rad" = 20, "fire" = -10, "acid" = 50)
+
/obj/item/clothing/suit/armor/hos/inteq
name = "inteq battle coat"
desc = "A luxurious brown coat made from a crossweave of kevlar and ballistic fibre, the collar and wrist trims are made from genuine wolf fur. as protective as it is stylish."
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 466e75b012f73..1a020e40623cc 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -331,6 +331,13 @@
flags_cover = HEADCOVERSEYES
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+/obj/item/clothing/suit/security/officer/russian
+ name = "\improper Russian officer's jacket"
+ desc = "This jacket is for those special occasions when a russian officer isn't required to wear their armor."
+ icon_state = "officertanjacket"
+ item_state = "officertanjacket"
+ body_parts_covered = CHEST|ARMS
+
/obj/item/clothing/suit/shrine_maiden
name = "shrine maiden's outfit"
desc = "Makes you want to exterminate some troublesome youkai."
diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm
index bfc7524149cb9..e0ac5f17275e1 100644
--- a/code/modules/clothing/under/costume.dm
+++ b/code/modules/clothing/under/costume.dm
@@ -54,6 +54,13 @@
item_state = "pirate"
can_adjust = FALSE
+/obj/item/clothing/under/costume/soviet
+ name = "soviet uniform"
+ desc = "For the Motherland!"
+ icon_state = "soviet"
+ item_state = "soviet"
+ can_adjust = FALSE
+
/obj/item/clothing/under/costume/kilt
name = "kilt"
desc = "Includes shoes and plaid."
@@ -189,6 +196,19 @@
icon_state = "blue_mech_suit"
item_state = "blue_mech_suit"
+/obj/item/clothing/under/costume/russian_officer
+ name = "\improper Russian officer's uniform"
+ desc = "The latest in fashionable russian outfits."
+ icon = 'icons/obj/clothing/under/security.dmi'
+ icon_state = "hostanclothes"
+ item_state = "hostanclothes"
+ mob_overlay_icon = 'icons/mob/clothing/under/security.dmi'
+ alt_covers_chest = TRUE
+ armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
+ strip_delay = 50
+ sensor_mode = SENSOR_COORDS
+ random_sensor = FALSE
+
/obj/item/clothing/under/costume/jackbros
name = "jack bros outfit"
desc = "For when it's time to hee some hos."
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index 30b47b4c3287f..c1ae9679effb6 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -70,6 +70,14 @@
item_state = "g_suit"
can_adjust = FALSE
+/obj/item/clothing/under/syndicate/soviet
+ name = "Ratnik 5 tracksuit"
+ desc = "Badly translated labels tell you to clean this in Vodka. Great for squatting in."
+ icon_state = "trackpants"
+ can_adjust = FALSE
+ armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ resistance_flags = NONE
+
/obj/item/clothing/under/syndicate/combat
name = "combat uniform"
desc = "With a suit lined with this many pockets, you are ready to operate."
diff --git a/code/modules/events/fugitive_spawning.dm b/code/modules/events/fugitive_spawning.dm
new file mode 100644
index 0000000000000..8cf2953102821
--- /dev/null
+++ b/code/modules/events/fugitive_spawning.dm
@@ -0,0 +1,112 @@
+/datum/round_event_control/fugitives
+ name = "Spawn Fugitives"
+ typepath = /datum/round_event/ghost_role/fugitives
+ max_occurrences = 1
+ min_players = 20
+ earliest_start = 30 MINUTES //deadchat sink, lets not even consider it early on.
+ gamemode_blacklist = list("nuclear")
+
+/datum/round_event/ghost_role/fugitives
+ minimum_required = 1
+ role_name = "fugitive"
+ fakeable = FALSE
+
+/datum/round_event/ghost_role/fugitives/spawn_role()
+ var/list/possible_spawns = list()//Some xeno spawns are in some spots that will instantly kill the refugees, like atmos
+ for(var/turf/X in GLOB.xeno_spawn)
+ if(istype(X.loc, /area/ship/maintenance))
+ possible_spawns += X
+ if(!possible_spawns.len)
+ message_admins("No valid spawn locations found, aborting...")
+ return MAP_ERROR
+ var/turf/landing_turf = pick(possible_spawns)
+ var/list/possible_backstories = list()
+ var/list/candidates = get_candidates(ROLE_TRAITOR, null, ROLE_TRAITOR)
+ if(candidates.len >= 1) //solo refugees
+ if(prob(30))
+ possible_backstories.Add("waldo") //less common as it comes with magicks and is kind of immershun shattering
+ else //For accurate deadchat feedback
+ minimum_required = 4
+ if(candidates.len >= 4)//group refugees
+ possible_backstories.Add("prisoner", "cultist", "synth")
+ if(!possible_backstories.len)
+ return NOT_ENOUGH_PLAYERS
+
+ var/backstory = pick(possible_backstories)
+ var/member_size = 3
+ var/leader
+ switch(backstory)
+ if("synth")
+ leader = pick_n_take(candidates)
+ if("waldo")
+ member_size = 0 //solo refugees have no leader so the member_size gets bumped to one a bit later
+ var/list/members = list()
+ var/list/spawned_mobs = list()
+ if(isnull(leader))
+ member_size++ //if there is no leader role, then the would be leader is a normal member of the team.
+
+ for(var/i in 1 to member_size)
+ members += pick_n_take(candidates)
+
+ for(var/mob/dead/selected in members)
+ var/mob/living/carbon/human/S = gear_fugitive(selected, landing_turf, backstory)
+ spawned_mobs += S
+ if(!isnull(leader))
+ gear_fugitive_leader(leader, landing_turf, backstory)
+
+//after spawning
+ playsound(src, 'sound/weapons/emitter.ogg', 50, TRUE)
+ new /obj/item/storage/toolbox/mechanical(landing_turf) //so they can actually escape maint
+ addtimer(CALLBACK(src, .proc/spawn_hunters), 10 MINUTES)
+ role_name = "fugitive hunter"
+ return SUCCESSFUL_SPAWN
+
+/datum/round_event/ghost_role/fugitives/proc/gear_fugitive(mob/dead/selected, turf/landing_turf, backstory) //spawns normal fugitive
+ var/datum/mind/player_mind = new /datum/mind(selected.key)
+ player_mind.active = TRUE
+ var/mob/living/carbon/human/S = new(landing_turf)
+ player_mind.transfer_to(S)
+ player_mind.assigned_role = "Fugitive"
+ player_mind.special_role = "Fugitive"
+ player_mind.add_antag_datum(/datum/antagonist/fugitive)
+ var/datum/antagonist/fugitive/fugitiveantag = player_mind.has_antag_datum(/datum/antagonist/fugitive)
+ INVOKE_ASYNC(fugitiveantag, /datum/antagonist/fugitive.proc/greet, backstory) //some fugitives have a sleep on their greet, so we don't want to stop the entire antag granting proc with fluff
+
+ switch(backstory)
+ if("prisoner")
+ S.equipOutfit(/datum/outfit/prisoner)
+ if("cultist")
+ S.equipOutfit(/datum/outfit/yalp_cultist)
+ if("waldo")
+ S.equipOutfit(/datum/outfit/waldo)
+ if("synth")
+ S.equipOutfit(/datum/outfit/synthetic)
+ message_admins("[ADMIN_LOOKUPFLW(S)] has been made into a Fugitive by an event.")
+ log_game("[key_name(S)] was spawned as a Fugitive by an event.")
+ spawned_mobs += S
+ return S
+
+//special spawn for one member. it can be used for a special mob or simply to give one normal member special items.
+/datum/round_event/ghost_role/fugitives/proc/gear_fugitive_leader(mob/dead/leader, turf/landing_turf, backstory)
+ var/datum/mind/player_mind = new /datum/mind(leader.key)
+ player_mind.active = TRUE
+ //if you want to add a fugitive with a special leader in the future, make this switch with the backstory
+ var/mob/living/carbon/human/S = gear_fugitive(leader, landing_turf, backstory)
+ var/obj/item/choice_beacon/augments/A = new(S)
+ S.put_in_hands(A)
+ new /obj/item/autosurgeon(landing_turf)
+
+//security team gets called in after 10 minutes of prep to find the refugees
+/datum/round_event/ghost_role/fugitives/proc/spawn_hunters()
+ var/backstory = pick( "russian", "bounty hunter")
+ var/datum/map_template/shuttle/template
+ if (backstory == "russian")
+ template = new /datum/map_template/shuttle/hunter/russian
+ else
+ template = new /datum/map_template/shuttle/hunter/bounty
+
+ var/datum/overmap/ship/controlled/ship = new(SSovermap.get_unused_overmap_square(), template)
+
+ if(!ship)
+ CRASH("Loading [backstory] ship failed!")
+ priority_announce("Unidentified ship detected near the station.")
diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm
index f38d21b868c40..f1a36affcd3b4 100644
--- a/code/modules/events/holiday/xmas.dm
+++ b/code/modules/events/holiday/xmas.dm
@@ -49,13 +49,15 @@
var/festive_tree = /obj/structure/flora/tree/pine/xmas
var/christmas_tree = /obj/structure/flora/tree/pine/xmas/presents
-/obj/effect/spawner/xmastree/Initialize(mapload)
- . = ..()
+/obj/effect/spawner/xmastree/Initialize()
+ ..()
if((CHRISTMAS in SSevents.holidays) && christmas_tree)
new christmas_tree(get_turf(src))
else if((FESTIVE_SEASON in SSevents.holidays) && festive_tree)
new festive_tree(get_turf(src))
+ return INITIALIZE_HINT_QDEL
+
/obj/effect/spawner/xmastree/rdrod
name = "festivus pole spawner"
festive_tree = /obj/structure/festivus
diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm
new file mode 100644
index 0000000000000..186922c76a8f9
--- /dev/null
+++ b/code/modules/events/pirates.dm
@@ -0,0 +1,324 @@
+/datum/round_event_control/pirates
+ name = "Space Pirates"
+ typepath = /datum/round_event/pirates
+ weight = 8
+ max_occurrences = 1
+ min_players = 10
+ earliest_start = 30 MINUTES
+ gamemode_blacklist = list("nuclear")
+
+/datum/round_event/pirates
+ startWhen = 60 //2 minutes to answer
+ var/datum/comm_message/threat
+ var/payoff = 0
+ var/payoff_min = 20000
+ var/paid_off = FALSE
+ var/ship_name = "Space Privateers Association"
+ var/shuttle_spawned = FALSE
+
+/datum/round_event/pirates/setup()
+ ship_name = pick(strings(PIRATE_NAMES_FILE, "ship_names"))
+
+/datum/round_event/pirates/announce(fake)
+ priority_announce("Incoming subspace communication. Secure channel opened at all communication consoles.", "Incoming Message", 'sound/ai/commandreport.ogg')
+ if(fake)
+ return
+ threat = new
+ var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
+ if(D)
+ payoff = max(payoff_min, FLOOR(D.account_balance * 0.80, 1000))
+ threat.title = "Business proposition"
+ threat.content = "This is [ship_name]. Pay up [payoff] credits or you'll walk the plank."
+ threat.possible_answers = list("We'll pay.","No way.")
+ threat.answer_callback = CALLBACK(src,.proc/answered)
+ SScommunications.send_message(threat,unique = TRUE)
+
+/datum/round_event/pirates/proc/answered()
+ if(threat && threat.answered == 1)
+ var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
+ if(D)
+ if(D.adjust_money(-payoff))
+ priority_announce("Thanks for the credits, landlubbers.",sender_override = ship_name)
+ paid_off = TRUE
+ return
+ else
+ priority_announce("Trying to cheat us? You'll regret this!",sender_override = ship_name)
+ if(!shuttle_spawned)
+ spawn_shuttle()
+ else
+ priority_announce("Too late to beg for mercy!",sender_override = ship_name)
+
+/datum/round_event/pirates/start()
+ if(threat && !threat.answered)
+ threat.possible_answers = list("Too late")
+ threat.answered = 1
+ if(!paid_off && !shuttle_spawned)
+ spawn_shuttle()
+
+/datum/round_event/pirates/proc/spawn_shuttle()
+ shuttle_spawned = TRUE
+
+ var/list/candidates = pollGhostCandidates("Do you wish to be considered for pirate crew?", ROLE_TRAITOR)
+ shuffle_inplace(candidates)
+
+ var/datum/map_template/shuttle/pirate/default/template = new
+ var/datum/overmap/ship/controlled/ship = new(SSovermap.get_unused_overmap_square(), template)
+
+ if(!ship)
+ CRASH("Loading pirate ship failed!")
+
+ for(var/turf/A in ship.shuttle_port.return_turfs())
+ for(var/obj/effect/mob_spawn/human/pirate/spawner in A)
+ if(candidates.len > 0)
+ var/mob/M = candidates[1]
+ spawner.create(M.ckey)
+ candidates -= M
+ announce_to_ghosts(M)
+ else
+ announce_to_ghosts(spawner)
+
+ priority_announce("Unidentified armed ship detected near the station.")
+
+/obj/docking_port/mobile/pirate
+ name = "pirate shuttle"
+ rechargeTime = 3 MINUTES
+
+/obj/machinery/suit_storage_unit/pirate
+ suit_type = /obj/item/clothing/suit/space
+ helmet_type = /obj/item/clothing/head/helmet/space
+ mask_type = /obj/item/clothing/mask/breath
+ storage_type = /obj/item/tank/internals/oxygen
+
+/obj/machinery/loot_locator
+ name = "Booty Locator"
+ desc = "This sophisticated machine scans the nearby space for items of value."
+ icon = 'icons/obj/machines/research.dmi'
+ icon_state = "tdoppler"
+ density = TRUE
+ var/cooldown = 300
+ var/next_use = 0
+
+/obj/machinery/loot_locator/interact(mob/user)
+ if(world.time <= next_use)
+ to_chat(user,"
[src] is recharging.")
+ return
+ next_use = world.time + cooldown
+ var/atom/movable/AM = find_random_loot()
+ if(!AM)
+ say("No valuables located. Try again later.")
+ else
+ say("Located: [AM.name] at [get_area_name(AM)]")
+
+/obj/machinery/loot_locator/proc/find_random_loot()
+ if(!GLOB.exports_list.len)
+ setupExports()
+ var/list/possible_loot = list()
+ for(var/datum/export/pirate/E in GLOB.exports_list)
+ possible_loot += E
+ var/datum/export/pirate/P
+ var/atom/movable/AM
+ while(!AM && possible_loot.len)
+ P = pick_n_take(possible_loot)
+ AM = P.find_loot()
+ return AM
+
+//Pad & Pad Terminal
+/obj/machinery/piratepad
+ name = "cargo hold pad"
+ icon = 'icons/obj/telescience.dmi'
+ icon_state = "lpad-idle-o"
+ var/idle_state = "lpad-idle-o"
+ var/warmup_state = "lpad-idle"
+ var/sending_state = "lpad-beam"
+ var/cargo_hold_id
+
+/obj/machinery/piratepad/multitool_act(mob/living/user, obj/item/multitool/I)
+ . = ..()
+ if (istype(I))
+ to_chat(user, "
You register [src] in [I]s buffer.")
+ I.buffer = src
+ return TRUE
+
+/obj/machinery/computer/piratepad_control
+ name = "cargo hold control terminal"
+ icon_screen = "bounty"
+ var/status_report = "Ready for delivery."
+ var/obj/machinery/piratepad/pad
+ var/warmup_time = 100
+ var/sending = FALSE
+ var/points = 0
+ var/datum/export_report/total_report
+ var/sending_timer
+ var/cargo_hold_id
+
+/obj/machinery/computer/piratepad_control/Initialize()
+ ..()
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/computer/piratepad_control/multitool_act(mob/living/user, obj/item/multitool/I)
+ . = ..()
+ if (istype(I) && istype(I.buffer,/obj/machinery/piratepad))
+ to_chat(user, "
You link [src] with [I.buffer] in [I] buffer.")
+ pad = I.buffer
+ return TRUE
+
+/obj/machinery/computer/piratepad_control/LateInitialize()
+ . = ..()
+ if(cargo_hold_id)
+ for(var/obj/machinery/piratepad/P in GLOB.machines)
+ if(P.cargo_hold_id == cargo_hold_id)
+ pad = P
+ return
+ else
+ pad = locate() in range(4,src)
+
+/obj/machinery/computer/piratepad_control/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "CargoHoldTerminal", name)
+ ui.open()
+
+/obj/machinery/computer/piratepad_control/ui_data(mob/user)
+ var/list/data = list()
+ data["points"] = points
+ data["pad"] = pad ? TRUE : FALSE
+ data["sending"] = sending
+ data["status_report"] = status_report
+ return data
+
+/obj/machinery/computer/piratepad_control/ui_act(action, params)
+ . = ..()
+ if(.)
+ return
+ if(!pad)
+ return
+
+ switch(action)
+ if("recalc")
+ recalc()
+ . = TRUE
+ if("send")
+ start_sending()
+ . = TRUE
+ if("stop")
+ stop_sending()
+ . = TRUE
+
+/obj/machinery/computer/piratepad_control/proc/recalc()
+ if(sending)
+ return
+
+ status_report = "Predicted value: "
+ var/value = 0
+ var/datum/export_report/ex = new
+ for(var/atom/movable/AM in get_turf(pad))
+ if(AM == pad)
+ continue
+ export_item_and_contents(AM, EXPORT_PIRATE | EXPORT_CARGO | EXPORT_CONTRABAND | EXPORT_EMAG, apply_elastic = FALSE, dry_run = TRUE, external_report = ex)
+
+ for(var/datum/export/E in ex.total_amount)
+ status_report += E.total_printout(ex,notes = FALSE)
+ status_report += " "
+ value += ex.total_value[E]
+
+ if(!value)
+ status_report += "0"
+
+/obj/machinery/computer/piratepad_control/proc/send()
+ if(!sending)
+ return
+
+ var/datum/export_report/ex = new
+
+ for(var/atom/movable/AM in get_turf(pad))
+ if(AM == pad)
+ continue
+ export_item_and_contents(AM, EXPORT_PIRATE | EXPORT_CARGO | EXPORT_CONTRABAND | EXPORT_EMAG, apply_elastic = FALSE, delete_unsold = FALSE, external_report = ex)
+
+ status_report = "Sold: "
+ var/value = 0
+ for(var/datum/export/E in ex.total_amount)
+ var/export_text = E.total_printout(ex,notes = FALSE) //Don't want nanotrasen messages, makes no sense here.
+ if(!export_text)
+ continue
+
+ status_report += export_text
+ status_report += " "
+ value += ex.total_value[E]
+
+ if(!total_report)
+ total_report = ex
+ else
+ total_report.exported_atoms += ex.exported_atoms
+ for(var/datum/export/E in ex.total_amount)
+ total_report.total_amount[E] += ex.total_amount[E]
+ total_report.total_value[E] += ex.total_value[E]
+
+ points += value
+
+ if(!value)
+ status_report += "Nothing"
+
+ pad.visible_message("
[pad] activates!")
+ flick(pad.sending_state,pad)
+ pad.icon_state = pad.idle_state
+ sending = FALSE
+
+/obj/machinery/computer/piratepad_control/proc/start_sending()
+ if(sending)
+ return
+ sending = TRUE
+ status_report = "Sending..."
+ pad.visible_message("
[pad] starts charging up.")
+ pad.icon_state = pad.warmup_state
+ sending_timer = addtimer(CALLBACK(src,.proc/send),warmup_time, TIMER_STOPPABLE)
+
+/obj/machinery/computer/piratepad_control/proc/stop_sending()
+ if(!sending)
+ return
+ sending = FALSE
+ status_report = "Ready for delivery."
+ pad.icon_state = pad.idle_state
+ deltimer(sending_timer)
+
+/datum/export/pirate
+ export_category = EXPORT_PIRATE
+
+//Attempts to find the thing on station
+/datum/export/pirate/proc/find_loot()
+ return
+
+/datum/export/pirate/ransom
+ cost = 3000
+ unit_name = "hostage"
+ export_types = list(/mob/living/carbon/human)
+
+/datum/export/pirate/ransom/get_cost(atom/movable/AM)
+ var/mob/living/carbon/human/H = AM
+ if(H.stat != CONSCIOUS || !H.mind || !H.mind.assigned_role) //mint condition only
+ return 0
+ else if("pirate" in H.faction) //can't ransom your fellow pirates to CentCom!
+ return 0
+ else
+ if(H.mind.assigned_role in GLOB.command_positions)
+ return 3000
+ else
+ return 1000
+
+/datum/export/pirate/cash
+ cost = 1
+ unit_name = "bills"
+ export_types = list(/obj/item/spacecash/bundle)
+
+/datum/export/pirate/cash/get_amount(obj/O)
+ var/obj/item/spacecash/bundle/C = O
+ return ..() * C.value
+
+/datum/export/pirate/holochip
+ cost = 1
+ unit_name = "holochip"
+ export_types = list(/obj/item/holochip)
+
+/datum/export/pirate/holochip/get_cost(atom/movable/AM)
+ var/obj/item/holochip/H = AM
+ return H.credits
diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm
index c906bd170e862..4d65e0cea0f65 100644
--- a/code/modules/fishing/fish/_fish.dm
+++ b/code/modules/fishing/fish/_fish.dm
@@ -33,7 +33,7 @@
/// What type of reagent this fish needs to be fed.
var/food = /datum/reagent/consumable/nutriment
/// How often the fish needs to be fed
- var/feeding_frequency = 20 MINUTES
+ var/feeding_frequency = 5 MINUTES
/// Time of last feedeing
var/last_feeding
@@ -265,10 +265,10 @@
var/health_change_per_second = 0
if(!proper_environment())
health_change_per_second -= 3 //Dying here
- if(world.time - last_feeding <= feeding_frequency)
- health_change_per_second += 0.5 //Slowly healing
+ if(world.time - last_feeding >= feeding_frequency)
+ health_change_per_second -= 0.5 //Starving
else
- return
+ health_change_per_second += 0.5 //Slowly healing
adjust_health(health + health_change_per_second)
/obj/item/fish/proc/adjust_health(amt)
@@ -291,8 +291,6 @@
return
if(length(aquarium.tracked_fish) >= AQUARIUM_MAX_BREEDING_POPULATION) //so aquariums full of fish don't need to do these expensive checks
return
- if(world.time - last_feeding >= feeding_frequency)
- return
var/list/other_fish_of_same_type = list()
for(var/obj/item/fish/fish_in_aquarium in aquarium)
if(fish_in_aquarium == src || fish_in_aquarium.type != type)
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 8db4c2846dcb2..06c2b28e903c1 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -772,6 +772,4 @@
return ..()
/obj/item/reagent_containers/food/drinks/ration/pan_genezan_vodka
- name = "Pan-Genezan vodka"
- desc = "Vodka made from the finest potatoes."
- list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 15)
+ list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 30)
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index d002c8aab70c6..77de6fddcad7f 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -179,13 +179,13 @@
/obj/item/reagent_containers/food/drinks/bottle/vodka
name = "Tunguska triple distilled"
- desc = "Vodka, prime choice of drink and fuel."
+ desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide."
icon_state = "vodkabottle"
list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100)
/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka
name = "Badminka vodka"
- desc = "The label's written in some unknown language. All you can make out is the name and a word that looks vaguely like 'Vodka'."
+ desc = "The label's written in Cyrillic. All you can make out is the name and a word that looks vaguely like 'Vodka'."
icon_state = "badminka"
list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100)
diff --git a/code/modules/food_and_drinks/food/ration.dm b/code/modules/food_and_drinks/food/ration.dm
index b74db1f0ccb72..ab6c72d555166 100644
--- a/code/modules/food_and_drinks/food/ration.dm
+++ b/code/modules/food_and_drinks/food/ration.dm
@@ -33,6 +33,7 @@
to_chat(user, "
You tear open \the [src].")
playsound(user.loc, 'sound/effects/rip3.ogg', 50)
reagents.flags |= OPENCONTAINER
+ spillable = TRUE
desc += "\nIt's been opened."
update_overlays()
@@ -51,8 +52,6 @@
/obj/item/reagent_containers/food/snacks/ration/microwave_act(obj/machinery/microwave/Heater)
if (cookable == FALSE)
..()
- else if (cooked == TRUE)
- ..()
else
name = "warm [initial(name)]"
bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
@@ -61,7 +60,7 @@
/obj/item/reagent_containers/food/snacks/ration/examine(mob/user)
. = ..()
if(cookable && !cooked)
- . += "
It can be cooked in a microwave or warmed using a flameless ration heater."
+ . += "It can be cooked in a microwave or warmed using a flameless ration heater.\n"
/obj/item/reagent_containers/food/snacks/ration/entree
icon_state = "ration_main"
@@ -80,71 +79,6 @@
icon_state = "ration_bar"
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sugar = 2)
-/obj/item/reagent_containers/food/snacks/ration/condiment
- name = "condiment pack"
- desc = "Just your average condiment pacl."
- icon_state = "ration_condi"
- volume = 10
- amount_per_transfer_from_this = 10
- possible_transfer_amounts = list()
-
-/obj/item/reagent_containers/food/snacks/ration/condiment/attack(mob/living/M, mob/user, def_zone)
- if (!is_drainable())
- to_chat(user, "
[src] is sealed shut!")
- return 0
- else
- to_chat(user, "
[src] cant be eaten like that!")
- return 0
-
-/obj/item/reagent_containers/food/snacks/ration/condiment/afterattack(obj/target, mob/user , proximity)
- . = ..()
- if(!is_drainable())
- to_chat(user, "
[src] is sealed shut!")
- return
- if(!proximity)
- return
- //You can tear the bag open above food to put the condiments on it, obviously.
- if(istype(target, /obj/item/reagent_containers/food/snacks))
- if(target.reagents.total_volume >= target.reagents.maximum_volume)
- to_chat(user, "
[target] is too full!" )
- return
- else
- to_chat(user, "
You tear open [src] above [target] and the condiments drip onto it.")
- src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
- qdel(src)
-
-/obj/item/reagent_containers/food/snacks/ration/pack
- name = "powder pack"
- desc = "Mix into a bottle of water and shake."
- icon_state = "ration_condi"
- volume = 10
- amount_per_transfer_from_this = 10
- possible_transfer_amounts = list()
-
-/obj/item/reagent_containers/food/snacks/ration/pack/attack(mob/living/M, mob/user, def_zone)
- if (!is_drainable())
- to_chat(user, "
[src] is sealed shut!")
- return 0
- else
- to_chat(user, "
[src] cant be eaten like that!")
- return 0
-
-/obj/item/reagent_containers/food/snacks/ration/pack/afterattack(obj/target, mob/user , proximity)
- . = ..()
- if(!is_drainable())
- to_chat(user, "
[src] is sealed shut!")
- return
- if(!proximity)
- return
- if(istype(target, /obj/item/reagent_containers))
- if(target.reagents.total_volume >= target.reagents.maximum_volume)
- to_chat(user, "
[target] is too full!" )
- return
- else
- to_chat(user, "
You pour the [src] into [target] and shake.")
- src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
- qdel(src)
-
/obj/item/reagent_containers/food/snacks/ration/entree/vegan_chili
name = "vegan chili with beans"
desc = "A hearty and flavorful vegan chili made with beans. It's so delicious, you won't believe it's not meat!"
@@ -284,7 +218,6 @@
filling_color = "#ffcc00"
tastes = list("cheese" = 1, "pizza" = 1)
foodtype = GRAIN | DAIRY
-
/obj/item/reagent_containers/food/snacks/ration/side/vegan_crackers
name = "vegetable 'crackers'"
desc = "Delicious vegetable-based crackers that are the perfect crunchy and nutritious snack."
@@ -344,7 +277,6 @@
filling_color = "#e6e600"
tastes = list("garlic" = 1, "potatoes" = 1)
foodtype = GRAIN | VEGETABLES
- cookable = TRUE
/obj/item/reagent_containers/food/snacks/ration/side/soup_crackers
name = "soup crackers"
@@ -359,7 +291,6 @@
filling_color = "#b82121"
tastes = list("mushrooms" = 1, "chili" = 1)
foodtype = VEGETABLES | MEAT
- cookable = TRUE
/obj/item/reagent_containers/food/snacks/ration/side/white_sandwich_bread
name = "white sandwich bread"
@@ -388,15 +319,13 @@
filling_color = "#99cc00"
tastes = list("asparagus" = 1, "butter" = 1)
foodtype = VEGETABLES
- cookable = TRUE
/obj/item/reagent_containers/food/snacks/ration/side/broth_tuna_rice
- name = "bone broth with tuna and rice"
+ name = "broth with tuna and rice"
desc = "A warm and comforting broth with tender tuna and rice, offering a nourishing and satisfying meal."
filling_color = "#669999"
tastes = list("broth" = 1, "tuna" = 1, "rice" = 1)
foodtype = MEAT | GRAIN
- cookable = TRUE
/obj/item/reagent_containers/food/snacks/ration/side/trail_crackers
name = "trail crackers"
@@ -406,12 +335,11 @@
foodtype = GRAIN | FRUIT
/obj/item/reagent_containers/food/snacks/ration/side/hash_brown_bacon
- name = "hash brown potatoes with bacon, peppers and onions"
+ name = "hash brown with bacon"
desc = "Crispy hash brown paired with savory bacon, creating a satisfying and indulgent snack option."
filling_color = "#ffcc00"
tastes = list("hash brown" = 1, "bacon" = 1)
foodtype = GRAIN | MEAT
- cookable = TRUE
/obj/item/reagent_containers/food/snacks/ration/side/granola_milk_blueberries
name = "granola with milk and blueberries"
@@ -433,7 +361,6 @@
filling_color = "#ffcc00"
tastes = list("au gratin potatoes" = 1)
foodtype = GRAIN | DAIRY | VEGETABLES
- cookable = TRUE
/obj/item/reagent_containers/food/snacks/ration/side/applesauce_carb_enhanced
name = "carb-enhanced applesauce"
@@ -483,7 +410,6 @@
filling_color = "#663300"
tastes = list("crackers" = 1)
foodtype = GRAIN
-
/obj/item/reagent_containers/food/snacks/ration/side/barbecue_fried_pork_rinds
name = "barbecue fried pork rinds"
desc = "Crispy and flavorful fried pork rinds coated in a savory barbecue seasoning, creating a satisfying snack option."
@@ -525,7 +451,6 @@
filling_color = "#e2a054"
tastes = list("chocolate" = 1, "pastry" = 1, "sweet" = 1)
foodtype = SUGAR | GRAIN | JUNKFOOD | BREAKFAST
- cookable = TRUE
/obj/item/reagent_containers/food/snacks/ration/snack/dried_raisins
name = "dried raisins"
@@ -730,6 +655,33 @@
tastes = list("chocolate" = 1)
foodtype = SUGAR
+/obj/item/reagent_containers/food/snacks/ration/condiment
+ name = "condiment bottle"
+ desc = "Just your average condiment bottle."
+ icon_state = "ration_condi"
+ volume = 10
+ amount_per_transfer_from_this = 10
+ possible_transfer_amounts = list()
+
+/obj/item/reagent_containers/food/snacks/ration/condiment/afterattack(obj/target, mob/user , proximity)
+ . = ..()
+ if(!is_drainable())
+ to_chat(user, "
The [src] is sealed shut!")
+ return
+ if(!proximity)
+ return
+
+ //You can tear the bag open above food to put the condiments on it, obviously.
+ if(istype(target, /obj/item/reagent_containers/food/snacks))
+ if(target.reagents.total_volume >= target.reagents.maximum_volume)
+ to_chat(user, "
You tear open [src], but [target] is stacked so high that it just drips off!" )
+ qdel(src)
+ return
+ else
+ to_chat(user, "
You tear open [src] above [target] and the condiments drip onto it.")
+ src.reagents.trans_to(target, amount_per_transfer_from_this, transfered_by = user)
+ qdel(src)
+
/obj/item/reagent_containers/food/snacks/ration/condiment/cheese_spread
name = "cheese spread pack"
list_reagents = list(/datum/reagent/consumable/cheese_spread = 8)
@@ -758,58 +710,58 @@
name = "maple syrup pack"
list_reagents = list(/datum/reagent/consumable/sugar = 10)
-/obj/item/reagent_containers/food/snacks/ration/pack/chocolate_protein_beverage
+/obj/item/reagent_containers/food/snacks/ration/condiment/chocolate_protein_beverage
name = "chocolate hazelnut protein drink powder pack"
list_reagents = list(/datum/reagent/consumable/coco = 5, /datum/reagent/consumable/eggyolk = 5)
-/obj/item/reagent_containers/food/snacks/ration/pack/fruit_beverage
+/obj/item/reagent_containers/food/snacks/ration/condiment/fruit_beverage
name = "fruit punch beverage powder, carb-electrolyte pack"
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/applejuice = 2, /datum/reagent/consumable/orangejuice = 2)
-/obj/item/reagent_containers/food/snacks/ration/pack/fruit_smoothie_beverage
+/obj/item/reagent_containers/food/snacks/ration/condiment/fruit_smoothie_beverage
name = "tropical blend fruit and vegetable smoothie powder pack"
list_reagents = list(/datum/reagent/consumable/pineapplejuice = 3, /datum/reagent/consumable/orangejuice = 3, /datum/reagent/consumable/eggyolk = 3)
-/obj/item/reagent_containers/food/snacks/ration/pack/grape_beverage
+/obj/item/reagent_containers/food/snacks/ration/condiment/grape_beverage
name = "grape beverage powder, carb-fortified pack"
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/grapejuice = 5)
-/obj/item/reagent_containers/food/snacks/ration/pack/grape_beverage_sugar_free
+/obj/item/reagent_containers/food/snacks/ration/condiment/grape_beverage_sugar_free
name = "sugar-free grape beverage base powder"
list_reagents = list(/datum/reagent/consumable/grapejuice = 10)
-/obj/item/reagent_containers/food/snacks/ration/pack/lemonade_beverage
+/obj/item/reagent_containers/food/snacks/ration/condiment/lemonade_beverage
name = "lemonade drink powder pack"
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/lemonjuice = 5)
-/obj/item/reagent_containers/food/snacks/ration/pack/lemonade_beverage_suger_free
+/obj/item/reagent_containers/food/snacks/ration/condiment/lemonade_beverage_suger_free
name = "lemonade sugar-free beverage base pack"
list_reagents = list(/datum/reagent/consumable/lemonjuice = 10)
-/obj/item/reagent_containers/food/snacks/ration/pack/orange_beverage
+/obj/item/reagent_containers/food/snacks/ration/condiment/orange_beverage
name = "orange beverage powder, carb-fortified pack"
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/orangejuice = 5)
-/obj/item/reagent_containers/food/snacks/ration/pack/orange_beverage_sugar_free
+/obj/item/reagent_containers/food/snacks/ration/condiment/orange_beverage_sugar_free
name = "orange beverage base, sugar-free pack"
list_reagents = list(/datum/reagent/consumable/orangejuice = 10)
-/obj/item/reagent_containers/food/snacks/ration/pack/cherry_beverage
+/obj/item/reagent_containers/food/snacks/ration/condiment/cherry_beverage
name = "cherry high-energy beverage powder pack"
list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/cherryjelly = 5)
-/obj/item/reagent_containers/food/snacks/ration/pack/pineapple_beverage
+/obj/item/reagent_containers/food/snacks/ration/condiment/pineapple_beverage
name = "pinapple fruit beverage base pack"
list_reagents = list(/datum/reagent/consumable/pineapplejuice = 10)
-/obj/item/reagent_containers/food/snacks/ration/pack/freeze_dried_coffee_orange
+/obj/item/reagent_containers/food/snacks/ration/condiment/freeze_dried_coffee_orange
name = "freeze-dried coffee flavored with orange pack"
list_reagents = list(/datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/orangejuice = 3)
-/obj/item/reagent_containers/food/snacks/ration/pack/freeze_dried_coffee_chocolate
+/obj/item/reagent_containers/food/snacks/ration/condiment/freeze_dried_coffee_chocolate
name = "freeze-dried coffee flavored with chocolate pack"
list_reagents = list(/datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/coco = 3)
-/obj/item/reagent_containers/food/snacks/ration/pack/freeze_dried_coffee_hazelnut
+/obj/item/reagent_containers/food/snacks/ration/condiment/freeze_dried_coffee_hazelnut
name = "freeze-dried coffee flavored with hazelnut pack"
list_reagents = list(/datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/coco = 3)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
index 5736d187fc785..ba728daf7797b 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
@@ -362,7 +362,6 @@
/obj/item/ration_heater
name = "flameless ration heater"
- desc = "A magnisium based ration heater. It can be used to heat up entrees and other food items. reaches the same temperature as a microwave with half the volume."
icon = 'icons/obj/food/ration.dmi'
icon_state = "ration_package"
grind_results = list(/datum/reagent/iron = 10, /datum/reagent/water = 10, /datum/reagent/consumable/sodiumchloride = 5)
@@ -383,7 +382,7 @@
RegisterSignal(tocook, COMSIG_PARENT_QDELETING, PROC_REF(clear_cooking))
target.add_overlay(ration_overlay)
addtimer(CALLBACK(src, .proc/cook), 100)
- target.visible_message("
\The [target] rapidly begins cooking...")
+ visible_message("
\The [target] rapidly begins cooking...")
playsound(src, 'sound/items/cig_light.ogg', 50, 1)
moveToNullspace()
@@ -392,27 +391,22 @@
UnregisterSignal(tocook, COMSIG_PARENT_QDELETING)
tocook.cut_overlay(ration_overlay)
tocook = null
-
/obj/item/ration_heater/proc/cook()
- if(!QDELETED(tocook))
- var/cookturf = get_turf(tocook)
- tocook.visible_message("
\The [src] lets out a final hiss...")
- playsound(tocook, 'sound/items/cig_snuff.ogg', 50, 1)
- if(istype(tocook, /obj/item/reagent_containers/food) || istype(tocook, /obj/item/grown))
- tocook.visible_message("
\The [tocook] is done warming up!")
- tocook.microwave_act()
- if(!QDELETED(tocook))
- clear_cooking()
- if(uses == 0)
- qdel()
- else
- uses--
- src.forceMove(cookturf)
+ var/cookturf = get_turf(tocook)
+ tocook.visible_message("
\The [tocook] is done warming up!")
+ playsound(tocook, 'sound/items/cig_snuff.ogg', 50, 1)
+ if(istype(tocook, /obj/item/reagent_containers/food) || istype(tocook, /obj/item/grown))
+ clear_cooking()
+ tocook.microwave_act()
+ if(uses == 0)
+ qdel()
+ else
+ uses--
+ src.forceMove(cookturf)
/obj/item/ration_heater/examine(mob/user)
. = ..()
. += "It has [uses] uses left..."
- . += "
Examine rations to see which ones can be microwaved."
#undef MICROWAVE_NORMAL
#undef MICROWAVE_MUCK
diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm
index c7a911b6cf3f3..ea07e2f70b272 100644
--- a/code/modules/holodeck/computer.dm
+++ b/code/modules/holodeck/computer.dm
@@ -183,7 +183,7 @@ and clear when youre done! if you dont i will use :newspaper2: on you
var/turf/possible_blacklist = _turf
if (possible_blacklist.holodeck_compatible)
continue
- input_blacklist[possible_blacklist] = TRUE
+ input_blacklist += possible_blacklist
///loads the template whose id string it was given ("offline_program" loads datum/map_template/holodeck/offline)
/obj/machinery/computer/holodeck/proc/load_program(map_id, force = FALSE, add_delay = TRUE)
diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
index 42be4234f7f6b..bf8bf6cd80861 100644
--- a/code/modules/jobs/job_types/captain.dm
+++ b/code/modules/jobs/job_types/captain.dm
@@ -57,29 +57,11 @@
shoes = /obj/item/clothing/shoes/laceup
head = /obj/item/clothing/head/caphat/nt
-/datum/outfit/job/captain/nt/heron
- name = "Captain (Nanotrasen)"
-
- uniform = /obj/item/clothing/under/rank/centcom/officer
- head = /obj/item/clothing/head/centhat
- suit = /obj/item/clothing/suit/armor/vest/bulletproof
-
-/datum/outfit/job/captain/solgov
- name = "Captain (SolGov)"
-
- ears = /obj/item/radio/headset/solgov/captain
- shoes = /obj/item/clothing/shoes/laceup
- suit = /obj/item/clothing/suit/toggle/solgov
-
-/datum/outfit/job/captain/solgov/rebel
- name = "Captain (Deserter)"
- suit = /obj/item/clothing/suit/toggle/solgov/terragov
-
/datum/outfit/job/captain/pirate
name = "Captain (Pirate)"
ears = /obj/item/radio/headset/pirate/captain
- uniform = /obj/item/clothing/under/costume/pirate
+ uniform = /obj/item/clothing/under/costume/russian_officer
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/pirate/captain
suit = /obj/item/clothing/suit/pirate/captain
diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm
index 76d49f4b0f4d0..50386243d0a21 100644
--- a/code/modules/jobs/job_types/chief_engineer.dm
+++ b/code/modules/jobs/job_types/chief_engineer.dm
@@ -115,13 +115,6 @@
courierbag = /obj/item/storage/backpack/messenger/inteq
-/datum/outfit/job/ce/nt
- name = "Chief Engineer (NT)"
-
- head = /obj/item/clothing/head/beret/ce
- belt = /obj/item/storage/belt/utility/full
- suit = /obj/item/clothing/suit/hazardvest
-
/datum/outfit/job/ce/frontiersmen
name = "Head Carpenter (Frontiersmen)"
diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm
index 2e97961b7fcb7..d75ff460c7509 100644
--- a/code/modules/jobs/job_types/head_of_personnel.dm
+++ b/code/modules/jobs/job_types/head_of_personnel.dm
@@ -65,7 +65,7 @@
/datum/outfit/job/head_of_personnel/pirate
name = "First Mate (Pirate)"
ears = /obj/item/radio/headset/pirate
- uniform = /obj/item/clothing/under/costume/pirate
+ uniform = /obj/item/clothing/under/costume/russian_officer
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/pirate
suit = /obj/item/clothing/suit/pirate
@@ -140,11 +140,3 @@
glasses = /obj/item/clothing/glasses/sunglasses
suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
-/datum/outfit/job/head_of_personnel/pilot/heron
- name = "pilot"
-
- uniform = /obj/item/clothing/under/rank/security/officer/military
- suit = /obj/item/clothing/suit/jacket/leather/duster
- glasses = /obj/item/clothing/glasses/hud/spacecop
- accessory = /obj/item/clothing/accessory/holster
- head = /obj/item/clothing/head/beret/lt
diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm
index d842f57edf372..2543d1caa8523 100644
--- a/code/modules/jobs/job_types/roboticist.dm
+++ b/code/modules/jobs/job_types/roboticist.dm
@@ -36,13 +36,3 @@
ears = /obj/item/radio/headset/minutemen
suit = /obj/item/clothing/suit/toggle/labcoat/science
-/datum/outfit/job/roboticist/heron
- name = "Mech Technician (Nanotrasen)"
-
- uniform = /obj/item/clothing/under/rank/rnd/roboticist
- suit = /obj/item/clothing/suit/longcoat/robowhite
- ears = /obj/item/radio/headset/nanotrasen
- glasses = /obj/item/clothing/glasses/welding
-
- backpack_contents = list(/obj/item/weldingtool/hugetank)
-
diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm
index 781e6f360dc5d..8207bdb85bbe7 100644
--- a/code/modules/jobs/job_types/security_officer.dm
+++ b/code/modules/jobs/job_types/security_officer.dm
@@ -226,52 +226,6 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
uniform = /obj/item/clothing/under/rank/security/officer/nt
alt_uniform = null
- backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
-
-/datum/outfit/job/security/nanotrasen/ert
- name = "ERT Officer (Nanotrasen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/camo
- head = null
- backpack = /obj/item/storage/backpack/ert/security
- belt = /obj/item/storage/belt/military
- id = /obj/item/card/id/ert/security
- r_pocket = /obj/item/kitchen/knife/combat/survival
- backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
-
-/datum/outfit/job/security/nanotrasen/ert/engi
- name = "ERT Engineering Officer (Nanotrasen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/camo
- head = null
- backpack = /obj/item/storage/backpack/ert/engineer
- belt = /obj/item/storage/belt/utility/full/ert
- id = /obj/item/card/id/ert/security
- r_pocket = /obj/item/kitchen/knife/combat/survival
- backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
- accessory = /obj/item/clothing/accessory/armband/engine
- glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
-
-/datum/outfit/job/security/nanotrasen/ert/med
- name = "ERT Medical Officer (Nanotrasen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/camo
- head = /obj/item/clothing/head/beret/med
- backpack = /obj/item/storage/backpack/ert/medical
- belt = /obj/item/storage/belt/medical/webbing/paramedic
- id = /obj/item/card/id/ert/security
- r_pocket = /obj/item/kitchen/knife/combat/survival
- backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
- accessory = /obj/item/clothing/accessory/armband/med
- glasses = /obj/item/clothing/glasses/hud/health/night
-
-/datum/outfit/job/security/nanotrasen/mech_pilot
- name = "Mech Pilot (Nanotrasen)"
-
- uniform = /obj/item/clothing/under/rank/security/officer/military/eng
- head = /obj/item/clothing/head/beret/sec/officer
- suit = /obj/item/clothing/suit/armor/vest/bulletproof
- backpack_contents = list(/obj/item/radio, /obj/item/flashlight/seclite)
/datum/outfit/job/security/roumain
name = "Hunter (Saint-Roumain Militia)"
diff --git a/code/modules/keybindings/bindings_atom.dm b/code/modules/keybindings/bindings_atom.dm
index 8f2a4433db659..47d6b16feb5ef 100644
--- a/code/modules/keybindings/bindings_atom.dm
+++ b/code/modules/keybindings/bindings_atom.dm
@@ -16,6 +16,3 @@
if((movement_dir & EAST) && (movement_dir & WEST))
movement_dir &= ~(EAST|WEST)
user.Move(get_step(src, movement_dir), movement_dir)
- return !!movement_dir //true if there was actually any player input
-
- return FALSE
diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm
index 61570535cbbf5..1f42ec4247064 100644
--- a/code/modules/language/language_holder.dm
+++ b/code/modules/language/language_holder.dm
@@ -55,7 +55,7 @@ Key procs
/// Initializes, and copies in the languages from the current atom if available.
/datum/language_holder/New(atom/_owner)
if(_owner && QDELETED(_owner))
- CRASH("Langauge holder added to a qdeleting thing, what the fuck [text_ref(_owner)]")
+ CRASH("Langauge holder added to a qdeleting thing, what the fuck \ref[_owner]")
owner = _owner
if(istype(owner, /datum/mind))
var/datum/mind/M = owner
diff --git a/code/modules/language/mouse.dm b/code/modules/language/mouse.dm
index 98dcd9133c749..8e488c93e5acf 100644
--- a/code/modules/language/mouse.dm
+++ b/code/modules/language/mouse.dm
@@ -4,7 +4,7 @@
speech_verb = "squeaks"
ask_verb = "squeaks"
exclaim_verb = "squeaks"
- key = "l"
+ key = "m"
flags = NO_STUTTER | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD | LANGUAGE_HIDE_ICON_IF_UNDERSTOOD
/datum/language/mouse/scramble(input)
diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
index b3f5b1078b201..39d443929e217 100644
--- a/code/modules/mapping/map_template.dm
+++ b/code/modules/mapping/map_template.dm
@@ -159,7 +159,6 @@
var/list/turf_blacklist = list()
update_blacklist(T, turf_blacklist)
- UNSETEMPTY(turf_blacklist)
parsed.turf_blacklist = turf_blacklist
if(!parsed.load(T.x, T.y, T.z, cropMap=TRUE, no_changeturf=(SSatoms.initialized == INITIALIZATION_INSSATOMS), placeOnTop=should_place_on_top))
return
diff --git a/code/modules/mapping/preloader.dm b/code/modules/mapping/preloader.dm
index 59480159f1c88..4b61663f668e1 100644
--- a/code/modules/mapping/preloader.dm
+++ b/code/modules/mapping/preloader.dm
@@ -1,7 +1,6 @@
// global datum that will preload variables on atoms instanciation
GLOBAL_VAR_INIT(use_preloader, FALSE)
-GLOBAL_LIST_INIT(_preloader_attributes, null)
-GLOBAL_LIST_INIT(_preloader_path, null)
+GLOBAL_DATUM_INIT(_preloader, /datum/map_preloader, new)
/// Preloader datum
/datum/map_preloader
@@ -12,14 +11,15 @@ GLOBAL_LIST_INIT(_preloader_path, null)
/world/proc/preloader_setup(list/the_attributes, path)
if(the_attributes.len)
GLOB.use_preloader = TRUE
- GLOB._preloader_attributes = the_attributes
- GLOB._preloader_path = path
+ var/datum/map_preloader/preloader_local = GLOB._preloader
+ preloader_local.attributes = the_attributes
+ preloader_local.target_path = path
/world/proc/preloader_load(atom/what)
GLOB.use_preloader = FALSE
- var/list/attributes = GLOB._preloader_attributes
- for(var/attribute in attributes)
- var/value = attributes[attribute]
+ var/datum/map_preloader/preloader_local = GLOB._preloader
+ for(var/attribute in preloader_local.attributes)
+ var/value = preloader_local.attributes[attribute]
if(islist(value))
value = deepCopyList(value)
#ifdef TESTING
diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm
index 9e12fb7d4ce76..59c0bb14dbc41 100644
--- a/code/modules/mapping/reader.dm
+++ b/code/modules/mapping/reader.dm
@@ -11,13 +11,9 @@
/datum/parsed_map
var/original_path
- /// The length of a key in this file. This is promised by the standard to be static
var/key_len = 0
var/list/grid_models = list()
var/list/gridSets = list()
- /// List of area types we've loaded AS A PART OF THIS MAP
- /// We do this to allow non unique areas, so we'll only load one per map
- var/list/area/loaded_areas = list()
var/list/modelCache
@@ -27,21 +23,19 @@
var/list/bounds
var/did_expand = FALSE
- ///any turf in this list is skipped inside of build_coordinate. Lazy assoc list
- var/list/turf_blacklist
+ ///any turf in this list is skipped inside of build_coordinate
+ var/list/turf_blacklist = list()
// raw strings used to represent regexes more accurately
// '' used to avoid confusing syntax highlighting
var/static/regex/dmmRegex = new(@'"([a-zA-Z]+)" = \(((?:.|\n)*?)\)\n(?!\t)|\((\d+),(\d+),(\d+)\) = \{"([a-zA-Z\n]*)"\}', "g")
+ var/static/regex/trimQuotesRegex = new(@'^[\s\n]+"?|"?[\s\n]+$|^"|"$', "g")
var/static/regex/trimRegex = new(@'^[\s\n]+|[\s\n]+$', "g")
#ifdef TESTING
var/turfsSkipped = 0
#endif
-//text trimming (both directions) helper macro
-#define TRIM_TEXT(text) (trim_reduced(text))
-
/// Shortcut function to parse a map and apply it to the world.
///
/// - `dmm_file`: A .dmm file to load (Required).
@@ -59,9 +53,6 @@
/// Parse a map, possibly cropping it.
/datum/parsed_map/New(tfile, x_lower = -INFINITY, x_upper = INFINITY, y_lower = -INFINITY, y_upper=INFINITY, measureOnly=FALSE)
- // This proc sleeps for like 6 seconds. why?
- // Is it file accesses? if so, can those be done ahead of time, async to save on time here? I wonder.
- // Love ya :)
if(isfile(tfile))
original_path = "[tfile]"
tfile = file2text(tfile)
@@ -69,23 +60,16 @@
// create a new datum without loading a map
return
- src.bounds = parsed_bounds = list(1.#INF, 1.#INF, 1.#INF, -1.#INF, -1.#INF, -1.#INF)
- // lists are structs don't you know :)
- var/list/bounds = src.bounds
- var/list/grid_models = src.grid_models
- var/key_len = src.key_len
-
+ bounds = parsed_bounds = list(1.#INF, 1.#INF, 1.#INF, -1.#INF, -1.#INF, -1.#INF)
var/stored_index = 1
- var/list/regexOutput
+
//multiz lool
while(dmmRegex.Find(tfile, stored_index))
stored_index = dmmRegex.next
- // Datum var lookup is expensive, this isn't
- regexOutput = dmmRegex.group
// "aa" = (/type{vars=blah})
- if(regexOutput[1]) // Model
- var/key = regexOutput[1]
+ if(dmmRegex.group[1]) // Model
+ var/key = dmmRegex.group[1]
if(grid_models[key]) // Duplicate model keys are ignored in DMMs
continue
if(key_len != length(key))
@@ -94,14 +78,14 @@
else
CRASH("Inconsistent key length in DMM")
if(!measureOnly)
- grid_models[key] = regexOutput[2]
+ grid_models[key] = dmmRegex.group[2]
// (1,1,1) = {"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}
- else if(regexOutput[3]) // Coords
+ else if(dmmRegex.group[3]) // Coords
if(!key_len)
CRASH("Coords before model definition in DMM")
- var/curr_x = text2num(regexOutput[3])
+ var/curr_x = text2num(dmmRegex.group[3])
if(curr_x < x_lower || curr_x > x_upper)
continue
@@ -110,96 +94,69 @@
gridSet.xcrd = curr_x
//position of the currently processed square
- gridSet.ycrd = text2num(regexOutput[4])
- gridSet.zcrd = text2num(regexOutput[5])
+ gridSet.ycrd = text2num(dmmRegex.group[4])
+ gridSet.zcrd = text2num(dmmRegex.group[5])
- bounds[MAP_MINX] = min(bounds[MAP_MINX], curr_x)
+ bounds[MAP_MINX] = min(bounds[MAP_MINX], clamp(gridSet.xcrd, x_lower, x_upper))
bounds[MAP_MINZ] = min(bounds[MAP_MINZ], gridSet.zcrd)
bounds[MAP_MAXZ] = max(bounds[MAP_MAXZ], gridSet.zcrd)
- var/list/gridLines = splittext(regexOutput[6], "\n")
+ var/list/gridLines = splittext(dmmRegex.group[6], "\n")
gridSet.gridLines = gridLines
var/leadingBlanks = 0
- while(leadingBlanks < length(gridLines) && gridLines[++leadingBlanks] == "")
+ while(leadingBlanks < gridLines.len && gridLines[++leadingBlanks] == "")
if(leadingBlanks > 1)
gridLines.Cut(1, leadingBlanks) // Remove all leading blank lines.
- if(!length(gridLines)) // Skip it if only blank lines exist.
+ if(!gridLines.len) // Skip it if only blank lines exist.
continue
gridSets += gridSet
- if(gridLines[length(gridLines)] == "")
- gridLines.Cut(length(gridLines)) // Remove only one blank line at the end.
+ if(gridLines.len && gridLines[gridLines.len] == "")
+ gridLines.Cut(gridLines.len) // Remove only one blank line at the end.
- bounds[MAP_MINY] = min(bounds[MAP_MINY], gridSet.ycrd)
- gridSet.ycrd += length(gridLines) - 1 // Start at the top and work down
- bounds[MAP_MAXY] = max(bounds[MAP_MAXY], gridSet.ycrd)
+ bounds[MAP_MINY] = min(bounds[MAP_MINY], clamp(gridSet.ycrd, y_lower, y_upper))
+ gridSet.ycrd += gridLines.len - 1 // Start at the top and work down
+ bounds[MAP_MAXY] = max(bounds[MAP_MAXY], clamp(gridSet.ycrd, y_lower, y_upper))
- var/maxx = curr_x
- if(length(gridLines)) //Not an empty map
- maxx = max(maxx, curr_x + length(gridLines[1]) / key_len - 1)
+ var/maxx = gridSet.xcrd
+ if(gridLines.len) //Not an empty map
+ maxx = max(maxx, gridSet.xcrd + length(gridLines[1]) / key_len - 1)
- bounds[MAP_MAXX] = max(bounds[MAP_MAXX], maxx)
+ bounds[MAP_MAXX] = clamp(max(bounds[MAP_MAXX], maxx), x_lower, x_upper)
CHECK_TICK
// Indicate failure to parse any coordinates by nulling bounds
if(bounds[1] == 1.#INF)
- src.bounds = null
- else
- // Clamp all our mins and maxes down to the proscribed limits
- bounds[MAP_MINX] = clamp(bounds[MAP_MINX], x_lower, x_upper)
- bounds[MAP_MAXX] = clamp(bounds[MAP_MAXX], x_lower, x_upper)
- bounds[MAP_MINY] = clamp(bounds[MAP_MINY], y_lower, y_upper)
- bounds[MAP_MAXY] = clamp(bounds[MAP_MAXY], y_lower, y_upper)
-
- parsed_bounds = src.bounds
- src.key_len = key_len
+ bounds = null
+ parsed_bounds = bounds
/// Load the parsed map into the world. See [/proc/load_map] for arguments.
-/datum/parsed_map/proc/load(x_offset, y_offset, z_offset, cropMap, no_changeturf, x_lower, x_upper, y_lower, y_upper, placeOnTop, whitelist = FALSE)
+/datum/parsed_map/proc/load(x_offset, y_offset, z_offset, cropMap, no_changeturf, x_lower, x_upper, y_lower, y_upper, placeOnTop)
//How I wish for RAII
Master.StartLoadingMap()
. = _load_impl(x_offset, y_offset, z_offset, cropMap, no_changeturf, x_lower, x_upper, y_lower, y_upper, placeOnTop)
Master.StopLoadingMap()
-
-#define MAPLOADING_CHECK_TICK \
- if(TICK_CHECK) { \
- SSatoms.map_loader_stop(); \
- stoplag(); \
- SSatoms.map_loader_begin(); \
- }
// Do not call except via load() above.
/datum/parsed_map/proc/_load_impl(x_offset = 1, y_offset = 1, z_offset = world.maxz + 1, cropMap = FALSE, no_changeturf = FALSE, x_lower = -INFINITY, x_upper = INFINITY, y_lower = -INFINITY, y_upper = INFINITY, placeOnTop = FALSE)
PRIVATE_PROC(TRUE)
+ var/list/areaCache = list()
var/list/modelCache = build_cache(no_changeturf)
var/space_key = modelCache[SPACE_KEY]
var/list/bounds
- var/key_len = src.key_len
src.bounds = bounds = list(1.#INF, 1.#INF, 1.#INF, -1.#INF, -1.#INF, -1.#INF)
- // Tell ss atoms that we're doing maploading
- // We'll have to account for this in the following tick_checks so it doesn't overflow
- SSatoms.map_loader_begin()
-
- //used for sending the maxx and maxy expanded global signals at the end of this proc
- var/has_expanded_world_maxx = FALSE
- var/has_expanded_world_maxy = FALSE
- var/y_relative_to_absolute = y_offset - 1
- var/x_relative_to_absolute = x_offset - 1
- for(var/datum/grid_set/gset as anything in gridSets)
- var/relative_x = gset.xcrd
- var/relative_y = gset.ycrd
- var/true_xcrd = relative_x + x_relative_to_absolute
- var/ycrd = relative_y + y_relative_to_absolute
+ for(var/I in gridSets)
+ var/datum/grid_set/gset = I
+ var/ycrd = gset.ycrd + y_offset - 1
var/zcrd = gset.zcrd + z_offset - 1
if(!cropMap && ycrd > world.maxy)
world.maxy = ycrd // Expand Y here. X is expanded in the loop below
did_expand = TRUE
var/zexpansion = zcrd > world.maxz
- var/no_afterchange = no_changeturf
if(zexpansion)
if(cropMap)
continue
@@ -209,141 +166,50 @@
did_expand = FALSE
if(!no_changeturf)
WARNING("Z-level expansion occurred without no_changeturf set, this may cause problems when /turf/AfterChange is called")
- no_afterchange = TRUE
- // Ok so like. something important
- // We talk in "relative" coords here, so the coordinate system of the map datum
- // This is so we can do offsets, but it is NOT the same as positions in game
- // That's why there's some uses of - y_relative_to_absolute here, to turn absolute positions into relative ones
-
- // Skip Y coords that are above the smallest of the three params
- // So maxy and y_upper get to act as thresholds, and relative_y can play
- var/y_skip_above = min(world.maxy - y_relative_to_absolute, y_upper, relative_y)
- // How many lines to skip because they'd be above the y cuttoff line
- var/y_starting_skip = relative_y - y_skip_above
- ycrd += y_starting_skip
-
- // Y is the LOWEST it will ever be here, so we can easily set a threshold for how low to go
- var/line_count = length(gset.gridLines)
- var/lowest_y = relative_y - (line_count - 1) // -1 because we decrement at the end of the loop, not the start
- var/y_ending_skip = max(max(y_lower, 1 - y_relative_to_absolute) - lowest_y, 0)
-
- // Now we're gonna precompute the x thresholds
- // We skip all the entries below the lower x, or 1
- var/starting_x_delta = max(max(x_lower, 1 - x_relative_to_absolute) - relative_x, 0)
- // The x loop counts by key length, so we gotta multiply here
- var/x_starting_skip = starting_x_delta * key_len
- true_xcrd += starting_x_delta
-
- var/line_length = 0
- if(line_count)
- // This is promised as static, so we will treat it as such
- line_length = length(gset.gridLines[1])
- // We're gonna skip all the entries above the upper x, or maxx if cropMap is set
- var/x_target = line_length - key_len + 1
- var/x_step_count = ROUND_UP(x_target / key_len)
- var/final_x = relative_x + (x_step_count - 1)
- var/x_delta_with = x_upper
- if(cropMap)
- // Take our smaller crop threshold yes?
- x_delta_with = min(x_delta_with, world.maxx)
- if(final_x > x_delta_with)
- // If our relative x is greater then X upper, well then we've gotta limit our expansion
- var/delta = max(final_x - x_delta_with, 0)
- x_step_count -= delta
- final_x -= delta
- x_target = x_step_count * key_len
- if(final_x > world.maxx && !cropMap)
- world.maxx = final_x
- has_expanded_world_maxx = TRUE
-
- // We're gonna track the first and last pairs of coords we find
- // The first x is guarenteed to be the lowest, the first y the highest, and vis versa
- // This is faster then doing mins and maxes inside the hot loop below
- var/first_found = FALSE
- var/first_x = 0
- var/first_y = 0
- var/last_x = 0
- var/last_y = 0
-
- // Everything following this line is VERY hot. How hot depends on the map format
- // (Yes this does mean dmm is technically faster to parse. shut up)
-
- // This is the "is this map tgm" check
- if(key_len == line_length)
- // Wanna clear something up about maps, talking in 255x255 here
- // In the tgm format, each gridset contains 255 lines, each line representing one tile, with 255 total gridsets
- // In the dmm format, each gridset contains 255 lines, each line representing one row of tiles, containing 255 * line length characters, with one gridset per z
- // since this is the tgm branch any cutoff of x means we just shouldn't iterate this gridset
- if(!x_step_count || x_starting_skip)
+
+ for(var/line in gset.gridLines)
+ if((ycrd - y_offset + 1) < y_lower || (ycrd - y_offset + 1) > y_upper) //Reverse operation and check if it is out of bounds of cropping.
+ --ycrd
continue
- for(var/i in 1 + y_starting_skip to line_count - y_ending_skip)
- var/line = gset.gridLines[i]
- if(line == space_key && no_afterchange)
- #ifdef TESTING
- ++turfsSkipped
- #endif
- ycrd--
- MAPLOADING_CHECK_TICK
- continue
-
- var/list/cache = modelCache[line]
- if(!cache)
- SSatoms.map_loader_stop()
- CRASH("Undefined model key in DMM: [line]")
- build_coordinate(cache, locate(true_xcrd, ycrd, zcrd), no_afterchange, placeOnTop)
-
- // only bother with bounds that actually exist
- if(!first_found)
- first_found = TRUE
- first_y = ycrd
- last_y = ycrd
- ycrd--
- MAPLOADING_CHECK_TICK
- // The x coord never changes, so this is safe
- if(first_found)
- first_x = true_xcrd
- last_x = true_xcrd
- else
- // This is the dmm parser, note the double loop
- for(var/i in 1 + y_starting_skip to line_count - y_ending_skip)
- var/line = gset.gridLines[i]
-
- var/xcrd = true_xcrd
- for(var/tpos in 1 + x_starting_skip to x_target step key_len)
- var/model_key = copytext(line, tpos, tpos + key_len)
- if(model_key == space_key && no_afterchange)
+ if(ycrd <= world.maxy && ycrd >= 1)
+ var/xcrd = gset.xcrd + x_offset - 1
+ for(var/tpos = 1 to length(line) - key_len + 1 step key_len)
+ if((xcrd - x_offset + 1) < x_lower || (xcrd - x_offset + 1) > x_upper) //Same as above.
+ ++xcrd
+ continue //X cropping.
+ if(xcrd > world.maxx)
+ if(cropMap)
+ break
+ else
+ world.maxx = xcrd
+ did_expand = TRUE
+
+ if(xcrd >= 1)
+ var/model_key = copytext(line, tpos, tpos + key_len)
+ var/no_afterchange = no_changeturf || zexpansion
+ if(!no_afterchange || (model_key != space_key))
+ var/list/cache = modelCache[model_key]
+ if(!cache)
+ CRASH("Undefined model key in DMM: [model_key]")
+ build_coordinate(areaCache, cache, locate(xcrd, ycrd, zcrd), no_afterchange, placeOnTop)
+
+ // only bother with bounds that actually exist
+ bounds[MAP_MINX] = min(bounds[MAP_MINX], xcrd)
+ bounds[MAP_MINY] = min(bounds[MAP_MINY], ycrd)
+ bounds[MAP_MINZ] = min(bounds[MAP_MINZ], zcrd)
+ bounds[MAP_MAXX] = max(bounds[MAP_MAXX], xcrd)
+ bounds[MAP_MAXY] = max(bounds[MAP_MAXY], ycrd)
+ bounds[MAP_MAXZ] = max(bounds[MAP_MAXZ], zcrd)
#ifdef TESTING
- ++turfsSkipped
+ else
+ ++turfsSkipped
#endif
- MAPLOADING_CHECK_TICK
- ++xcrd
- continue
- var/list/cache = modelCache[model_key]
- if(!cache)
- SSatoms.map_loader_stop()
- CRASH("Undefined model key in DMM: [model_key]")
- build_coordinate(cache, locate(xcrd, ycrd, zcrd), no_afterchange, placeOnTop)
-
- // only bother with bounds that actually exist
- if(!first_found)
- first_found = TRUE
- first_x = xcrd
- first_y = ycrd
- last_x = xcrd
- last_y = ycrd
- MAPLOADING_CHECK_TICK
+ CHECK_TICK
++xcrd
- ycrd--
- MAPLOADING_CHECK_TICK
- bounds[MAP_MINX] = min(bounds[MAP_MINX], first_x)
- bounds[MAP_MINY] = min(bounds[MAP_MINY], last_y)
- bounds[MAP_MINZ] = min(bounds[MAP_MINZ], zcrd)
- bounds[MAP_MAXX] = max(bounds[MAP_MAXX], last_x)
- bounds[MAP_MAXY] = max(bounds[MAP_MAXY], first_y)
- bounds[MAP_MAXZ] = max(bounds[MAP_MAXZ], zcrd)
-
- // And we are done lads, call it off
- SSatoms.map_loader_stop()
+ --ycrd
+
+ CHECK_TICK
+
if(!no_changeturf)
for(var/t in block(locate(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ]), locate(bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ])))
var/turf/T = t
@@ -355,176 +221,180 @@
testing("Skipped loading [turfsSkipped] default turfs")
#endif
- if(has_expanded_world_maxx || has_expanded_world_maxy)
- SEND_GLOBAL_SIGNAL(COMSIG_GLOB_EXPANDED_WORLD_BOUNDS, has_expanded_world_maxx, has_expanded_world_maxy)
-
if(did_expand)
world.refresh_atmos_grid()
return TRUE
-GLOBAL_LIST_EMPTY(map_model_default)
-
/datum/parsed_map/proc/build_cache(no_changeturf, bad_paths=null)
if(modelCache && !bad_paths)
return modelCache
. = modelCache = list()
var/list/grid_models = src.grid_models
- var/set_space = FALSE
- // Use where a list is needed, but where it will not be modified
- // Used here to remove the cost of needing to make a new list for each fields entry when it's set manually later
- var/static/list/default_list = GLOB.map_model_default
for(var/model_key in grid_models)
var/model = grid_models[model_key]
- // This is safe because dmm strings will never actually newline
- // So we can parse things just fine
- var/list/entries = splittext(model, ",\n")
- //will contain all members (paths) in model (in our example : /turf/unsimulated/wall and /area/mine/explored)
- var/list/members = new /list(length(entries))
- //will contain lists filled with corresponding variables, if any (in our example : list(icon_state = "rock") and list())
- //member attributes are rarish, so we could lazyinit this
- var/list/members_attributes = new /list(length(entries))
+ var/list/members = list() //will contain all members (paths) in model (in our example : /turf/unsimulated/wall and /area/mine/explored)
+ var/list/members_attributes = list() //will contain lists filled with corresponding variables, if any (in our example : list(icon_state = "rock") and list())
/////////////////////////////////////////////////////////
//Constructing members and corresponding variables lists
////////////////////////////////////////////////////////
var/index = 1
- for(var/member_string in entries)
- var/variables_start = 0
- //findtext is a bit expensive, lets only do this if the last char of our string is a } (IE: we know we have vars)
- //this saves about 25 miliseconds on my machine. Not a major optimization
- if(member_string[length(member_string)] == "}")
- variables_start = findtext(member_string, "{")
-
- var/path_text = TRIM_TEXT(copytext(member_string, 1, variables_start))
+ var/old_position = 1
+ var/dpos
+
+ while(dpos != 0)
+ //finding next member (e.g /turf/unsimulated/wall{icon_state = "rock"} or /area/mine/explored)
+ dpos = find_next_delimiter_position(model, old_position, ",", "{", "}") //find next delimiter (comma here) that's not within {...}
+
+ var/full_def = trim_text(copytext(model, old_position, dpos)) //full definition, e.g : /obj/foo/bar{variables=derp}
+ var/variables_start = findtext(full_def, "{")
+ var/path_text = trim_text(copytext(full_def, 1, variables_start))
var/atom_def = text2path(path_text) //path definition, e.g /obj/foo/bar
+ if(dpos)
+ old_position = dpos + length(model[dpos])
if(!ispath(atom_def, /atom)) // Skip the item if the path does not exist. Fix your crap, mappers!
if(bad_paths)
LAZYOR(bad_paths[path_text], model_key)
continue
- members[index] = atom_def
+ members.Add(atom_def)
//transform the variables in text format into a list (e.g {var1="derp"; var2; var3=7} => list(var1="derp", var2, var3=7))
- var/list/fields = default_list
+ var/list/fields = list()
+
if(variables_start)//if there's any variable
- member_string = copytext(member_string, variables_start + length(member_string[variables_start]), -length(copytext_char(member_string, -1))) //removing the last '}'
- fields = readlist(member_string, ";")
- for(var/I in fields)
- var/value = fields[I]
- if(istext(value))
- fields[I] = apply_text_macros(value)
+ full_def = copytext(full_def, variables_start + length(full_def[variables_start]), -length(copytext_char(full_def, -1))) //removing the last '}'
+ fields = readlist(full_def, ";")
+ if(fields.len)
+ if(!trim(fields[fields.len]))
+ --fields.len
+ for(var/I in fields)
+ var/value = fields[I]
+ if(istext(value))
+ fields[I] = apply_text_macros(value)
//then fill the members_attributes list with the corresponding variables
+ members_attributes.len++
members_attributes[index++] = fields
+
CHECK_TICK
//check and see if we can just skip this turf
//So you don't have to understand this horrid statement, we can do this if
- // 1. the space_key isn't set yet
- // 2. no_changeturf is set
+ // 1. no_changeturf is set
+ // 2. the space_key isn't set yet
// 3. there are exactly 2 members
// 4. with no attributes
// 5. and the members are world.turf and world.area
// Basically, if we find an entry like this: "XXX" = (/turf/default, /area/default)
// We can skip calling this proc every time we see XXX
- if(!set_space \
- && no_changeturf \
+ if(no_changeturf \
+ && !(.[SPACE_KEY]) \
&& members.len == 2 \
&& members_attributes.len == 2 \
&& length(members_attributes[1]) == 0 \
&& length(members_attributes[2]) == 0 \
&& (world.area in members) \
&& (world.turf in members))
- set_space = TRUE
+
.[SPACE_KEY] = model_key
continue
+
.[model_key] = list(members, members_attributes)
-/datum/parsed_map/proc/build_coordinate(list/model, turf/crds, no_changeturf as num, placeOnTop as num)
- // If we don't have a turf, nothing we will do next will actually acomplish anything, so just go back
- // Note, this would actually drop area vvs in the tile, but like, why tho
- if(!crds)
- return
+/datum/parsed_map/proc/build_coordinate(list/areaCache, list/model, turf/crds, no_changeturf as num, placeOnTop as num)
var/index
var/list/members = model[1]
var/list/members_attributes = model[2]
- // We use static lists here because it's cheaper then passing them around
- var/static/list/default_list = GLOB.map_model_default
////////////////
//Instanciation
////////////////
- if(turf_blacklist?[crds])
- return
+ for (var/turf_in_blacklist in turf_blacklist)
+ if (crds == turf_in_blacklist) //if the given turf is blacklisted, dont do anything with it
+ return
//The next part of the code assumes there's ALWAYS an /area AND a /turf on a given tile
//first instance the /area and remove it from the members list
index = members.len
- var/atom/instance
if(members[index] != /area/template_noop)
- if(members_attributes[index] != default_list)
- world.preloader_setup(members_attributes[index], members[index])//preloader for assigning set variables on atom creation
- instance = loaded_areas[members[index]]
- if(!instance)
- var/area_type = members[index]
- // If this parsed map doesn't have that area already, we check the global cache
- instance = GLOB.areas_by_type[area_type]
- // If the global list DOESN'T have this area it's either not a unique area, or it just hasn't been created yet
+ var/atype = members[index]
+ world.preloader_setup(members_attributes[index], atype)//preloader for assigning set variables on atom creation
+ var/atom/instance = areaCache[atype]
+ if (!instance)
+ instance = GLOB.areas_by_type[atype]
if (!instance)
- instance = new area_type(null)
- if(!instance)
- CRASH("[area_type] failed to be new'd, what'd you do?")
- loaded_areas[area_type] = instance
-
- instance.contents.Add(crds)
+ instance = new atype(null)
+ areaCache[atype] = instance
+ if(crds)
+ instance.contents.Add(crds)
- if(GLOB.use_preloader)
+ if(GLOB.use_preloader && instance)
world.preloader_load(instance)
- // Index right before /area is /turf
- index--
- //then instance the /turf
- //NOTE: this used to place any turfs before the last "underneath" it using .appearance and underlays
- //We don't actually use this, and all it did was cost cpu, so we don't do this anymore
- if(members[index] != /turf/template_noop)
- if(members_attributes[index] != default_list)
- world.preloader_setup(members_attributes[index], members[index])
-
- // Note: we make the assertion that the last path WILL be a turf. if it isn't, this will fail.
- var/old_virtual_z = crds.virtual_z
- if(placeOnTop)
- instance = crds.PlaceOnTop(null, members[index], CHANGETURF_DEFER_CHANGE | (no_changeturf ? CHANGETURF_SKIP : NONE))
- else if(!no_changeturf)
- instance = crds.ChangeTurf(members[index], null, CHANGETURF_DEFER_CHANGE)
- else
- instance = create_turf(members[index], crds , old_virtual_z)//first preloader pass
- var/turf/new_turf = instance
- new_turf.virtual_z = old_virtual_z //UNDER NO CIRCUMSTANCES LOOSE THIS VARIABLE
+ //then instance the /turf and, if multiple tiles are presents, simulates the DMM underlays piling effect
- if(GLOB.use_preloader && instance)//second preloader pass, for those atoms that don't ..() in New()
- world.preloader_load(instance)
- MAPLOADING_CHECK_TICK
+ var/first_turf_index = 1
+ while(!ispath(members[first_turf_index], /turf)) //find first /turf object in members
+ first_turf_index++
- //finally instance all remainings objects/mobs
- for(var/atom_index in 1 to index-1)
- if(members_attributes[atom_index] != default_list)
- world.preloader_setup(members_attributes[atom_index], members[atom_index])
-
- // We make the assertion that only /atom s will be in this portion of the code. if that isn't true, this will fail
- instance = create_atom(members[atom_index], crds)//first preloader pass
+ //turn off base new Initialization until the whole thing is loaded
+ SSatoms.map_loader_begin()
+ //instanciate the first /turf
+ var/turf/T
+ if(members[first_turf_index] != /turf/template_noop)
+ T = instance_atom(members[first_turf_index],members_attributes[first_turf_index],crds,no_changeturf,placeOnTop)
+
+ if(T)
+ //if others /turf are presents, simulates the underlays piling effect
+ index = first_turf_index + 1
+ while(index <= members.len - 1) // Last item is an /area
+ var/underlay = T.appearance
+ T = instance_atom(members[index],members_attributes[index],crds,no_changeturf,placeOnTop)//instance new turf
+ T.underlays += underlay
+ index++
- if(GLOB.use_preloader && instance)//second preloader pass, for those atoms that don't ..() in New()
- world.preloader_load(instance)
- MAPLOADING_CHECK_TICK
+ //finally instance all remainings objects/mobs
+ for(index in 1 to first_turf_index-1)
+ instance_atom(members[index],members_attributes[index],crds,no_changeturf,placeOnTop)
+ //Restore initialization to the previous value
+ SSatoms.map_loader_stop()
////////////////
//Helpers procs
////////////////
+//Instance an atom at (x,y,z) and gives it the variables in attributes
+/datum/parsed_map/proc/instance_atom(path,list/attributes, turf/crds, no_changeturf, placeOnTop)
+ world.preloader_setup(attributes, path)
+
+ if(crds)
+ if(ispath(path, /turf))
+ var/old_virtual_z = crds.virtual_z
+ if(placeOnTop)
+ . = crds.PlaceOnTop(null, path, CHANGETURF_DEFER_CHANGE | (no_changeturf ? CHANGETURF_SKIP : NONE))
+ else if(!no_changeturf)
+ . = crds.ChangeTurf(path, null, CHANGETURF_DEFER_CHANGE)
+ else
+ . = create_turf(path, crds , old_virtual_z)//first preloader pass
+ var/turf/new_turf = .
+ new_turf.virtual_z = old_virtual_z //UNDER NO CIRCUMSTANCES LOOSE THIS VARIABLE
+ else
+ . = create_atom(path, crds)//first preloader pass
+
+ if(GLOB.use_preloader && .)//second preloader pass, for those atoms that don't ..() in New()
+ world.preloader_load(.)
+
+ //custom CHECK_TICK here because we don't want things created while we're sleeping to not initialize
+ if(TICK_CHECK)
+ SSatoms.map_loader_stop()
+ stoplag()
+ SSatoms.map_loader_begin()
+
/datum/parsed_map/proc/create_turf(path, crds, virtual_z)
set waitfor = FALSE
. = new path (crds, virtual_z)
@@ -533,6 +403,15 @@ GLOBAL_LIST_EMPTY(map_model_default)
set waitfor = FALSE
. = new path (crds)
+//text trimming (both directions) helper proc
+//optionally removes quotes before and after the text (for variable name)
+/datum/parsed_map/proc/trim_text(what as text,trim_quotes=0)
+ if(trim_quotes)
+ return trimQuotesRegex.Replace(what, "")
+ else
+ return trimRegex.Replace(what, "")
+
+
//find the position of the next delimiter,skipping whatever is comprised between opening_escape and closing_escape
//returns 0 if reached the last delimiter
/datum/parsed_map/proc/find_next_delimiter_position(text as text,initial_position as num, delimiter=",",opening_escape="\"",closing_escape="\"")
@@ -547,6 +426,7 @@ GLOBAL_LIST_EMPTY(map_model_default)
return next_delimiter
+
//build a list from variables in text form (e.g {var1="derp"; var2; var3=7} => list(var1="derp", var2, var3=7))
//return the filled list
/datum/parsed_map/proc/readlist(text as text, delimiter=",")
@@ -554,49 +434,30 @@ GLOBAL_LIST_EMPTY(map_model_default)
if (!text)
return
- // If we're using a semi colon, we can do this as splittext rather then constant calls to find_next_delimiter_position
- // This does make the code a bit harder to read, but saves a good bit of time so suck it up
- var/using_semicolon = delimiter == ";"
- if(using_semicolon)
- var/list/line_entries = splittext(text, ";\n")
- for(var/entry in line_entries)
- // check if this is a simple variable (as in list(var1, var2)) or an associative one (as in list(var1="foo",var2=7))
- var/equal_position = findtext(entry,"=")
- // This could in theory happen if someone inserts an improper newline
- // Let's be nice and kill it here rather then later, it'll save like 0.02 seconds if we don't need to run trims in build_cache
- if(!equal_position)
- continue
- var/trim_left = TRIM_TEXT(copytext(entry,1,equal_position))
+ var/position
+ var/old_position = 1
+ while(position != 0)
+ // find next delimiter that is not within "..."
+ position = find_next_delimiter_position(text,old_position,delimiter)
+
+ // check if this is a simple variable (as in list(var1, var2)) or an associative one (as in list(var1="foo",var2=7))
+ var/equal_position = findtext(text,"=",old_position, position)
+
+ var/trim_left = trim_text(copytext(text,old_position,(equal_position ? equal_position : position)))
+ var/left_constant = delimiter == ";" ? trim_left : parse_constant(trim_left)
+ if(position)
+ old_position = position + length(text[position])
+
+ if(equal_position && !isnum(left_constant))
// Associative var, so do the association.
// Note that numbers cannot be keys - the RHS is dropped if so.
- var/trim_right = TRIM_TEXT(copytext(entry, equal_position + length(entry[equal_position])))
+ var/trim_right = trim_text(copytext(text, equal_position + length(text[equal_position]), position))
var/right_constant = parse_constant(trim_right)
- .[trim_left] = right_constant
- else
- var/position
- var/old_position = 1
- while(position != 0)
- // find next delimiter that is not within "..."
- position = find_next_delimiter_position(text,old_position,delimiter)
-
- // check if this is a simple variable (as in list(var1, var2)) or an associative one (as in list(var1="foo",var2=7))
- var/equal_position = findtext(text,"=",old_position, position)
- var/trim_left = TRIM_TEXT(copytext(text,old_position,(equal_position ? equal_position : position)))
- var/left_constant = parse_constant(trim_left)
- if(position)
- old_position = position + length(text[position])
- if(!left_constant) // damn newlines man. Exists to provide behavior consistency with the above loop. not a major cost becuase this path is cold
- continue
+ .[left_constant] = right_constant
- if(equal_position && !isnum(left_constant))
- // Associative var, so do the association.
- // Note that numbers cannot be keys - the RHS is dropped if so.
- var/trim_right = TRIM_TEXT(copytext(text, equal_position + length(text[equal_position]), position))
- var/right_constant = parse_constant(trim_right)
- .[left_constant] = right_constant
- else // simple var
- . += list(left_constant)
+ else // simple var
+ . += list(left_constant)
/datum/parsed_map/proc/parse_constant(text)
// number
@@ -606,10 +467,7 @@ GLOBAL_LIST_EMPTY(map_model_default)
// string
if(text[1] == "\"")
- // insert implied locate \" and length("\"") here
- // It's a minimal timesave but it is a timesave
- // Safe becuase we're guarenteed trimmed constants
- return copytext(text, 2, -1)
+ return copytext(text, length(text[1]) + 1, findtext(text, "\"", length(text[1]) + 1))
// list
if(copytext(text, 1, 6) == "list(")//6 == length("list(") + 1
@@ -637,8 +495,7 @@ GLOBAL_LIST_EMPTY(map_model_default)
/datum/parsed_map/Destroy()
..()
- if(turf_blacklist)
- turf_blacklist.Cut()
+ turf_blacklist.Cut()
parsed_bounds.Cut()
bounds.Cut()
grid_models.Cut()
diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm
index bcf062d358f09..b8240b34ddd24 100644
--- a/code/modules/mining/equipment/regenerative_core.dm
+++ b/code/modules/mining/equipment/regenerative_core.dm
@@ -142,7 +142,7 @@
update_appearance()
/obj/item/organ/regenerative_core/update_icon_state()
- icon_state = inert ? "[icon_state]_inert" : "[icon_state]"
+ icon_state = inert ? "legion_soul_inert" : "legion_soul"
return ..()
/obj/item/organ/regenerative_core/update_overlays()
@@ -162,7 +162,6 @@
/obj/item/organ/regenerative_core/legion/crystal
name = "crystal heart"
desc = "A strange rock in the shape of a heart symbol. Applying will repair your body with crystals, but may have additional side effects. It seems it can't survive for very long outside a host."
- icon_state = "crystal_heart"
crackle_animation = FALSE
/obj/item/organ/regenerative_core/legion/crystal/Initialize()
@@ -192,6 +191,7 @@
qdel(src)
/obj/item/organ/regenerative_core/legion/crystal/update_icon_state()
+ icon_state = inert ? "crystal_heart_inert" : "crystal_heart"
if(preserved)
icon_state = "crystal_heart_preserved"
return ..()
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm b/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm
index e18e883530619..28bf95b28dbc7 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm
@@ -168,12 +168,7 @@
/datum/sprite_accessory/frills/none
name = "None"
icon_state = "none"
-//Ears are here because having frills+ears would overlap and be weird.
-/datum/sprite_accessory/frills/ears
- name = "Normal ears"
- icon_state = "ears"
- hasinner = TRUE
-//End ears
+
/datum/sprite_accessory/frills/simple
name = "Simple"
icon_state = "simple"
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 1ed569f93ecc6..dca421b8736dc 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -662,11 +662,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
target.faction = list("neutral")
return TRUE
-/mob/dead/observer/_pointed(atom/pointed_at)
+//this is a mob verb instead of atom for performance reasons
+//see /mob/verb/examinate() in mob.dm for more info
+//overridden here and in /mob/living for different point span classes and sanity checks
+/mob/dead/observer/pointed(atom/A as mob|obj|turf in view(client.view, src))
if(!..())
return FALSE
-
- usr.visible_message("
[src] points to [pointed_at].")
+ usr.visible_message("
[src] points to [A].")
+ return TRUE
/mob/dead/observer/verb/view_manifest()
set name = "View Crew Manifest"
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 75f1026e4414c..85a3fd3248091 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -431,10 +431,6 @@
set name = "quick-equip"
set hidden = TRUE
- DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, .proc/execute_quick_equip))
-
-///proc extender of [/mob/verb/quick_equip] used to make the verb queuable if the server is overloaded
-/mob/proc/execute_quick_equip()
var/obj/item/I = get_active_held_item()
if (I)
I.equip_to_best_slot(src)
@@ -443,9 +439,6 @@
set name = "equipment-swap"
set hidden = TRUE
- DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, .proc/execute_equipment_swap))
-
-/mob/proc/execute_equipment_swap()
var/obj/item/I = get_active_held_item()
if (I)
if(!do_after(src, 1 SECONDS, target = I))
diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm
index 2045bfe4aa18e..4da26d4406ca0 100644
--- a/code/modules/mob/living/carbon/damage_procs.dm
+++ b/code/modules/mob/living/carbon/damage_procs.dm
@@ -25,16 +25,12 @@
update_damage_overlays()
else //no bodypart, we deal damage with a more general method.
adjustBruteLoss(damage_amount, forced = forced)
- if(stat <= HARD_CRIT)
- shake_animation(damage_amount)
if(BURN)
if(BP)
if(BP.receive_damage(0, damage_amount, break_modifier))
update_damage_overlays()
else
adjustFireLoss(damage_amount, forced = forced)
- if(stat <= HARD_CRIT)
- shake_animation(damage_amount)
if(TOX)
adjustToxLoss(damage_amount, forced = forced)
if(OXY)
@@ -47,8 +43,6 @@
update_damage_overlays()
else
adjustStaminaLoss(damage_amount, forced = forced)
- if(stat <= HARD_CRIT)
- shake_animation(damage_amount)
return TRUE
diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
index c9a7e4f1019c4..3a4591fabb98e 100644
--- a/code/modules/mob/living/carbon/emote.dm
+++ b/code/modules/mob/living/carbon/emote.dm
@@ -429,7 +429,7 @@
icon = 'icons/mob/animal.dmi'
icon_state = "heart"
hitsound = 'sound/effects/kiss.ogg'
- hitsound_non_living = 'sound/effects/kiss.ogg'
+ hitsound_wall = 'sound/effects/kiss.ogg'
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
speed = 1.6
damage_type = BRUTE
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index a22987b809293..ecd847b3b37f1 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1413,6 +1413,13 @@
/mob/living/carbon/human/species/golem/snow
race = /datum/species/golem/snow
+
+/mob/living/carbon/human/species/golem/capitalist
+ race = /datum/species/golem/capitalist
+
+/mob/living/carbon/human/species/golem/soviet
+ race = /datum/species/golem/soviet
+
/mob/living/carbon/human/species/jelly
race = /datum/species/jelly
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index b8515f8db0e79..4f3399675f0aa 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1768,8 +1768,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_damage_overlays()
else//no bodypart, we deal damage with a more general method.
H.adjustBruteLoss(damage_amount)
- if(H.stat <= HARD_CRIT)
- H.shake_animation(damage_amount)
if(BURN)
H.damageoverlaytemp = 20
var/damage_amount = forced ? damage : damage * hit_percent * burnmod * H.physiology.burn_mod
@@ -1778,8 +1776,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_damage_overlays()
else
H.adjustFireLoss(damage_amount)
- if(H.stat <= HARD_CRIT)
- H.shake_animation(damage_amount)
if(TOX)
var/damage_amount = forced ? damage : damage * hit_percent * H.physiology.tox_mod
H.adjustToxLoss(damage_amount)
@@ -1796,8 +1792,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.update_stamina()
else
H.adjustStaminaLoss(damage_amount)
- if(H.stat <= HARD_CRIT)
- H.shake_animation(damage_amount)
if(BRAIN)
var/damage_amount = forced ? damage : damage * hit_percent * H.physiology.brain_mod
H.adjustOrganLoss(ORGAN_SLOT_BRAIN, damage_amount)
diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm
index ba23e45b4ba8a..55217a814d359 100644
--- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm
+++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm
@@ -17,6 +17,12 @@
var/obj/item/dullahan_relay/myhead
+
+/datum/species/dullahan/check_roundstart_eligible()
+ if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+ return TRUE
+ return FALSE
+
/datum/species/dullahan/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
. = ..()
H.lose_hearing_sensitivity(ORGAN_TRAIT)
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 38a8b64c0aac6..0379bca7bb341 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -696,6 +696,11 @@
REMOVE_TRAIT(C, TRAIT_HOLY, SPECIES_TRAIT)
..()
+/datum/species/golem/cloth/check_roundstart_eligible()
+ if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+ return TRUE
+ return ..()
+
/datum/species/golem/cloth/random_name(gender,unique,lastname)
var/pharaoh_name = pick("Neferkare", "Hudjefa", "Khufu", "Mentuhotep", "Ahmose", "Amenhotep", "Thutmose", "Hatshepsut", "Tutankhamun", "Ramses", "Seti", \
"Merenptah", "Djer", "Semerkhet", "Nynetjer", "Khafre", "Pepi", "Intef", "Ay") //yes, Ay was an actual pharaoh
@@ -1111,3 +1116,89 @@
charge_max = 15
action_icon = 'icons/obj/toy.dmi'
action_icon_state = "snowball"
+
+/datum/species/golem/capitalist
+ name = "Capitalist Golem"
+ id = "capitalist golem"
+ prefix = "Capitalist"
+ attack_verb = "monopoliz"
+ special_names = list("John D. Rockefeller","Rich Uncle Pennybags","Commodore Vanderbilt","Entrepreneur","Mr. Moneybags", "Adam Smith")
+ species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES)
+ fixed_mut_color = null
+ inherent_traits = list(TRAIT_NOFLASH,TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
+ info_text = "As a
Capitalist Golem, your fist spreads the powerful industrializing light of capitalism."
+ changesource_flags = MIRROR_BADMIN
+ random_eligible = FALSE
+
+ var/last_cash = 0
+ var/cash_cooldown = 100
+
+/datum/species/golem/capitalist/on_species_gain(mob/living/carbon/C, datum/species/old_species)
+ . = ..()
+ C.equip_to_slot_or_del(new /obj/item/clothing/head/that (), ITEM_SLOT_HEAD)
+ C.equip_to_slot_or_del(new /obj/item/clothing/glasses/monocle (), ITEM_SLOT_EYES)
+ C.revive(full_heal = TRUE, admin_revive = FALSE)
+
+ SEND_SOUND(C, sound('sound/misc/capitialism.ogg'))
+ C.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock ())
+ RegisterSignal(C, COMSIG_MOB_SAY, .proc/handle_speech)
+
+/datum/species/golem/capitalist/on_species_loss(mob/living/carbon/C)
+ . = ..()
+ UnregisterSignal(C, COMSIG_MOB_SAY)
+ for(var/obj/effect/proc_holder/spell/aoe_turf/knock/spell in C.mob_spell_list)
+ C.RemoveSpell(spell)
+
+/datum/species/golem/capitalist/spec_unarmedattacked(mob/living/carbon/human/user, mob/living/carbon/human/target)
+ ..()
+ if(isgolem(target))
+ return
+ if(target.nutrition >= NUTRITION_LEVEL_FAT)
+ target.set_species(/datum/species/golem/capitalist)
+ return
+ target.adjust_nutrition(40)
+
+/datum/species/golem/capitalist/proc/handle_speech(datum/source, list/speech_args)
+ playsound(source, 'sound/misc/mymoney.ogg', 25, FALSE)
+ speech_args[SPEECH_MESSAGE] = "Hello, I like money!"
+
+/datum/species/golem/soviet
+ name = "Soviet Golem"
+ id = "soviet golem"
+ prefix = "Comrade"
+ attack_verb = "nationaliz"
+ special_names = list("Stalin","Lenin","Trotsky","Marx","Comrade") //comrade comrade
+ species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES)
+ fixed_mut_color = null
+ inherent_traits = list(TRAIT_NOFLASH, TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
+ info_text = "As a
Soviet Golem, your fist spreads the bright soviet light of communism."
+ changesource_flags = MIRROR_BADMIN
+ random_eligible = FALSE
+
+/datum/species/golem/soviet/on_species_gain(mob/living/carbon/C, datum/species/old_species)
+ . = ..()
+ C.equip_to_slot_or_del(new /obj/item/clothing/head/trapper (), ITEM_SLOT_HEAD)
+ C.revive(full_heal = TRUE, admin_revive = FALSE)
+
+ SEND_SOUND(C, sound('sound/misc/Russian_Anthem_chorus.ogg'))
+ C.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock ())
+ RegisterSignal(C, COMSIG_MOB_SAY, .proc/handle_speech)
+
+/datum/species/golem/soviet/on_species_loss(mob/living/carbon/C)
+ . = ..()
+ for(var/obj/effect/proc_holder/spell/aoe_turf/knock/spell in C.mob_spell_list)
+ C.RemoveSpell(spell)
+ UnregisterSignal(C, COMSIG_MOB_SAY, .proc/handle_speech)
+
+/datum/species/golem/soviet/spec_unarmedattacked(mob/living/carbon/human/user, mob/living/carbon/human/target)
+ ..()
+ if(isgolem(target))
+ return
+ if(target.nutrition <= NUTRITION_LEVEL_STARVING)
+ target.set_species(/datum/species/golem/soviet)
+ return
+ target.adjust_nutrition(-40)
+
+/datum/species/golem/soviet/proc/handle_speech(datum/source, list/speech_args)
+ playsound(source, 'sound/misc/Cyka Blyat.ogg', 25, FALSE)
+ speech_args[SPEECH_MESSAGE] = "Cyka Blyat"
diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index 6e4ae1cdb9a3b..f54c9dff634d2 100644
--- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -32,6 +32,11 @@
else if (light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) //heal in the dark
H.heal_overall_damage(1,1, 0, BODYTYPE_ORGANIC)
+/datum/species/shadow/check_roundstart_eligible()
+ if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+ return TRUE
+ return ..()
+
/datum/species/shadow/nightmare
name = "Nightmare"
id = "nightmare"
diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm
index 920115f52c028..caa36764a1ff0 100644
--- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm
+++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm
@@ -23,6 +23,11 @@
species_l_leg = /obj/item/bodypart/leg/left/skeleton
species_r_leg = /obj/item/bodypart/leg/right/skeleton
+/datum/species/skeleton/check_roundstart_eligible()
+ if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+ return TRUE
+ return ..()
+
//Can still metabolize milk through meme magic
/datum/species/skeleton/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
if(chem.type == /datum/reagent/consumable/milk)
diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm
index ebc923c01075d..b4c9fac9db085 100644
--- a/code/modules/mob/living/carbon/human/species_types/vampire.dm
+++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm
@@ -16,6 +16,14 @@
var/info_text = "You are a
Vampire. You will slowly but constantly lose blood if outside of a coffin. If inside a coffin, you will slowly heal. You may gain more blood by grabbing a live victim and using your drain ability."
var/obj/effect/proc_holder/spell/targeted/shapeshift/bat/batform //attached to the datum itself to avoid cloning memes, and other duplicates
+
+
+
+/datum/species/vampire/check_roundstart_eligible()
+ if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+ return TRUE
+ return FALSE
+
/datum/species/vampire/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
. = ..()
to_chat(C, "[info_text]")
diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm
index 702adfb224a26..8c53a6ca9a077 100644
--- a/code/modules/mob/living/carbon/human/species_types/zombies.dm
+++ b/code/modules/mob/living/carbon/human/species_types/zombies.dm
@@ -24,6 +24,11 @@
species_l_leg = /obj/item/bodypart/leg/left/zombie
species_r_leg = /obj/item/bodypart/leg/right/zombie
+/datum/species/zombie/check_roundstart_eligible()
+ if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+ return TRUE
+ return ..()
+
/datum/species/zombie/infectious
name = "\improper Infectious Zombie"
id = "memezombies"
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index b4469ea5b63cd..e32369c360d76 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -17,7 +17,7 @@
if(!resisting && prob(MONKEY_RESIST_PROB))
resisting = TRUE
walk_to(src,0)
- execute_resist()
+ resist()
else if(resisting)
resisting = FALSE
else if((mode == MONKEY_IDLE && !pickupTarget && !prob(MONKEY_SHENANIGAN_PROB)) || !handle_combat())
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 76daa5ba21d47..4916d062da298 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -23,12 +23,8 @@
switch(damagetype)
if(BRUTE)
adjustBruteLoss(damage_amount, forced = forced)
- if(stat <= HARD_CRIT)
- shake_animation(damage_amount)
if(BURN)
adjustFireLoss(damage_amount, forced = forced)
- if(stat <= HARD_CRIT)
- shake_animation(damage_amount)
if(TOX)
adjustToxLoss(damage_amount, forced = forced)
if(OXY)
@@ -37,8 +33,6 @@
adjustCloneLoss(damage_amount, forced = forced)
if(STAMINA)
adjustStaminaLoss(damage_amount, forced = forced)
- if(stat <= HARD_CRIT)
- shake_animation(damage_amount)
return TRUE
///like [apply_damage][/mob/living/proc/apply_damage] except it always uses the damage procs
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index cd06fa25700fe..8e01f457ef2e9 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -398,14 +398,11 @@
/mob/living/pointed(atom/A as mob|obj|turf in view(client.view, src))
if(incapacitated())
return FALSE
-
- return ..()
-
-/mob/living/_pointed(atom/pointing_at)
if(!..())
return FALSE
- log_message("points at [pointing_at]", LOG_EMOTE)
- visible_message("
[span_name("[src]")] points at [pointing_at].", span_notice("You point at [pointing_at]."))
+ visible_message("
[src] points at [A].", "
You point at [A].")
+ return TRUE
+
/mob/living/verb/succumb(whispered as null)
set hidden = TRUE
@@ -862,10 +859,6 @@
set name = "Resist"
set category = "IC"
- DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, .proc/execute_resist))
-
-///proc extender of [/mob/living/verb/resist] meant to make the process queable if the server is overloaded when the verb is called
-/mob/living/proc/execute_resist()
if(!can_resist())
return
changeNext_move(CLICK_CD_RESIST)
@@ -891,6 +884,7 @@
else if(last_special <= world.time)
resist_restraints() //trying to remove cuffs.
+
/mob/proc/resist_grab(moving_resist)
return 1 //returning 0 means we successfully broke free
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index e5617beafade7..31676cd640073 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -55,7 +55,6 @@
var/on_hit_state = P.on_hit(src, armor, piercing_hit)
if(!P.nodamage && on_hit_state != BULLET_ACT_BLOCK && !QDELETED(src)) //QDELETED literally just for the instagib rifle. Yeah.
apply_damage(P.damage, P.damage_type, def_zone, armor)
- recoil_camera(src, clamp((P.damage-armor)/4,0.5,10), clamp((P.damage-armor)/4,0.5,10), P.damage/8, P.Angle)
apply_effects(P.stun, P.knockdown, P.unconscious, P.irradiate, P.slur, P.stutter, P.eyeblur, P.drowsy, armor, P.stamina, P.jitter, P.paralyze, P.immobilize)
if(P.dismemberment)
check_projectile_dismemberment(P, def_zone)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 2c874ee845f00..1af879fc878ed 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -498,9 +498,6 @@
set category = "IC"
set src = usr
- return ..()
-
-/mob/living/silicon/robot/execute_mode()
if(incapacitated())
return
var/obj/item/W = get_active_held_item()
@@ -1094,11 +1091,12 @@
riding_datum.restore_position(user)
. = ..(user)
-/mob/living/silicon/robot/execute_resist()
+/mob/living/silicon/robot/resist()
. = ..()
if(!has_buckled_mobs())
return
- for(var/mob/unbuckle_me_now as anything in buckled_mobs)
+ for(var/i in buckled_mobs)
+ var/mob/unbuckle_me_now = i
unbuckle_mob(unbuckle_me_now, FALSE)
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 9bc75267a7ddf..e64b0b362e0a5 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -775,8 +775,8 @@
new /obj/effect/decal/cleanable/oil(loc)
..()
-/mob/living/simple_animal/bot/mulebot/execute_resist()
- . = ..()
+/mob/living/simple_animal/bot/mulebot/resist()
+ ..()
if(load)
unload()
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index a2a417f871d1c..d7fd2930a88b3 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -100,11 +100,11 @@
/obj/effect/mob_spawn/human/corpse/frontier
name = "Frontiersman"
- outfit = /datum/outfit/frontier
+ outfit = /datum/outfit/russiancorpse
hairstyle = "Bald"
facial_hairstyle = "Shaved"
-/datum/outfit/frontier
+/datum/outfit/russiancorpse
name = "Frontiersman Corpse"
uniform = /obj/item/clothing/under/rank/security/officer/frontier
shoes = /obj/item/clothing/shoes/jackboots
@@ -112,12 +112,12 @@
gloves = /obj/item/clothing/gloves/color/black
/obj/effect/mob_spawn/human/corpse/frontier/ranged
- outfit = /datum/outfit/frontier
+ outfit = /datum/outfit/russiancorpse
/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper
- outfit = /datum/outfit/frontier/trooper
+ outfit = /datum/outfit/russiancorpse/trooper
-/datum/outfit/frontier/trooper
+/datum/outfit/russiancorpse/trooper
name = "Frontiersman Armored Corpse"
suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier
shoes = /obj/item/clothing/shoes/combat
@@ -128,10 +128,10 @@
/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer
name = "Frontiersman Officer"
- outfit = /datum/outfit/frontier/officer
+ outfit = /datum/outfit/russiancorpse/officer
-/datum/outfit/frontier/officer
- name = "Frontiersman Officer Corpse"
+/datum/outfit/russiancorpse/officer
+ name = "Frontiersman officer Corpse"
uniform = /obj/item/clothing/under/rank/security/officer/frontier/officer
suit = /obj/item/clothing/suit/armor/frontier
shoes = /obj/item/clothing/shoes/combat
@@ -139,19 +139,14 @@
head = /obj/item/clothing/head/caphat/frontier
/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy
- outfit = /datum/outfit/frontier/trooper/heavy
+ outfit = /datum/outfit/russiancorpse/trooper/heavy
-/datum/outfit/frontier/trooper/heavy
+/datum/outfit/russiancorpse/trooper/heavy
name = "Frontiersman Heavy Corpse"
suit = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier
head = /obj/item/clothing/head/beret/sec/frontier/officer
back = /obj/item/minigunpack
-/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/gunless
- outfit = /datum/outfit/russiancorpse/trooper/heavy/gunless
-
-/datum/outfit/russiancorpse/trooper/heavy/gunless
- back = null
/obj/effect/mob_spawn/human/corpse/wizard
name = "Space Wizard Corpse"
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
index 8714a3e491919..e29948aa8b809 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
@@ -98,4 +98,38 @@
icon_living = icon_state
icon_dead = "[visualAppearance]_dead"
+/obj/effect/mob_spawn/drone/derelict
+ name = "derelict drone shell"
+ desc = "A long-forgotten drone shell. It seems kind of... Space Russian."
+ icon = 'icons/mob/drone.dmi'
+ icon_state = "drone_maint_hat"
+ mob_name = "derelict drone"
+ mob_type = /mob/living/simple_animal/drone/derelict
+ anchored = TRUE
+ short_desc = "You are a drone on Kosmicheskaya Stantsiya 13."
+ flavour_text = "Something has brought you out of hibernation, and the station is in gross disrepair."
+ important_info = "Build, repair, maintain and improve the station that housed you on activation."
+
+/mob/living/simple_animal/drone/derelict
+ name = "derelict drone"
+ default_hatmask = /obj/item/clothing/head/trapper
+ laws = \
+ "1. You may not involve yourself in the matters of another sentient being outside the station that housed your activation, even if such matters conflict with Law Two or Law Three, unless the other being is another Drone.\n"+\
+ "2. You may not harm any sentient being, regardless of intent or circumstance.\n"+\
+ "3. Your goals are to actively build, maintain, repair, improve, and provide power to the best of your abilities within the facility that housed your activation."
+ flavortext = \
+ "\n
DO NOT WILLINGLY LEAVE KOSMICHESKAYA STANTSIYA 13 (THE DERELICT)\n"+\
+ "
Derelict drones are a ghost role that is allowed to roam freely on KS13, with the main goal of repairing and improving it.\n"+\
+ "
Do not interfere with the round going on outside KS13.\n"+\
+ "
Actions that constitute interference include, but are not limited to:\n"+\
+ "
- Going to the main station in search of materials.\n"+\
+ "
- Interacting with non-drone players outside KS13, dead or alive.\n"+\
+ "
These rules are at admin discretion and will be heavily enforced.\n"+\
+ "
If you do not have the regular drone laws, follow your laws to the best of your ability."
+
+/mob/living/simple_animal/drone/derelict/Initialize()
+ . = ..()
+ AddComponent(/datum/component/stationstuck, TRUE, "Your emergency station return device activates, sending you back to KS13!", "01000110 01010101 01000011 01001011 00100000 01011001 01001111 01010101
WARNING: Dereliction of KS13 detected. Self destruct activated.")
+
+
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index caf4651402319..9afea9921ef6a 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -84,7 +84,7 @@
environment_smash = ENVIRONMENT_SMASH_MINERALS
weather_immunities = list("snow")
-/mob/living/simple_animal/hostile/bear/frontier
+/mob/living/simple_animal/hostile/bear/russian
name = "combat bear"
desc = "A ferocious brown bear decked out in armor plating, a red star with yellow outlining details the shoulder plating."
icon_state = "combatbear"
@@ -114,7 +114,7 @@
/obj/item/bear_armor
name = "pile of bear armor"
desc = "A scattered pile of various shaped armor pieces fitted for a bear, some duct tape, and a nail filer. Crude instructions \
- are written on the back of one of the plates. This seems like an awful idea."
+ are written on the back of one of the plates in russian. This seems like an awful idea."
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "bear_armor_upgrade"
@@ -141,7 +141,7 @@
icon_living = "butterbear"
icon_dead = "butterbear_dead"
desc = "I can't believe its not a bear!"
- faction = list("neutral", "frontiersmen")
+ faction = list("neutral", "russian")
obj_damage = 11
melee_damage_lower = 1
melee_damage_upper = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/frontiersman.dm b/code/modules/mob/living/simple_animal/hostile/frontiersman.dm
index feeecdb5b43d8..c8e6a1c8d2b4c 100644
--- a/code/modules/mob/living/simple_animal/hostile/frontiersman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/frontiersman.dm
@@ -41,8 +41,6 @@
projectilesound = 'sound/weapons/gun/revolver/shot.ogg'
casingtype = /obj/item/ammo_casing/n762_38
-/mob/living/simple_animal/hostile/frontier/ranged/neutered
- loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged)
/mob/living/simple_animal/hostile/frontier/ranged/mosin
icon_state = "frontiersmanrangedrifle"
@@ -52,9 +50,6 @@
casingtype = /obj/item/ammo_casing/a762_54
projectilesound = 'sound/weapons/gun/rifle/mosin.ogg'
-/mob/living/simple_animal/hostile/frontier/ranged/mosin/neutered
- loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged)
-
/mob/living/simple_animal/hostile/frontier/ranged/trooper
icon_state = "frontiersmanrangedelite"
icon_living = "frontiersmanrangedelite"
@@ -65,9 +60,6 @@
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/shotgun/lethal)
-/mob/living/simple_animal/hostile/frontier/ranged/trooper/neutered
- loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)
-
/mob/living/simple_animal/hostile/frontier/ranged/trooper/ak47
icon_state = "frontiersmanrangedak47"
icon_living = "frontiersmanrangedak47"
@@ -78,9 +70,6 @@
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/automatic/assault/ak47)
-/mob/living/simple_animal/hostile/frontier/ranged/trooper/ak47/neutured
- loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)
-
/mob/living/simple_animal/hostile/frontier/ranged/trooper/rifle
icon_state = "frontiersmanrangedmosin"
icon_living = "frontiersmanrangedmosin"
@@ -90,9 +79,6 @@
casingtype = /obj/item/ammo_casing/a762_54
projectilesound = 'sound/weapons/gun/rifle/mosin.ogg'
-/mob/living/simple_animal/hostile/frontier/ranged/trooper/rifle/neutered
- loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper)
-
/mob/living/simple_animal/hostile/frontier/ranged/trooper/heavy
icon_state = "frontiersmanrangedminigun"
icon_living = "frontiersmanrangedminigun"
@@ -105,9 +91,6 @@
projectiletype = /obj/projectile/beam/weak/penetrator
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy)
-/mob/living/simple_animal/hostile/frontier/ranged/trooper/heavy/neutered
- loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/gunless)
-
/mob/living/simple_animal/hostile/frontier/ranged/officer
name = "Frontiersman Officer"
icon_state = "frontiersmanofficer"
@@ -119,9 +102,6 @@
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer,
/obj/item/gun/ballistic/automatic/pistol/APS)
-/mob/living/simple_animal/hostile/frontier/ranged/officer/neutured
- loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/officer)
-
/mob/living/simple_animal/hostile/frontier/ranged/officer/Aggro()
..()
summon_backup(15)
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
index c7cca51545cc9..91da0614fb50d 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
@@ -47,7 +47,7 @@
flag = "energy"
light_color = LIGHT_COLOR_YELLOW
hitsound = 'sound/weapons/sear.ogg'
- hitsound_non_living = 'sound/weapons/effects/searwall.ogg'
+ hitsound_wall = 'sound/weapons/effects/searwall.ogg'
nondirectional_sprite = TRUE
/obj/projectile/seedling/Bump(atom/A)//Stops seedlings from destroying other jungle mobs through FF
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 01c2ee10ed264..49fe6a0f059e2 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -449,36 +449,32 @@
* [this byond forum post](https://secure.byond.com/forum/?post=1326139&page=2#comment8198716)
* for why this isn't atom/verb/examine()
*/
-/mob/verb/examinate(atom/examinify as mob|obj|turf in view()) //It used to be oview(12), but I can't really say why
+/mob/verb/examinate(atom/A as mob|obj|turf in view()) //It used to be oview(12), but I can't really say why
set name = "Examine"
set category = "IC"
- DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, .proc/run_examinate, examinify))
-
-/mob/proc/run_examinate(atom/examinify)
-
- if(isturf(examinify) && !(sight & SEE_TURFS) && !(examinify in view(client ? client.view : world.view, src)))
+ if(isturf(A) && !(sight & SEE_TURFS) && !(A in view(client ? client.view : world.view, src)))
// shift-click catcher may issue examinate() calls for out-of-sight turfs
return
- if(is_blind() && !blind_examine_check(examinify)) //blind people see things differently (through touch)
+ if(is_blind() && !blind_examine_check(A)) //blind people see things differently (through touch)
return
- face_atom(examinify)
+ face_atom(A)
var/list/result
if(client)
LAZYINITLIST(client.recent_examines)
- if(isnull(client.recent_examines[examinify]) || client.recent_examines[examinify] < world.time)
- result = examinify.examine(src)
- client.recent_examines[examinify] = world.time + EXAMINE_MORE_TIME // set the value to when the examine cooldown ends
- RegisterSignal(examinify, COMSIG_PARENT_QDELETING, .proc/clear_from_recent_examines, override=TRUE) // to flush the value if deleted early
- addtimer(CALLBACK(src, .proc/clear_from_recent_examines, examinify), EXAMINE_MORE_TIME)
- handle_eye_contact(examinify)
+ if(isnull(client.recent_examines[A]) || client.recent_examines[A] < world.time)
+ result = A.examine(src)
+ client.recent_examines[A] = world.time + EXAMINE_MORE_TIME // set the value to when the examine cooldown ends
+ RegisterSignal(A, COMSIG_PARENT_QDELETING, .proc/clear_from_recent_examines, override=TRUE) // to flush the value if deleted early
+ addtimer(CALLBACK(src, .proc/clear_from_recent_examines, A), EXAMINE_MORE_TIME)
+ handle_eye_contact(A)
else
- result = examinify.examine_more(src)
+ result = A.examine_more(src)
else
- result = examinify.examine(src) // if a tree is examined but no client is there to see it, did the tree ever really exist?
+ result = A.examine(src) // if a tree is examined but no client is there to see it, did the tree ever really exist?
if(result.len)
for(var/i in 1 to (length(result) - 1))
@@ -486,7 +482,7 @@
to_chat(src, examine_block("
[result.Join()]"))
- SEND_SIGNAL(src, COMSIG_MOB_EXAMINATE, examinify)
+ SEND_SIGNAL(src, COMSIG_MOB_EXAMINATE, A)
/mob/proc/blind_examine_check(atom/examined_thing)
@@ -608,10 +604,6 @@
set category = "Object"
set src = usr
- DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, .proc/execute_mode))
-
-///proc version to finish /mob/verb/mode() execution. used in case the proc needs to be queued for the tick after its first called
-/mob/proc/execute_mode()
if(ismecha(loc))
return
@@ -623,22 +615,6 @@
I.attack_self(src)
update_inv_hands()
-/mob/verb/do_unique_action()
- set name = "Do Unique Action"
- set category = "Object"
- set src = usr
-
- if(ismecha(loc))
- return
-
- if(incapacitated())
- return
-
- var/obj/item/I = get_active_held_item()
- if(I)
- I.unique_action(src)
- update_inv_hands()
-
/**
* Get the notes of this mob
*
@@ -1184,8 +1160,7 @@
/mob/proc/update_mouse_pointer()
if(!client)
return
- if(client.mouse_pointer_icon != initial(client.mouse_pointer_icon))//only send changes to the client if theyre needed
- client.mouse_pointer_icon = initial(client.mouse_pointer_icon)
+ client.mouse_pointer_icon = initial(client.mouse_pointer_icon)
if(examine_cursor_icon && client.keys_held["Shift"]) //mouse shit is hardcoded, make this non hard-coded once we make mouse modifiers bindable
client.mouse_pointer_icon = examine_cursor_icon
if(istype(loc, /obj/vehicle/sealed))
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index de1cb857ed4ed..4c4a58378410a 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -221,37 +221,23 @@
return sanitize(.)
///Shake the camera of the person viewing the mob SO REAL!
-/proc/shake_camera(mob/recoilster, duration, strength=1)
- if(!recoilster || !recoilster.client || duration < 1)
+/proc/shake_camera(mob/M, duration, strength=1)
+ if(!M || !M.client || duration < 1)
return
- var/client/client_to_shake = recoilster.client
- var/oldx = client_to_shake.pixel_x
- var/oldy = client_to_shake.pixel_y
+ var/client/C = M.client
+ var/oldx = C.pixel_x
+ var/oldy = C.pixel_y
var/max = strength*world.icon_size
var/min = -(strength*world.icon_size)
for(var/i in 0 to duration-1)
if (i == 0)
- animate(client_to_shake, pixel_x=rand(min,max), pixel_y=rand(min,max), time=1)
+ animate(C, pixel_x=rand(min,max), pixel_y=rand(min,max), time=1)
else
animate(pixel_x=rand(min,max), pixel_y=rand(min,max), time=1)
animate(pixel_x=oldx, pixel_y=oldy, time=1)
-/proc/recoil_camera(mob/recoilster, duration, backtime_duration, strength, angle)
- if(!recoilster || !recoilster.client)
- return
- strength *= world.icon_size
- var/client/client_to_shake = recoilster.client
- var/oldx = client_to_shake.pixel_x
- var/oldy = client_to_shake.pixel_y
-
- //get pixels to move the camera in an angle
- var/mpx = sin(angle) * strength
- var/mpy = cos(angle) * strength
- animate(client_to_shake, pixel_x = oldx+mpx, pixel_y = oldy+mpy, time = duration, flags = ANIMATION_RELATIVE)
- animate(pixel_x = oldx, pixel_y = oldy, time = backtime_duration, easing = BACK_EASING)
-
///Find if the message has the real name of any user mob in the mob_list
/proc/findname(msg)
if(!istext(msg))
diff --git a/code/modules/mob/mob_say.dm b/code/modules/mob/mob_say.dm
index 495f77dc03846..7e70eb0ee1593 100644
--- a/code/modules/mob/mob_say.dm
+++ b/code/modules/mob/mob_say.dm
@@ -13,7 +13,7 @@
//queue this message because verbs are scheduled to process after SendMaps in the tick and speech is pretty expensive when it happens.
//by queuing this for next tick the mc can compensate for its cost instead of having speech delay the start of the next tick
if(message)
- QUEUE_OR_CALL_VERB_FOR(VERB_CALLBACK(src, /atom/movable/proc/say, message), SSspeech_controller)
+ SSspeech_controller.queue_say_for_mob(src, message, SPEECH_CONTROLLER_QUEUE_SAY_VERB)
///Whisper verb
/mob/verb/whisper_verb(message as text)
@@ -24,7 +24,7 @@
to_chat(usr, "
Speech is currently admin-disabled.")
return
if(message)
- QUEUE_OR_CALL_VERB_FOR(VERB_CALLBACK(src, /mob/proc/whisper, message), SSspeech_controller)
+ SSspeech_controller.queue_say_for_mob(src, message, SPEECH_CONTROLLER_QUEUE_WHISPER_VERB)
///whisper a message
/mob/proc/whisper(message, datum/language/language=null)
@@ -43,7 +43,7 @@
message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
- QUEUE_OR_CALL_VERB_FOR(VERB_CALLBACK(src, /mob/proc/emote, "me", 1, message, TRUE), SSspeech_controller)
+ SSspeech_controller.queue_say_for_mob(src, message, SPEECH_CONTROLLER_QUEUE_EMOTE_VERB)
///Speak as a dead person (ghost etc)
/mob/proc/say_dead(message)
diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm
index d2e6a4f0dda2d..83bb19a33882b 100644
--- a/code/modules/mob/say_vr.dm
+++ b/code/modules/mob/say_vr.dm
@@ -10,22 +10,28 @@
set src in usr
if(usr != src)
- to_chat(usr, span_warning("You can't set someone else's flavour text!"))
+ usr << "No."
var/msg = sanitize(input(usr,"Set the flavor text in your 'examine' verb. Can also be used for OOC notes about your character.","Flavor Text",html_decode(flavor_text)) as message|null)
- if(msg)
+ if(msg) //WS edit - "Cancel" does not clear flavor text
msg = copytext(msg, 1, MAX_MESSAGE_LEN)
msg = html_encode(msg)
flavor_text = msg
+/mob/proc/warn_flavor_changed()
+ if(flavor_text && flavor_text != "") // don't spam people that don't use it!
+ src << "
OOC Warning:
"
+ src << "
Your flavor text is likely out of date! Change"
+
/mob/proc/print_flavor_text()
if(flavor_text && flavor_text != "")
var/msg = replacetext(flavor_text, "\n", " ")
if(length(msg) <= 100)
return "
[msg]"
else
- return "
[copytext(msg, 1, 97)]... More..."
+ return "
[copytext(msg, 1, 97)]... More..."
+
/mob/proc/get_top_level_mob()
if(istype(src.loc,/mob)&&src.loc!=src)
diff --git a/code/modules/movespeed/modifiers/items.dm b/code/modules/movespeed/modifiers/items.dm
index b10e25c84e7a3..32f5756e08430 100644
--- a/code/modules/movespeed/modifiers/items.dm
+++ b/code/modules/movespeed/modifiers/items.dm
@@ -11,9 +11,5 @@
/datum/movespeed_modifier/die_of_fate
multiplicative_slowdown = 1
-/datum/movespeed_modifier/gun
- multiplicative_slowdown = 1
- variable = TRUE
-
/datum/movespeed_modifier/berserk
multiplicative_slowdown = -0.2
diff --git a/code/modules/overmap/objects/outpost/outpost.dm b/code/modules/overmap/objects/outpost/outpost.dm
index 8613d9ee62deb..25da722e6509a 100644
--- a/code/modules/overmap/objects/outpost/outpost.dm
+++ b/code/modules/overmap/objects/outpost/outpost.dm
@@ -15,11 +15,11 @@
/// and tall hangars (with a greater height than width) in the list is discouraged; it is possible that a large hangar will "hide" a
/// smaller one by appearing earlier in the sorted list.
var/list/datum/map_template/outpost/hangar/hangar_templates = list(
- /datum/map_template/outpost/hangar/indie_space_20x20,
- /datum/map_template/outpost/hangar/indie_space_40x20,
- /datum/map_template/outpost/hangar/indie_space_40x40,
- /datum/map_template/outpost/hangar/indie_space_56x20,
- /datum/map_template/outpost/hangar/indie_space_56x40
+ /datum/map_template/outpost/hangar/test_20x20,
+ /datum/map_template/outpost/hangar/test_40x20,
+ /datum/map_template/outpost/hangar/test_40x40,
+ /datum/map_template/outpost/hangar/test_56x20,
+ /datum/map_template/outpost/hangar/test_56x40
)
// NOTE: "planetary" outposts should use baseturf specification and possibly different ztrait sun type, for both hangars and main level.
var/list/main_level_ztraits = list(
diff --git a/code/modules/overmap/objects/outpost/outpost_types.dm b/code/modules/overmap/objects/outpost/outpost_types.dm
index fd30ff4e8ab8c..6a37077d0289d 100644
--- a/code/modules/overmap/objects/outpost/outpost_types.dm
+++ b/code/modules/overmap/objects/outpost/outpost_types.dm
@@ -9,92 +9,90 @@
var/dock_width
var/dock_height
+
+/datum/map_template/outpost/outpost_test_1
+ name = "outpost_test_1"
+
+/datum/map_template/outpost/outpost_test_2
+ name = "outpost_test_2"
+
/datum/map_template/outpost/elevator_test
name = "elevator_test"
-/*
- Independent Space Outpost //creative name!
-*/
-/datum/map_template/outpost/indie_space
- name = "indie_space"
-/datum/map_template/outpost/hangar/indie_space_20x20
- name = "hangar/indie_space_20x20"
+/datum/map_template/outpost/hangar/test_20x20
+ name = "hangar/test_20x20"
dock_width = 20
dock_height = 20
-/datum/map_template/outpost/hangar/indie_space_40x20
- name = "hangar/indie_space_40x20"
+/datum/map_template/outpost/hangar/test_40x20
+ name = "hangar/test_40x20"
dock_width = 40
dock_height = 20
-/datum/map_template/outpost/hangar/indie_space_40x40
- name = "hangar/indie_space_40x40"
+/datum/map_template/outpost/hangar/test_40x40
+ name = "hangar/test_40x40"
dock_width = 40
dock_height = 40
-/datum/map_template/outpost/hangar/indie_space_56x20
- name = "hangar/indie_space_56x20"
+/datum/map_template/outpost/hangar/test_56x20
+ name = "hangar/test_56x20"
dock_width = 56
dock_height = 20
-/datum/map_template/outpost/hangar/indie_space_56x40
- name = "hangar/indie_space_56x40"
+/datum/map_template/outpost/hangar/test_56x40
+ name = "hangar/test_56x40"
dock_width = 56
dock_height = 40
-/*
- Nanotrasen Ice Asteroid
-*/
-/datum/map_template/outpost/nt_asteroid
- name = "nanotrasen_asteroid"
-/datum/map_template/outpost/hangar/nt_asteroid_20x20
- name = "hangar/nt_asteroid_20x20"
+/datum/map_template/outpost/hangar/test_2_20x20
+ name = "hangar/test_2_20x20"
dock_width = 20
dock_height = 20
-/datum/map_template/outpost/hangar/nt_asteroid_40x20
- name = "hangar/nt_asteroid_40x20"
+/datum/map_template/outpost/hangar/test_2_40x20
+ name = "hangar/test_2_40x20"
dock_width = 40
dock_height = 20
-/datum/map_template/outpost/hangar/nt_asteroid_40x40
- name = "hangar/nt_asteroid_40x40"
+/datum/map_template/outpost/hangar/test_2_40x40
+ name = "hangar/test_2_40x40"
dock_width = 40
dock_height = 40
-/datum/map_template/outpost/hangar/nt_asteroid_56x20
- name = "hangar/nt_asteroid_56x20"
+/datum/map_template/outpost/hangar/test_2_56x20
+ name = "hangar/test_2_56x20"
dock_width = 56
dock_height = 20
-/datum/map_template/outpost/hangar/nt_asteroid_56x40
- name = "hangar/nt_asteroid_56x40"
- dock_width = 56
- dock_height = 40
+// does not currently exist
+// /datum/map_template/outpost/hangar/test_2_56x40
+// name = "hangar/test_2_56x40"
+// dock_width = 56
+// dock_height = 40
/*
/datum/overmap/outpost subtypes
*/
-/datum/overmap/outpost/indie_space
+/datum/overmap/outpost/test_1
token_icon_state = "station_1"
- main_template = /datum/map_template/outpost/indie_space
+ main_template = /datum/map_template/outpost/outpost_test_1
elevator_template = /datum/map_template/outpost/elevator_test
// Uses "test" hangars.
-/datum/overmap/outpost/nanotrasen_asteroid
+/datum/overmap/outpost/test_2
token_icon_state = "station_asteroid_0"
- main_template = /datum/map_template/outpost/nt_asteroid
+ main_template = /datum/map_template/outpost/outpost_test_2
elevator_template = /datum/map_template/outpost/elevator_test
- // Using a second list of hangar templates.
+ // Using an (incomplete) second list of hangar templates. Note that the 56x40 hangar is the first skin.
hangar_templates = list(
- /datum/map_template/outpost/hangar/nt_asteroid_20x20,
- /datum/map_template/outpost/hangar/nt_asteroid_40x20,
- /datum/map_template/outpost/hangar/nt_asteroid_40x40,
- /datum/map_template/outpost/hangar/nt_asteroid_56x20,
- /datum/map_template/outpost/hangar/nt_asteroid_56x40
+ /datum/map_template/outpost/hangar/test_2_20x20,
+ /datum/map_template/outpost/hangar/test_2_40x20,
+ /datum/map_template/outpost/hangar/test_2_40x40,
+ /datum/map_template/outpost/hangar/test_2_56x20,
+ /datum/map_template/outpost/hangar/test_56x40
)
/datum/overmap/outpost/no_main_level // For example and adminspawn.
diff --git a/code/modules/point/point.dm b/code/modules/point/point.dm
index fd8a8e1a510ce..8e311c339fde7 100644
--- a/code/modules/point/point.dm
+++ b/code/modules/point/point.dm
@@ -98,19 +98,10 @@
/mob/verb/pointed(atom/A as mob|obj|turf in view())
set name = "Point To"
set category = "Object"
-
- if(istype(A, /obj/effect/temp_visual/point))
+ if(client && !(A in view(client.view, src)))
return FALSE
-
- DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, .proc/_pointed, A))
-
-/// possibly delayed verb that finishes the pointing process starting in [/mob/verb/pointed()].
-/// either called immediately or in the tick after pointed() was called, as per the [DEFAULT_QUEUE_OR_CALL_VERB()] macro
-/mob/proc/_pointed(atom/pointing_at)
- if(client && !(pointing_at in view(client.view, src)))
+ if(istype(A, /obj/effect/temp_visual/point))
return FALSE
-
- point_at(pointing_at)
-
- SEND_SIGNAL(src, COMSIG_MOB_POINTED, pointing_at)
+ point_at(A)
+ SEND_SIGNAL(src, COMSIG_MOB_POINTED, A)
return TRUE
diff --git a/code/modules/projectiles/ammunition/_ammunition.dm b/code/modules/projectiles/ammunition/_ammunition.dm
index 9a34e0cff94a5..6222f147861e5 100644
--- a/code/modules/projectiles/ammunition/_ammunition.dm
+++ b/code/modules/projectiles/ammunition/_ammunition.dm
@@ -23,7 +23,7 @@
/// The sound played when this ammo is fired by an energy gun.
var/fire_sound = null
/// The visual effect that appears when the ammo is fired.
- var/firing_effect_type
+ var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect
/// Enables casing spinning and sizzling after being ejected from a gun.
var/heavy_metal = TRUE
/// If true, the casing's sprite will automatically be transformed in Initialize().
@@ -36,8 +36,6 @@
var/delay = 0 //Delay for energy weapons
var/click_cooldown_override = 0 //Override this to make your gun have a faster fire rate, in tenths of a second. 4 is the default gun cooldown.
- var/list/bounce_sfx_override // if true, overrides the bouncing sfx from the turf to this one
-
/obj/item/ammo_casing/spent
name = "spent bullet casing"
@@ -106,10 +104,7 @@
update_appearance()
SpinAnimation(10, 1)
var/turf/T = get_turf(src)
- if(bounce_sfx_override)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, pick(bounce_sfx_override), 20, 1), bounce_delay) //Soft / non-solid turfs that shouldn't make a sound when a shell casing is ejected over them.
- return
if(still_warm && T && T.bullet_sizzle)
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/items/welder.ogg', 20, 1), bounce_delay) //If the turf is made of water and the shell casing is still hot, make a sizzling sound when it's ejected.
else if(T && T.bullet_bounce_sound)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, pick(T.bullet_bounce_sound), 20, 1), bounce_delay) //Soft / non-solid turfs that shouldn't make a sound when a shell casing is ejected over them.
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, T.bullet_bounce_sound, 20, 1), bounce_delay) //Soft / non-solid turfs that shouldn't make a sound when a shell casing is ejected over them.
diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm
index b9237ea91b4d8..15abfdb02e10c 100644
--- a/code/modules/projectiles/ammunition/ballistic/pistol.dm
+++ b/code/modules/projectiles/ammunition/ballistic/pistol.dm
@@ -127,11 +127,3 @@
name = ".50 AE hollow point bullet casing"
desc = "A .50 AE hollow point bullet casing."
projectile_type = /obj/projectile/bullet/a50AE/hp
-
-// .22 LR (Himehabu)
-/obj/item/ammo_casing/c22lr
- name = ".22 LR bullet casing"
- desc = "A .22 LR bullet casing."
- projectile_type = /obj/projectile/bullet/c22lr
- caliber = "22lr"
-
diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
index b297ee30e7760..9f74727086e59 100644
--- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm
+++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
@@ -9,8 +9,6 @@
custom_materials = list(/datum/material/iron=4000)
projectile_type = /obj/projectile/bullet/slug
- bounce_sfx_override = 'sound/weapons/gun/general/bulletcasing_shotgun_bounce.ogg'
-
/obj/item/ammo_casing/shotgun/update_icon_state()
icon_state = "[initial(icon_state)][BB ? "" : "-spent"]"
return ..()
diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm
index 1e2d929960773..05653dab0bd85 100644
--- a/code/modules/projectiles/ammunition/energy/laser.dm
+++ b/code/modules/projectiles/ammunition/energy/laser.dm
@@ -151,5 +151,4 @@
select_name = "kill"
projectile_type = /obj/projectile/beam/weak/penetrator
variance = 0.8
- delay = 0.5
fire_sound = 'sound/weapons/laser4.ogg'
diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
index c3989e7a4952f..932c438ff1699 100644
--- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm
+++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
@@ -127,8 +127,7 @@
return
A.forceMove(drop_location())
- var/mob/living/carbon/human/H = user
- if(!(user.is_holding(src) || H.l_store == src || H.r_store == src) || !user.put_in_hands(A)) //incase they're using TK
+ if(!user.is_holding(src) || !user.put_in_hands(A)) //incase they're using TK
A.bounce_away(FALSE, NONE)
playsound(src, 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE)
to_chat(user, "
You remove a round from [src]!")
@@ -160,19 +159,6 @@
temp_materials[material] = (bullet_cost[material] * stored_ammo.len) + base_cost[material]
set_custom_materials(temp_materials)
-/obj/item/ammo_box/AltClick(mob/user)
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- if((user.is_holding(src) ||H.l_store == src || H.r_store == src) && !(caliber || istype(src, /obj/item/ammo_box/magazine) || instant_load)) //caliber because boxes have none, instant load because speedloaders use the base ammo box type with instant load on, and magazine for the obvious.
- attack_self(user)
- return
- ..()
-
-/obj/item/ammo_box/examine(mob/user)
- . = ..()
- if(!(caliber || istype(src, /obj/item/ammo_box/magazine) || instant_load))
- . += "Alt-click on [src] while it in a pocket or your off-hand to take out a round while it is there."
-
/obj/item/ammo_box/magazine
w_class = WEIGHT_CLASS_SMALL //Default magazine weight, only differs for tiny mags and drums
diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
index e8c47f60f85b6..0336744ec7484 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -150,7 +150,6 @@
max_ammo = 22
multiple_sprites = AMMO_BOX_FULL_EMPTY
item_flags = NO_MAT_REDEMPTION
- instant_load = TRUE
// Ammo Boxes
@@ -367,21 +366,3 @@
icon_state = "foambox_riot"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
custom_materials = list(/datum/material/iron = 50000)
-
-/obj/item/ammo_box/c22lr_box
- name = "ammo box (.22 LR)"
- desc = "A box of standard .22 LR ammo."
- icon_state = "22lrbox"
- ammo_type = /obj/item/ammo_casing/c22lr
- max_ammo = 75
-
-/obj/item/ammo_box/c45_speedloader
- name = "speed loader (.45)"
- desc = "Designed to quickly reload revolvers."
- icon_state = "38"
- ammo_type = /obj/item/ammo_casing/c45
- max_ammo = 6
- multiple_sprites = AMMO_BOX_PER_BULLET
- custom_materials = list(/datum/material/iron = 15000)
- w_class = WEIGHT_CLASS_TINY
- instant_load = TRUE
diff --git a/code/modules/projectiles/boxes_magazines/external/gauss.dm b/code/modules/projectiles/boxes_magazines/external/gauss.dm
index fa3797707ce63..ca497d6560cb7 100644
--- a/code/modules/projectiles/boxes_magazines/external/gauss.dm
+++ b/code/modules/projectiles/boxes_magazines/external/gauss.dm
@@ -9,7 +9,7 @@
/obj/item/ammo_box/magazine/modelh
name = "Model H magazine (ferromagnetic slugs)"
- desc = "A 10-round magazine for the Model H pistol. Ferromagnetic slugs are slow and incredibly powerful bullets, but are easily stopped by even a sliver of armor."
+ desc = "A 10-round magazine for the Model H pistol. Ferromagnetic slugs are slow, but do incredible damage with significant armor penetration."
icon_state = "smallmagmag"
ammo_type = /obj/item/ammo_casing/caseless/gauss/slug
caliber = "slug"
diff --git a/code/modules/projectiles/boxes_magazines/external/lmg.dm b/code/modules/projectiles/boxes_magazines/external/lmg.dm
index 402db15028537..192a9f7238576 100644
--- a/code/modules/projectiles/boxes_magazines/external/lmg.dm
+++ b/code/modules/projectiles/boxes_magazines/external/lmg.dm
@@ -5,7 +5,7 @@
base_icon_state = "a762"
ammo_type = /obj/item/ammo_casing/mm712x82
caliber = "7.12x82mm"
- max_ammo = 100
+ max_ammo = 50
w_class = WEIGHT_CLASS_NORMAL
/obj/item/ammo_box/magazine/mm712x82/hollow
@@ -30,4 +30,4 @@
/obj/item/ammo_box/magazine/mm712x82/update_icon_state()
. = ..()
- icon_state = "[base_icon_state]-[round(ammo_count(), 20)]"
+ icon_state = "[base_icon_state]-[round(ammo_count(), 10)]"
diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm
index cc92a758eba00..ca4702b641d7b 100644
--- a/code/modules/projectiles/boxes_magazines/external/pistol.dm
+++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm
@@ -136,12 +136,3 @@
caliber = "9mm"
max_ammo = 4
custom_materials = list(/datum/material/iron = 20000)
-
-/obj/item/ammo_box/magazine/m22lr
- name = "pistol magazine (.22 LR)"
- desc = "A single-stack handgun magazine designed to chamber .22 LR. It's rather tiny, all things considered."
- icon_state = "pistol_22lr"
- ammo_type = /obj/item/ammo_casing/c22lr
- caliber = "22lr"
- max_ammo = 10
- w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm
index 9ae63763593be..86fef186652ba 100644
--- a/code/modules/projectiles/boxes_magazines/external/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm
@@ -27,7 +27,7 @@
base_icon_state = "47x33mm"
ammo_type = /obj/item/ammo_casing/caseless/c47x33mm
caliber = "4.73x33mm caseless"
- max_ammo = 100 //brrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
+ max_ammo = 50 //brrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
w_class = WEIGHT_CLASS_NORMAL
/obj/item/ammo_box/magazine/rifle47x33mm/update_icon_state()
@@ -64,7 +64,7 @@
icon_state = "ak47_mag"
ammo_type = /obj/item/ammo_casing/a762_39
caliber = "7.62x39mm"
- max_ammo = 30
+ max_ammo = 20
/obj/item/ammo_box/magazine/ak47/update_icon_state()
. = ..()
diff --git a/code/modules/projectiles/boxes_magazines/internal/gauss.dm b/code/modules/projectiles/boxes_magazines/internal/gauss.dm
index 6e561f6d26d51..06527ae491972 100644
--- a/code/modules/projectiles/boxes_magazines/internal/gauss.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/gauss.dm
@@ -3,4 +3,3 @@
ammo_type = /obj/item/ammo_casing/caseless/gauss
caliber = "pellet"
max_ammo = 22
- instant_load = TRUE
diff --git a/code/modules/projectiles/boxes_magazines/internal/revolver.dm b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
index 7715d31b1323e..13b007e229e09 100644
--- a/code/modules/projectiles/boxes_magazines/internal/revolver.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
@@ -32,10 +32,3 @@
/obj/item/ammo_box/magazine/internal/cylinder/pepperbox
name = "pepperbox revolver cylinder"
max_ammo = 5
-
-/obj/item/ammo_box/magazine/internal/cylinder/rev45
- name = "cattleman revolver cylinder"
- ammo_type = /obj/item/ammo_casing/c45
- caliber = ".45"
- max_ammo = 6
- instant_load = TRUE
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 6cd673874f31b..f91fa467cfefd 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -31,6 +31,7 @@
var/suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
var/suppressed_volume = 60
var/can_unsuppress = TRUE
+ var/recoil = 0 //boom boom shake the room
var/clumsy_check = TRUE
var/obj/item/ammo_casing/chambered = null
trigger_guard = TRIGGER_GUARD_NORMAL //trigger guard on the weapon, hulks can't fire them with their big meaty fingers
@@ -42,6 +43,7 @@
var/semicd = 0 //cooldown handler
var/weapon_weight = WEAPON_LIGHT
var/dual_wield_spread = 24 //additional spread when dual wielding
+ var/spread = 0 //Spread induced by the gun itself.
var/randomspread = 1 //Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.
var/projectile_damage_multiplier = 1 //Alters projectile damage multiplicatively based on this value. Use it for "better" or "worse" weapons that use the same ammo.
@@ -75,78 +77,14 @@
var/pb_knockback = 0
- var/wielded = FALSE // true if the gun is wielded via twohanded component, shouldnt affect anything else
-
- var/wielded_fully = FALSE // true if the gun is wielded after delay, should affects accuracy
-
- ///How much the bullet scatters when fired while wielded.
- var/spread = 4
- ///How much the bullet scatters when fired while unwielded.
- var/spread_unwielded = 12
-
- ///Screen shake when the weapon is fired while wielded.
- var/recoil = 0
- ///Screen shake when the weapon is fired while unwielded.
- var/recoil_unwielded = 0
- ///a multiplier of the duration the recoil takes to go back to normal view, this is (recoil*recoil_backtime_multiplier)+1
- var/recoil_backtime_multiplier = 2
- ///this is how much deviation the gun recoil can have, recoil pushes the screen towards the reverse angle you shot + some deviation which this is the max.
- var/recoil_deviation = 22.5
-
- ///Slowdown for wielding
- var/wield_slowdown = 0.1
- ///How long between wielding and firing in tenths of seconds
- var/wield_delay = 0.4 SECONDS
- ///Storing value for above
- var/wield_time = 0
-
- ///Effect for the muzzle flash of the gun.
- var/obj/effect/muzzle_flash/muzzle_flash
- ///Icon state of the muzzle flash effect.
- var/muzzleflash_iconstate
- ///Brightness of the muzzle flash effect.
- var/muzzle_flash_lum = 3
- ///Color of the muzzle flash effect.
- var/muzzle_flash_color = COLOR_VERY_SOFT_YELLOW
-
/obj/item/gun/Initialize()
. = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
if(pin)
pin = new pin(src)
if(gun_light)
alight = new(src)
- muzzle_flash = new(src, muzzleflash_iconstate)
build_zooming()
-/obj/item/gun/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed)
-
-/// triggered on wield of two handed item
-/obj/item/gun/proc/on_wield(obj/item/source, mob/user)
- wielded = TRUE
- INVOKE_ASYNC(src, .proc.do_wield, user)
-
-/obj/item/gun/proc/do_wield(mob/user)
- user.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/gun, multiplicative_slowdown = wield_slowdown)
- wield_time = world.time + wield_delay
- if(wield_time > 0)
- if(do_mob(user, user, wield_delay, FALSE, TRUE, CALLBACK(src, .proc/is_wielded), ignore_loc_change = TRUE))
- wielded_fully = TRUE
- else
- wielded_fully = TRUE
-
-/obj/item/gun/proc/is_wielded()
- return wielded
-
-/// triggered on unwield of two handed item
-/obj/item/gun/proc/on_unwield(obj/item/source, mob/user)
- wielded = FALSE
- wielded_fully = FALSE
- user.remove_movespeed_modifier(/datum/movespeed_modifier/gun)
-
/obj/item/gun/Destroy()
if(isobj(pin)) //Can still be the initial path, then we skip
QDEL_NULL(pin)
@@ -160,8 +98,6 @@
QDEL_NULL(azoom)
if(isatom(suppressed)) //SUPPRESSED IS USED AS BOTH A TRUE/FALSE AND AS A REF, WHAT THE FUCKKKKKKKKKKKKKKKKK
QDEL_NULL(suppressed)
- if(muzzle_flash)
- QDEL_NULL(muzzle_flash)
return ..()
/obj/item/gun/handle_atom_del(atom/A)
@@ -218,15 +154,8 @@
/obj/item/gun/proc/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1)
- var/actual_angle = get_angle_with_scatter((user || get_turf(src)), pbtarget, rand(-recoil_deviation, recoil_deviation) + 180)
- var/muzzle_angle = Get_Angle(get_turf(src), pbtarget)
- if(muzzle_flash && !muzzle_flash.applied)
- handle_muzzle_flash(user, muzzle_angle)
-
- if(wielded_fully && recoil)
- simulate_recoil(user, recoil, actual_angle)
- else if(!wielded_fully && recoil_unwielded)
- simulate_recoil(user, recoil_unwielded, actual_angle)
+ if(recoil)
+ shake_camera(user, recoil + 1, recoil)
if(suppressed)
playsound(user, suppressed_sound, suppressed_volume, vary_fire_sound, ignore_walls = FALSE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_distance = 0)
@@ -295,8 +224,9 @@
if(check_botched(user))
return
- if(weapon_weight == WEAPON_HEAVY && (!wielded))
- to_chat(user, "
You need a more secure grip to fire [src]!")
+ var/obj/item/bodypart/other_hand = user.has_hand_for_held_index(user.get_inactive_hand_index()) //returns non-disabled inactive hands
+ if(weapon_weight == WEAPON_HEAVY && (user.get_inactive_held_item() || !other_hand))
+ to_chat(user, "
You need two hands to fire [src]!")
return
//DUAL (or more!) WIELDING
var/bonus_spread = 0
@@ -392,12 +322,8 @@
var/sprd = 0
var/randomized_gun_spread = 0
var/rand_spr = rand()
-
- if(wielded_fully && spread)
+ if(spread)
randomized_gun_spread = rand(0,spread)
- else if(!wielded_fully && spread_unwielded)
- randomized_gun_spread = rand(0,spread_unwielded)
-
if(HAS_TRAIT(user, TRAIT_POOR_AIM)) //nice shootin' tex
bonus_spread += 25
var/randomized_bonus_spread = rand(0, bonus_spread)
@@ -427,9 +353,8 @@
return
process_chamber()
update_appearance()
- if(fire_delay)
- semicd = TRUE
- addtimer(CALLBACK(src, .proc/reset_semicd), fire_delay)
+ semicd = TRUE
+ addtimer(CALLBACK(src, .proc/reset_semicd), fire_delay)
if(user)
user.update_inv_hands()
@@ -625,7 +550,7 @@
gun_light.update_brightness()
to_chat(user, "
You toggle the gunlight [gun_light.on ? "on":"off"].")
- playsound(user, gun_light.on ? gun_light.toggle_on_sound : gun_light.toggle_off_sound, 40, TRUE)
+ playsound(user, 'sound/weapons/empty.ogg', 100, TRUE)
update_gunlight()
/obj/item/gun/proc/update_gunlight()
@@ -712,111 +637,6 @@
/obj/item/gun/proc/before_firing(atom/target,mob/user)
return
-/obj/item/gun/proc/simulate_recoil(mob/living/user, recoil_bonus = 0, firing_angle)
- var/total_recoil = recoil_bonus
-
- var/actual_angle = firing_angle + rand(-recoil_deviation, recoil_deviation) + 180
- if(actual_angle > 360)
- actual_angle -= 360
- if(total_recoil > 0)
- recoil_camera(user, total_recoil + 1, (total_recoil * recoil_backtime_multiplier)+1, total_recoil, actual_angle)
- return TRUE
-
-/obj/item/gun/proc/handle_muzzle_flash(mob/living/user, firing_angle)
- var/atom/movable/flash_loc = user
- var/prev_light = light_range
- if(!light_on && (light_range <= muzzle_flash_lum))
- set_light_range(muzzle_flash_lum)
- set_light_color(muzzle_flash_color)
- set_light_on(TRUE)
- update_light()
- addtimer(CALLBACK(src, .proc/reset_light_range, prev_light), 1 SECONDS)
- //Offset the pixels.
- switch(firing_angle)
- if(0, 360)
- muzzle_flash.pixel_x = 0
- muzzle_flash.pixel_y = 8
- muzzle_flash.layer = initial(muzzle_flash.layer)
- if(1 to 44)
- muzzle_flash.pixel_x = round(4 * ((firing_angle) / 45))
- muzzle_flash.pixel_y = 8
- muzzle_flash.layer = initial(muzzle_flash.layer)
- if(45)
- muzzle_flash.pixel_x = 8
- muzzle_flash.pixel_y = 8
- muzzle_flash.layer = initial(muzzle_flash.layer)
- if(46 to 89)
- muzzle_flash.pixel_x = 8
- muzzle_flash.pixel_y = round(4 * ((90 - firing_angle) / 45))
- muzzle_flash.layer = initial(muzzle_flash.layer)
- if(90)
- muzzle_flash.pixel_x = 8
- muzzle_flash.pixel_y = 0
- muzzle_flash.layer = initial(muzzle_flash.layer)
- if(91 to 134)
- muzzle_flash.pixel_x = 8
- muzzle_flash.pixel_y = round(-3 * ((firing_angle - 90) / 45))
- muzzle_flash.layer = initial(muzzle_flash.layer)
- if(135)
- muzzle_flash.pixel_x = 8
- muzzle_flash.pixel_y = -6
- muzzle_flash.layer = initial(muzzle_flash.layer)
- if(136 to 179)
- muzzle_flash.pixel_x = round(4 * ((180 - firing_angle) / 45))
- muzzle_flash.pixel_y = -6
- muzzle_flash.layer = ABOVE_MOB_LAYER
- if(180)
- muzzle_flash.pixel_x = 0
- muzzle_flash.pixel_y = -6
- muzzle_flash.layer = ABOVE_MOB_LAYER
- if(181 to 224)
- muzzle_flash.pixel_x = round(-6 * ((firing_angle - 180) / 45))
- muzzle_flash.pixel_y = -6
- muzzle_flash.layer = ABOVE_MOB_LAYER
- if(225)
- muzzle_flash.pixel_x = -6
- muzzle_flash.pixel_y = -6
- muzzle_flash.layer = initial(muzzle_flash.layer)
- if(226 to 269)
- muzzle_flash.pixel_x = -6
- muzzle_flash.pixel_y = round(-6 * ((270 - firing_angle) / 45))
- muzzle_flash.layer = initial(muzzle_flash.layer)
- if(270)
- muzzle_flash.pixel_x = -6
- muzzle_flash.pixel_y = 0
- muzzle_flash.layer = initial(muzzle_flash.layer)
- if(271 to 314)
- muzzle_flash.pixel_x = -6
- muzzle_flash.pixel_y = round(8 * ((firing_angle - 270) / 45))
- muzzle_flash.layer = initial(muzzle_flash.layer)
- if(315)
- muzzle_flash.pixel_x = -6
- muzzle_flash.pixel_y = 8
- muzzle_flash.layer = initial(muzzle_flash.layer)
- if(316 to 359)
- muzzle_flash.pixel_x = round(-6 * ((360 - firing_angle) / 45))
- muzzle_flash.pixel_y = 8
- muzzle_flash.layer = initial(muzzle_flash.layer)
-
- muzzle_flash.transform = null
- muzzle_flash.transform = turn(muzzle_flash.transform, firing_angle)
- flash_loc.vis_contents += muzzle_flash
- muzzle_flash.applied = TRUE
-
- addtimer(CALLBACK(src, .proc/remove_muzzle_flash, flash_loc, muzzle_flash), 0.2 SECONDS)
-
-/obj/item/gun/proc/reset_light_range(lightrange)
- set_light_range(lightrange)
- set_light_color(initial(light_color))
- if(lightrange <= 0)
- set_light_on(FALSE)
- update_light()
-
-/obj/item/gun/proc/remove_muzzle_flash(atom/movable/flash_loc, obj/effect/muzzle_flash/muzzle_flash)
- if(!QDELETED(flash_loc))
- flash_loc.vis_contents -= muzzle_flash
- muzzle_flash.applied = FALSE
-
/////////////
// ZOOMING //
/////////////
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 90bcf0c73508d..9efbc6169b252 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -81,15 +81,12 @@
var/rack_delay = 5
///time of the most recent rack, used for cooldown purposes
var/recent_rack = 0
+ ///Whether the gun can be tacloaded by slapping a fresh magazine directly on it
+ var/tac_reloads = TRUE //Snowflake mechanic no more.
///Whether the gun can be sawn off by sawing tools
var/can_be_sawn_off = FALSE
var/flip_cooldown = 0
- ///Whether the gun can be tacloaded by slapping a fresh magazine directly on it
- var/tac_reloads = TRUE //Snowflake mechanic no more.
- ///If we have the 'snowflake mechanic,' how long should it take to reload?
- var/tactical_reload_delay = 1.2 SECONDS
-
/obj/item/gun/ballistic/Initialize()
. = ..()
if (!spawnwithmagazine)
@@ -223,22 +220,18 @@
playsound(src, eject_empty_sound, eject_sound_volume, eject_sound_vary)
magazine.forceMove(drop_location())
var/obj/item/ammo_box/magazine/old_mag = magazine
- old_mag.update_appearance()
- magazine = null
- if (display_message)
- to_chat(user, "
You pull the [magazine_wording] out of \the [src].")
- update_appearance()
if (tac_load)
- if(do_after(user, tactical_reload_delay, TRUE, src))
- if (insert_magazine(user, tac_load, FALSE))
- to_chat(user, "
You perform a tactical reload on \the [src].")
- else
- to_chat(user, "
You dropped the old [magazine_wording], but the new one doesn't fit. How embarassing.")
+ if (insert_magazine(user, tac_load, FALSE))
+ to_chat(user, "
You perform a tactical reload on \the [src].")
else
- to_chat(user, "
Your reload was interupted!")
- return
-
+ to_chat(user, "
You dropped the old [magazine_wording], but the new one doesn't fit. How embarassing.")
+ magazine = null
+ else
+ magazine = null
user.put_in_hands(old_mag)
+ old_mag.update_appearance()
+ if (display_message)
+ to_chat(user, "
You pull the [magazine_wording] out of \the [src].")
update_appearance()
/obj/item/gun/ballistic/can_shoot()
@@ -349,7 +342,7 @@
return
return ..()
-/obj/item/gun/ballistic/unique_action(mob/living/user)
+/obj/item/gun/ballistic/attack_self(mob/living/user)
if(HAS_TRAIT(user, TRAIT_GUNFLIP))
if(flip_cooldown <= world.time)
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40))
@@ -359,10 +352,13 @@
user.dropItemToGround(src, TRUE)
return
flip_cooldown = (world.time + 30)
- SpinAnimation(7,1)
user.visible_message("
[user] spins the [src] around their finger by the trigger. That’s pretty badass.")
playsound(src, 'sound/items/handling/ammobox_pickup.ogg', 20, FALSE)
return
+ if(!internal_magazine && magazine)
+ if(!magazine.ammo_count())
+ eject_magazine(user)
+ return
if(bolt_type == BOLT_TYPE_NO_BOLT)
chambered = null
var/num_unloaded = 0
diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm
index 5b3ced3e81008..7ec610bbc33c6 100644
--- a/code/modules/projectiles/guns/ballistic/assault.dm
+++ b/code/modules/projectiles/guns/ballistic/assault.dm
@@ -1,31 +1,12 @@
/obj/item/gun/ballistic/automatic/assault
burst_size = 1
actions_types = list()
- wield_delay = 0.7 SECONDS
- wield_slowdown = 0.6
-
- fire_delay = 1
-
- load_sound = 'sound/weapons/gun/rifle/ar_reload.ogg'
- load_empty_sound = 'sound/weapons/gun/rifle/ar_reload.ogg'
- eject_sound = 'sound/weapons/gun/rifle/ar_unload.ogg'
- eject_empty_sound = 'sound/weapons/gun/rifle/ar_unload.ogg'
-
- rack_sound = 'sound/weapons/gun/rifle/ar_cock.ogg'
- spread_unwielded = 20
/obj/item/gun/ballistic/automatic/assault/ak47
name = "\improper SVG-67"
desc = "A Frontier-built assault rifle descended from a pattern of unknown provenance. Its low cost, ease of maintenance, and powerful 7.62x39mm cartridge make it a popular choice among a wide variety of outlaws."
icon = 'icons/obj/guns/48x32guns.dmi'
fire_sound = 'sound/weapons/gun/rifle/ak47.ogg'
-
- rack_sound = 'sound/weapons/gun/rifle/ak47_cocked.ogg'
- load_sound = 'sound/weapons/gun/rifle/ak47_reload.ogg'
- load_empty_sound = 'sound/weapons/gun/rifle/ak47_reload.ogg'
- eject_sound = 'sound/weapons/gun/rifle/ak47_unload.ogg'
- eject_empty_sound = 'sound/weapons/gun/rifle/ak47_unload.ogg'
-
icon_state = "ak47"
item_state = "ak47"
mag_display = TRUE
@@ -33,8 +14,6 @@
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
mag_type = /obj/item/ammo_box/magazine/ak47
- spread = 0
- wield_delay = 0.7 SECONDS
/obj/item/gun/ballistic/automatic/assault/ak47/ComponentInitialize()
. = ..()
@@ -110,13 +89,6 @@
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
mag_type = /obj/item/ammo_box/magazine/p16
- spread = 2
- wield_delay = 0.5 SECONDS
- rack_sound = 'sound/weapons/gun/rifle/m16_cocked.ogg'
- load_sound = 'sound/weapons/gun/rifle/m16_reload.ogg'
- load_empty_sound = 'sound/weapons/gun/rifle/m16_reload.ogg'
- eject_sound = 'sound/weapons/gun/rifle/m16_unload.ogg'
- eject_empty_sound = 'sound/weapons/gun/rifle/m16_unload.ogg'
/obj/item/gun/ballistic/automatic/assault/p16/ComponentInitialize()
. = ..()
@@ -161,8 +133,6 @@
slot_flags = ITEM_SLOT_BACK
mag_type = /obj/item/ammo_box/magazine/swiss
actions_types = list(/datum/action/item_action/toggle_firemode)
- spread = 8
- spread_unwielded = 15
/obj/item/gun/ballistic/automatic/assault/swiss_cheese/ComponentInitialize()
. = ..()
@@ -187,7 +157,7 @@
fire_delay = initial(fire_delay)
to_chat(user, "
You switch to [burst_size]-rnd Matter.")
- playsound(user, 'sound/weapons/gun/general/selector.ogg', 100, TRUE)
+ playsound(user, 'sound/weapons/empty.ogg', 100, TRUE)
update_appearance()
for(var/datum/action/action as anything in actions)
action.UpdateButtonIcon()
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index ed45f24a76254..b159376b547bb 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -14,13 +14,6 @@
weapon_weight = WEAPON_MEDIUM
pickup_sound = 'sound/items/handling/rifle_pickup.ogg'
- wield_delay = 1 SECONDS
- spread = 0
- spread_unwielded = 13
- recoil = 0
- recoil_unwielded = 4
- wield_slowdown = 0.35
-
/obj/item/gun/ballistic/automatic/update_overlays()
. = ..()
if(!select)
@@ -46,7 +39,7 @@
fire_delay = initial(fire_delay)
to_chat(user, "
You switch to [burst_size]-rnd burst.")
- playsound(user, 'sound/weapons/gun/general/selector.ogg', 100, TRUE)
+ playsound(user, 'sound/weapons/empty.ogg', 100, TRUE)
update_appearance()
for(var/X in actions)
var/datum/action/A = X
@@ -78,13 +71,6 @@
actions_types = list()
mag_display = TRUE
- spread = -5
- spread_unwielded = 20
- recoil = 0
- recoil_unwielded = 4
- wield_slowdown = 1
- wield_delay = 1.3 SECONDS
-
/obj/item/gun/ballistic/automatic/sniper_rifle/syndicate
name = "syndicate sniper rifle"
desc = "A heavily-modified .50 BMG anti-material rifle utilized by Syndicate agents. Requires both hands to fire."
@@ -131,6 +117,7 @@
icon = 'icons/obj/guns/48x32guns.dmi'
lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi'
righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi'
+ fire_sound = 'sound/weapons/gun/rifle/shot.ogg'
icon_state = "ebr"
item_state = "ebr"
mag_display = TRUE
@@ -141,9 +128,6 @@
burst_size = 0
actions_types = list()
- wield_slowdown = 2
- spread = -4
-
/obj/item/gun/ballistic/automatic/gal
name = "\improper CM-GAL-S"
desc = "The standard issue DMR of the CMM. Dates back to the Xenofauna War, this particular model is in a carbine configuration, and, as such, is shorter than the standard model. Chambered in .308."
@@ -159,9 +143,6 @@
burst_size = 0
actions_types = list()
- wield_slowdown = 2
- spread = -4
-
/obj/item/gun/ballistic/automatic/gal/inteq
name = "\improper SsG-04"
desc = "A marksman rifle purchased from the Colonial Minutemen and modified to suit IRMG's needs. Chambered in .308."
diff --git a/code/modules/projectiles/guns/ballistic/gauss.dm b/code/modules/projectiles/guns/ballistic/gauss.dm
index 32cee65317cf6..993c616f885f9 100644
--- a/code/modules/projectiles/guns/ballistic/gauss.dm
+++ b/code/modules/projectiles/guns/ballistic/gauss.dm
@@ -18,13 +18,6 @@
charge_sections = 4
ammo_x_offset = 2
- spread = 0
- spread_unwielded = 25
- recoil = 0
- recoil_unwielded = 4
- wield_slowdown = 0.75
- wield_delay = 1 SECONDS
-
/obj/item/gun/ballistic/automatic/powered/gauss/modelh
name = "Model H"
desc = "Standard-issue pistol of the Solarian Confederation. Fires slow ferromagnetic slugs at a high energy cost, though they rend flesh with ease."
@@ -39,11 +32,6 @@
fire_delay = 0 //pistol
mag_display = FALSE
empty_indicator = FALSE
- recoil = 1
- recoil_unwielded = 2
- spread = 3
- spread_unwielded = 6
-
/obj/item/gun/ballistic/automatic/powered/gauss/claris
name = "Claris"
@@ -77,9 +65,6 @@
actions_types = list()
empty_indicator = FALSE
- wield_delay = 0.7 SECONDS
- fire_delay = 1
-
/obj/item/gun/ballistic/automatic/powered/gauss/gar/ComponentInitialize()
. = ..()
AddComponent(/datum/component/automatic_fire, 0.2 SECONDS) //setiting this to 0.1 breaks auotfire, not sure why, so we use the standard fire rate but in 2 shot bursts to shoot 'faster'
diff --git a/code/modules/projectiles/guns/ballistic/hmg.dm b/code/modules/projectiles/guns/ballistic/hmg.dm
index 29d4b7914395c..dfe8a52cde194 100644
--- a/code/modules/projectiles/guns/ballistic/hmg.dm
+++ b/code/modules/projectiles/guns/ballistic/hmg.dm
@@ -6,13 +6,6 @@
actions_types = list()
slowdown = 1
drag_slowdown = 1.5
- fire_delay = 1
-
- spread = 2
- spread_unwielded = 80
- recoil = 1
- recoil_unwielded = 4
- wield_slowdown = 4
// L6 SAW //
@@ -36,7 +29,7 @@
/obj/item/gun/ballistic/automatic/hmg/l6_saw/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.1 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.2 SECONDS)
/obj/item/gun/ballistic/automatic/hmg/l6_saw/examine(mob/user)
. = ..()
@@ -93,4 +86,4 @@
/obj/item/gun/ballistic/automatic/hmg/solar/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.1 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.2 SECONDS)
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index eafe30f362a88..18030833e6cd0 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -50,7 +50,6 @@
item_state = "rocketlauncher"
mag_type = /obj/item/ammo_box/magazine/internal/rocketlauncher
fire_sound = 'sound/weapons/gun/general/rocket_launch.ogg'
- load_sound = 'sound/weapons/gun/general/rocket_load.ogg'
w_class = WEIGHT_CLASS_BULKY
can_suppress = FALSE
pin = /obj/item/firing_pin
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index b466f2811dd47..d03b3992b7414 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -1,21 +1,21 @@
/obj/item/gun/ballistic/automatic/pistol
- name = "Stechkin"
+ name = "stechkin pistol"
desc = "A small, easily concealable 10mm handgun that bears Scarborough Arms stamps. Has a threaded barrel for suppressors."
icon_state = "pistol"
w_class = WEIGHT_CLASS_SMALL
mag_type = /obj/item/ammo_box/magazine/m10mm
can_suppress = TRUE
burst_size = 1
- fire_delay = 0 //spam it as fast as you can
+ fire_delay = 0
actions_types = list()
bolt_type = BOLT_TYPE_LOCKING
fire_sound = 'sound/weapons/gun/pistol/shot.ogg'
dry_fire_sound = 'sound/weapons/gun/pistol/dry_fire.ogg'
suppressed_sound = 'sound/weapons/gun/pistol/shot_suppressed.ogg'
- load_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
- load_empty_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
- eject_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
- eject_empty_sound = 'sound/weapons/gun/pistol/mag_release_alt.ogg'
+ load_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
+ load_empty_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
+ eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
+ eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
vary_fire_sound = FALSE
rack_sound = 'sound/weapons/gun/pistol/rack_small.ogg'
lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
@@ -24,13 +24,7 @@
bolt_wording = "slide"
weapon_weight = WEAPON_LIGHT
pickup_sound = 'sound/items/handling/gun_pickup.ogg'
-
- wield_delay = 0.2 SECONDS
- spread = -2
- spread_unwielded = 4
- wield_slowdown = 0.15
-
- muzzleflash_iconstate = "muzzle_flash_light"
+ fire_delay = 1
/obj/item/gun/ballistic/automatic/pistol/no_mag
spawnwithmagazine = FALSE
@@ -41,21 +35,16 @@
install_suppressor(S)
/obj/item/gun/ballistic/automatic/pistol/m1911
- name = "\improper M1911A8"
+ name = "\improper M1911"
desc = "A classic .45 handgun. An engraving on the slide marks it as a product of Hunter's Pride."
icon_state = "m1911"
w_class = WEIGHT_CLASS_NORMAL
mag_type = /obj/item/ammo_box/magazine/m45
can_suppress = FALSE
- fire_sound = 'sound/weapons/gun/pistol/m1911.ogg'
- rack_sound = 'sound/weapons/gun/pistol/m1911_cocked.ogg'
+ fire_sound = 'sound/weapons/gun/pistol/shot.ogg'
+ rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg'
- load_sound = 'sound/weapons/gun/pistol/m1911_reload.ogg'
- load_empty_sound = 'sound/weapons/gun/pistol/m1911_reload.ogg'
- eject_sound = 'sound/weapons/gun/pistol/m1911_unload.ogg'
- eject_empty_sound = 'sound/weapons/gun/pistol/m1911_unload.ogg'
- recoil = -2
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag
spawnwithmagazine = FALSE
@@ -68,19 +57,10 @@
mag_type = /obj/item/ammo_box/magazine/m50
can_suppress = FALSE
mag_display = TRUE
- fire_sound = 'sound/weapons/gun/pistol/deagle.ogg'
+ fire_sound = 'sound/weapons/gun/rifle/shot_alt.ogg'
rack_sound = 'sound/weapons/gun/pistol/rack.ogg'
lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg'
- load_sound = 'sound/weapons/gun/pistol/deagle_reload.ogg'
- load_empty_sound = 'sound/weapons/gun/pistol/deagle_reload.ogg'
- eject_sound = 'sound/weapons/gun/pistol/deagle_unload.ogg'
- eject_empty_sound = 'sound/weapons/gun/pistol/deagle_unload.ogg'
- fire_delay = 0.7 SECONDS
- recoil = 1
- recoil_unwielded = 2
- spread = 4
- spread_unwielded = 7
/obj/item/gun/ballistic/automatic/pistol/deagle/gold
desc = "A gold-plated Desert Eagle folded over a million times by superior Martian gunsmiths. Uses .50 AE ammo."
@@ -126,11 +106,6 @@
w_class = WEIGHT_CLASS_NORMAL
mag_type = /obj/item/ammo_box/magazine/co9mm
can_suppress = FALSE
- fire_sound = 'sound/weapons/gun/pistol/commander.ogg'
- load_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
- load_empty_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
- eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
- eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
/obj/item/gun/ballistic/automatic/pistol/commander/no_mag
spawnwithmagazine = FALSE
@@ -153,10 +128,6 @@
can_suppress = FALSE
var/funnysounds = TRUE
var/cooldown = 0
- load_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
- load_empty_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
- eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
- eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
/obj/item/gun/ballistic/automatic/pistol/commissar/equipped(mob/living/user, slot)
..()
@@ -206,10 +177,6 @@
w_class = WEIGHT_CLASS_SMALL
mag_type = /obj/item/ammo_box/magazine/pistol556mm
fire_sound = 'sound/weapons/gun/pistol/pistolec.ogg'
- load_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
- load_empty_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
- eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
- eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
/obj/item/gun/ballistic/automatic/pistol/solgov/old
icon_state = "pistole-c-old"
@@ -222,10 +189,6 @@
w_class = WEIGHT_CLASS_SMALL
mag_type = /obj/item/ammo_box/magazine/tec9
mag_display = TRUE
- load_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
- load_empty_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
- eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
- eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
/obj/item/gun/ballistic/automatic/pistol/disposable
name = "disposable gun"
@@ -302,17 +265,3 @@
desc = "The golden sheen is somewhat counter-intuitive on a holdout weapon, but it looks cool. Uses .357 ammo."
icon_state = "derringer_gold"
mag_type = /obj/item/ammo_box/magazine/internal/derr357
-
-/obj/item/gun/ballistic/automatic/pistol/himehabu
- name = "\improper Himehabu"
- desc = "A very small .22 LR pistol. The long awaited successor to the Stechkin; It has become a favorite among syndicate spies. Chambered in .22 LR."
- icon_state = "himehabu"
- w_class = WEIGHT_CLASS_TINY
- mag_type = /obj/item/ammo_box/magazine/m22lr
- can_suppress = FALSE
- fire_sound = 'sound/weapons/gun/pistol/himehabu.ogg'
-
- recoil = -2
- recoil_unwielded = -2
- spread_unwielded = 0
- wield_slowdown = 0
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 1e922d26aed04..b1c70e7a73b63 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -4,7 +4,6 @@
icon_state = "revolver"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder
fire_sound = 'sound/weapons/gun/revolver/shot.ogg'
- rack_sound = 'sound/weapons/gun/revolver/revolver_prime.ogg'
load_sound = 'sound/weapons/gun/revolver/load_bullet.ogg'
eject_sound = 'sound/weapons/gun/revolver/empty.ogg'
vary_fire_sound = FALSE
@@ -16,50 +15,7 @@
tac_reloads = FALSE
var/spin_delay = 10
var/recent_spin = 0
- fire_delay = 2
- spread_unwielded = 15
- recoil = 0.5
- recoil_unwielded = 1
- semi_auto = FALSE
- bolt_wording = "hammer"
- wield_slowdown = 0.3
-
-/obj/item/gun/ballistic/revolver/examine(mob/user)
- . = ..()
- . += "
You can use the revolver with your other empty hand to empty the cylinder."
-
-/obj/item/gun/ballistic/revolver/attack_hand(mob/user)
- if(loc == user && user.is_holding(src))
- chambered = null
- var/num_unloaded = 0
- for(var/obj/item/ammo_casing/CB in get_ammo_list(FALSE, TRUE))
- CB.forceMove(drop_location())
- CB.bounce_away(FALSE, NONE)
- num_unloaded++
- SSblackbox.record_feedback("tally", "station_mess_created", 1, CB.name)
- if (num_unloaded)
- to_chat(user, "
You unload [num_unloaded] [cartridge_wording]\s from [src].")
- playsound(user, eject_sound, eject_sound_volume, eject_sound_vary)
- update_appearance()
- return
- else
- return ..()
- else
- return ..()
-
-
-/obj/item/gun/ballistic/revolver/unique_action(mob/living/user)
- rack(user)
- return
-
-///updates a bunch of racking related stuff and also handles the sound effects and the like
-/obj/item/gun/ballistic/revolver/rack(mob/user = null)
- if(user)
- to_chat(user, "
You rack the [bolt_wording] of \the [src].")
- chamber_round(TRUE)
- playsound(src, rack_sound, rack_sound_volume, rack_sound_vary)
- update_appearance()
-
+ fire_delay = 7
/obj/item/gun/ballistic/revolver/chamber_round(spin_cylinder = TRUE)
if(spin_cylinder)
@@ -67,6 +23,10 @@
else
chambered = magazine.stored_ammo[1]
+/obj/item/gun/ballistic/revolver/shoot_with_empty_chamber(mob/living/user as mob|obj)
+ ..()
+ chamber_round(TRUE)
+
/obj/item/gun/ballistic/revolver/AltClick(mob/user)
..()
spin()
@@ -116,7 +76,7 @@
/obj/item/gun/ballistic/revolver/detective
name = "\improper Colt Detective Special"
desc = "A compact and ridiculously old-fashioned law enforcement firearm. Uses .38 special rounds."
- fire_sound = 'sound/weapons/gun/revolver/shot_light.ogg'
+ fire_sound = 'sound/weapons/gun/revolver/shot.ogg'
icon_state = "detective"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
obj_flags = UNIQUE_RENAME
@@ -131,8 +91,6 @@
"Black Panther" = "detective_panther"
)
- recoil = 0 //weaker than normal revovler, no recoil
-
/obj/item/gun/ballistic/revolver/detective/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
if(magazine.caliber != initial(magazine.caliber))
if(prob(100 - (magazine.ammo_count() * 5))) //minimum probability of 70, maximum of 95
@@ -182,9 +140,6 @@
name = "\improper Unica 6 auto-revolver"
desc = "A high-powered revolver with a unique auto-reloading system. Uses .357 ammo."
icon_state = "mateba"
- semi_auto = TRUE
- spread = 0
- spread_unwielded = 7
/obj/item/gun/ballistic/revolver/golden
name = "\improper Golden revolver"
@@ -199,9 +154,6 @@
desc = "An ancient model of revolver with notoriously poor ergonomics, chambered in 7.62x38mmR. Uniquely able to be suppressed."
icon_state = "nagant"
can_suppress = TRUE
- spread_unwielded = 12
- recoil = 0
- recoil_unwielded = 0
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev762
@@ -211,12 +163,6 @@
desc = "A massive, long-barreled revolver designed for the most dangerous game. Can only be reloaded one cartridge at a time due to its reinforced frame. Uses .45-70 ammo."
icon_state = "hunting"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev4570
- fire_sound = 'sound/weapons/gun/revolver/shot_hunting.ogg'
- wield_slowdown = 0.5
- spread_unwielded = 5
- spread = 2
- recoil = 2
- recoil_unwielded = 3
// A gun to play Russian Roulette!
// You can spin the chamber to randomize the position of the bullet.
@@ -331,21 +277,4 @@
icon_state = "pepperbox"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/pepperbox
spread = 20
- spread_unwielded = 50
- fire_delay = 0
- semi_auto = TRUE
-
-/obj/item/gun/ballistic/revolver/cattleman
- name = "\improper Cattleman"
- desc = "A strangely ancient revolver. Despite the age, it is a favorite of fast drawing spacers and officers in various militaries, but sometimes very rarely used in small colonial police units. Uses .45 ACP."
- fire_sound = 'sound/weapons/gun/revolver/cattleman.ogg'
- icon = 'icons/obj/guns/48x32guns.dmi'
- icon_state = "cattleman"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45
- obj_flags = UNIQUE_RENAME
- unique_reskin = list("Default" = "cattleman",
- "Army" = "cattleman_army",
- "General" = "cattleman_general"
- )
-
- recoil = 0 //weaker than normal revovler, no recoil
+ fire_delay = 4
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 5d29a26a84a86..ac80dc47e890b 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -17,13 +17,6 @@
weapon_weight = WEAPON_MEDIUM
pickup_sound = 'sound/items/handling/rifle_pickup.ogg'
- spread = -1
- spread_unwielded = 12
- recoil = -3
- recoil_unwielded = 4
- wield_slowdown = 1
- wield_delay = 1.2 SECONDS
-
/obj/item/gun/ballistic/rifle/update_overlays()
. = ..()
. += "[icon_state]_bolt[bolt_locked ? "_locked" : ""]"
@@ -96,13 +89,6 @@
fire_sound = 'sound/weapons/gun/rifle/ssg669c.ogg'
can_be_sawn_off = FALSE
- spread = -5
- spread_unwielded = 20
- recoil = 0
- recoil_unwielded = 4
- wield_slowdown = 1
- wield_delay = 1.3 SECONDS
-
/obj/item/gun/ballistic/rifle/boltaction/roumain
name = "standard-issue 'Smile' rifle"
desc = "A bolt-action rifle usually given to mercenary hunters of the Saint-Roumain Militia. Chambered in .300 Magnum."
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 5f9db248d6af8..e333122e2e0a9 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -27,14 +27,6 @@
fire_delay = 7
pb_knockback = 2
- wield_slowdown = 0.45
- wield_delay = 0.6 SECONDS //Shotguns are really easy to put up to fire, since they are designed for CQC (at least compared to a rifle)
-
- spread = 4
- spread_unwielded = 10
- recoil = 2
- recoil_unwielded = 4
-
/obj/item/gun/ballistic/shotgun/blow_up(mob/user)
. = 0
if(chambered && chambered.BB)
@@ -49,34 +41,13 @@
/obj/item/gun/ballistic/shotgun/riot //for spawn in the armory
name = "riot shotgun"
desc = "A sturdy shotgun with a six-shell tube and a fixed wooden stock designed for non-lethal riot control."
- icon = 'icons/obj/guns/48x32guns.dmi'
icon_state = "riotshotgun"
item_state = "shotgun"
mag_type = /obj/item/ammo_box/magazine/internal/shot/riot
sawn_desc = "Come with me if you want to live."
can_be_sawn_off = TRUE
- rack_sound = 'sound/weapons/gun/shotgun/rack_alt.ogg'
- fire_delay = 1
-
-/obj/item/gun/ballistic/shotgun/riot/sawoff(mob/user)
- . = ..()
- if(.)
- weapon_weight = WEAPON_MEDIUM
- wield_slowdown = 0.25
- wield_delay = 0.3 SECONDS //OP? maybe
-
- spread = 8
- spread_unwielded = 15
- recoil = 3 //or not
- recoil_unwielded = 5
// Automatic Shotguns//
-/obj/item/gun/ballistic/shotgun/automatic
- spread = 4
- spread_unwielded = 16
- recoil = 1
- recoil_unwielded = 4
- wield_delay = 0.65 SECONDS
/obj/item/gun/ballistic/shotgun/automatic/shoot_live_shot(mob/living/user)
..()
@@ -175,13 +146,6 @@
tac_reloads = TRUE
pickup_sound = 'sound/items/handling/rifle_pickup.ogg'
- spread = 4
- spread_unwielded = 16
- recoil = 1
- recoil_unwielded = 4
- wield_slowdown = 0.6
- wield_delay = 0.65 SECONDS
-
/obj/item/gun/ballistic/shotgun/bulldog/unrestricted
pin = /obj/item/firing_pin
@@ -244,13 +208,6 @@
. = ..()
if(.)
weapon_weight = WEAPON_MEDIUM
- wield_slowdown = 0.25
- wield_delay = 0.3 SECONDS //OP? maybe
-
- spread = 8
- spread_unwielded = 15
- recoil = 3 //or not
- recoil_unwielded = 5
// IMPROVISED SHOTGUN //
@@ -415,7 +372,6 @@
attack_verb = list("bludgeoned", "smashed")
mag_type = /obj/item/ammo_box/magazine/internal/shot/sex
burst_size = 6
- fire_delay = 0.1
pb_knockback = 12
unique_reskin = null
recoil = 10
@@ -464,21 +420,10 @@
inhand_y_dimension = 32
mag_type = /obj/item/ammo_box/magazine/internal/shot/winchester
fire_sound = 'sound/weapons/gun/rifle/shot.ogg'
- rack_sound = 'sound/weapons/gun/rifle/ak47_cocked.ogg'
+ rack_sound = 'sound/weapons/gun/rifle/winchester_cocked.ogg'
bolt_wording = "lever"
cartridge_wording = "bullet"
- spread = -5
- spread_unwielded = 7
- recoil = 0
- recoil_unwielded = 2
- wield_slowdown = 0.5
-
-/obj/item/gun/ballistic/shotgun/winchester/rack(mob/user = null)
- . = ..()
- if(!wielded)
- SpinAnimation(7,1)
-
/obj/item/gun/ballistic/shotgun/winchester/mk1
name = "Winchester MK.1"
desc = "A sturdy lever-action rifle. This antique pattern appears to be in excellent condition despite its age."
@@ -524,7 +469,7 @@
inhand_x_dimension = 32
inhand_y_dimension = 32
mag_type = /obj/item/ammo_box/magazine/internal/shot/contender
- fire_sound = 'sound/weapons/gun/revolver/shot_hunting.ogg'
+ fire_sound = 'sound/weapons/gun/rifle/shot.ogg'
can_be_sawn_off=TRUE
sawn_desc= "A single-shot pistol. It's hard to aim without a front sight."
w_class = WEIGHT_CLASS_BULKY
@@ -538,22 +483,9 @@
bolt_type = BOLT_TYPE_NO_BOLT
can_be_sawn_off = TRUE
pb_knockback = 3
- wield_slowdown = 0.7
- spread_unwielded = 15
- spread = 0
- recoil = 0
- recoil_unwielded = 5
-
/obj/item/gun/ballistic/shotgun/contender/sawoff(mob/user)
. = ..()
if(.)
item_state = "contender_sawn"
- wield_slowdown = 0.5
- wield_delay = 0.5 SECONDS
-
- spread_unwielded = 5 //mostly the hunting revolver stats
- spread = 2
- recoil = 2
- recoil_unwielded = 3
diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm
index 8ffe9be41bf25..e617173c932e8 100644
--- a/code/modules/projectiles/guns/ballistic/smg.dm
+++ b/code/modules/projectiles/guns/ballistic/smg.dm
@@ -1,16 +1,6 @@
/obj/item/gun/ballistic/automatic/smg
burst_size = 1
actions_types = list()
- fire_delay = 1
- spread = 4
- spread_unwielded = 10
- wield_slowdown = 0.35
- recoil_unwielded = 0.5
-
- load_sound = 'sound/weapons/gun/smg/smg_reload.ogg'
- load_empty_sound = 'sound/weapons/gun/smg/smg_reload.ogg'
- eject_sound = 'sound/weapons/gun/smg/smg_unload.ogg'
- eject_empty_sound = 'sound/weapons/gun/smg/smg_unload.ogg'
/obj/item/gun/ballistic/automatic/smg/proto
name = "\improper Nanotrasen Saber SMG"
@@ -24,7 +14,7 @@
/obj/item/gun/ballistic/automatic/smg/proto/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.25 SECONDS)
/obj/item/gun/ballistic/automatic/smg/proto/unrestricted
pin = /obj/item/firing_pin
@@ -45,7 +35,7 @@
/obj/item/gun/ballistic/automatic/smg/c20r/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.25 SECONDS)
/obj/item/gun/ballistic/automatic/smg/c20r/unrestricted
pin = /obj/item/firing_pin
@@ -66,7 +56,6 @@
desc = "An extreme modification of an obsolete assault rifle, converted into a compact submachine gun by IRMG. Chambered in 10mm."
icon_state = "inteqsmg"
item_state = "inteqsmg"
- fire_sound = 'sound/weapons/gun/smg/vector_fire.ogg'
mag_type = /obj/item/ammo_box/magazine/smgm10mm
can_bayonet = FALSE
can_flashlight = TRUE
@@ -77,7 +66,7 @@
/obj/item/gun/ballistic/automatic/smg/inteq/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.25 SECONDS)
/obj/item/gun/ballistic/automatic/smg/wt550
name = "\improper WT-550 Automatic Rifle"
@@ -95,51 +84,38 @@
mag_display = TRUE
mag_display_ammo = TRUE
empty_indicator = TRUE
- fire_sound = 'sound/weapons/gun/smg/smg_heavy.ogg'
/obj/item/gun/ballistic/automatic/smg/wt550/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.25 SECONDS)
/obj/item/gun/ballistic/automatic/smg/mini_uzi
name = "\improper Type U3 Uzi"
desc = "A lightweight submachine gun, for when you really want someone dead. Uses 9mm rounds."
icon_state = "uzi"
mag_type = /obj/item/ammo_box/magazine/uzim9mm
+ burst_size = 2
bolt_type = BOLT_TYPE_OPEN
mag_display = TRUE
-
- fire_sound = 'sound/weapons/gun/smg/uzi.ogg'
- rack_sound = 'sound/weapons/gun/smg/uzi_cocked.ogg'
-
- load_sound = 'sound/weapons/gun/smg/uzi_reload.ogg'
- load_empty_sound = 'sound/weapons/gun/smg/uzi_reload.ogg'
- eject_sound = 'sound/weapons/gun/smg/uzi_unload.ogg'
- eject_empty_sound = 'sound/weapons/gun/smg/uzi_unload.ogg'
-
- spread = 4
- spread_unwielded = 8
- wield_slowdown = 0.25
- wield_delay = 0.2 SECONDS
+ rack_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
/obj/item/gun/ballistic/automatic/smg/mini_uzi/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.1 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.25 SECONDS)
/obj/item/gun/ballistic/automatic/smg/vector
name = "\improper Vector carbine"
desc = "A police carbine based on a pre-Night of Fire SMG design. Most of the complex workings have been removed for reliability. Chambered in 9mm."
icon_state = "vector"
item_state = "vector"
- mag_type = /obj/item/ammo_box/magazine/smgm9mm //you guys remember when the autorifle was chambered in 9mm
+ mag_type = /obj/item/ammo_box/magazine/smgm9mm/rubber //you guys remember when the autorifle was chambered in 9mm
bolt_type = BOLT_TYPE_LOCKING
mag_display = TRUE
weapon_weight = WEAPON_LIGHT
- fire_sound = 'sound/weapons/gun/smg/vector_fire.ogg'
/obj/item/gun/ballistic/automatic/smg/vector/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.25 SECONDS)
/obj/item/gun/ballistic/automatic/smg/m90
name = "\improper M-90gl Carbine"
@@ -157,10 +133,6 @@
empty_indicator = TRUE
fire_sound = 'sound/weapons/gun/rifle/shot_alt.ogg'
- spread = 1
- spread_unwielded = 8
- wield_slowdown = 0.4
-
/obj/item/gun/ballistic/automatic/smg/m90/Initialize()
. = ..()
underbarrel = new /obj/item/gun/ballistic/revolver/grenadelauncher(src)
@@ -214,7 +186,7 @@
burst_size = 1
fire_delay = 0
to_chat(user, "
You switch to semi-auto.")
- playsound(user, 'sound/weapons/gun/general/selector.ogg', 100, TRUE)
+ playsound(user, 'sound/weapons/empty.ogg', 100, TRUE)
update_appearance()
return
@@ -231,11 +203,10 @@
actions_types = list()
fire_delay = 1
bolt_type = BOLT_TYPE_OPEN
- wield_slowdown = 0.4
/obj/item/gun/ballistic/automatic/smg/thompson/Initialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.25 SECONDS)
/obj/item/gun/ballistic/automatic/smg/thompson/drum
name = "\improper Chicago Typewriter"
@@ -249,11 +220,11 @@
item_state = "cm5"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
weapon_weight = WEAPON_LIGHT
- fire_sound = 'sound/weapons/gun/smg/smg_heavy.ogg'
+ fire_sound = 'sound/weapons/gun/smg/smg_light.ogg'
/obj/item/gun/ballistic/automatic/smg/cm5/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.25 SECONDS)
/obj/item/gun/ballistic/automatic/smg/aks74u
name = "\improper AKS-74U"
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 943c1319a4a0e..b186569afad44 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -4,9 +4,6 @@
desc = "A basic energy-based gun."
icon = 'icons/obj/guns/energy.dmi'
- muzzleflash_iconstate = "muzzle_flash_laser"
- muzzle_flash_color = COLOR_SOFT_RED
-
var/obj/item/stock_parts/cell/gun/cell //What type of power cell this uses
var/cell_type = /obj/item/stock_parts/cell/gun
var/modifystate = 0
@@ -96,7 +93,7 @@
recharge_newshot(TRUE)
update_appearance()
-/obj/item/gun/energy/unique_action(mob/living/user)
+/obj/item/gun/energy/attack_self(mob/living/user as mob)
if(ammo_type.len > 1)
select_fire(user)
update_appearance()
@@ -199,7 +196,6 @@
if (shot.select_name)
to_chat(user, "
[src] is now set to [shot.select_name].")
chambered = null
- playsound(user, 'sound/weapons/gun/general/selector.ogg', 100, TRUE)
recharge_newshot(TRUE)
update_appearance()
return
@@ -272,18 +268,18 @@
else if(BB.nodamage || !BB.damage || BB.damage_type == STAMINA)
user.visible_message("
[user] tries to light [user.p_their()] [A.name] with [src], but it doesn't do anything. Dumbass.")
playsound(user, E.fire_sound, 50, TRUE)
- playsound(user, BB.hitsound_non_living, 50, TRUE)
+ playsound(user, BB.hitsound, 50, TRUE)
cell.use(E.e_cost)
. = ""
else if(BB.damage_type != BURN)
user.visible_message("
[user] tries to light [user.p_their()] [A.name] with [src], but only succeeds in utterly destroying it. Dumbass.")
playsound(user, E.fire_sound, 50, TRUE)
- playsound(user, BB.hitsound_non_living, 50, TRUE)
+ playsound(user, BB.hitsound, 50, TRUE)
cell.use(E.e_cost)
qdel(A)
. = ""
else
playsound(user, E.fire_sound, 50, TRUE)
- playsound(user, BB.hitsound_non_living, 50, TRUE)
+ playsound(user, BB.hitsound, 50, TRUE)
cell.use(E.e_cost)
. = "
[user] casually lights their [A.name] with [src]. Damn."
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 3cb4877ff17c9..7928094cab135 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -18,10 +18,6 @@
internal_cell = TRUE
custom_price = 750
w_class = WEIGHT_CLASS_BULKY
-
- muzzleflash_iconstate = "muzzle_flash_light"
- muzzle_flash_color = COLOR_WHITE
-
var/overheat_time = 16
var/holds_charge = FALSE
var/unique_frequency = FALSE // modified by KA modkits
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 5a4caeefc3731..4551014cafea0 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -10,9 +10,6 @@
shaded_charge = 1
supports_variations = VOX_VARIATION
- spread = 0
- spread_unwielded = 10
-
/obj/item/gun/energy/laser/practice
name = "practice laser gun"
desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
diff --git a/code/modules/projectiles/guns/energy/laser_gatling.dm b/code/modules/projectiles/guns/energy/laser_gatling.dm
index b21e176b92e83..029c5f8a2693d 100644
--- a/code/modules/projectiles/guns/energy/laser_gatling.dm
+++ b/code/modules/projectiles/guns/energy/laser_gatling.dm
@@ -22,7 +22,6 @@
. = ..()
gun = new(src)
battery = new(src)
- gun.cell = battery
START_PROCESSING(SSobj, src)
/obj/item/minigunpack/Destroy()
@@ -108,7 +107,7 @@
slot_flags = null
w_class = WEIGHT_CLASS_HUGE
custom_materials = null
- weapon_weight = WEAPON_MEDIUM
+ weapon_weight = WEAPON_HEAVY
ammo_type = list(/obj/item/ammo_casing/energy/laser/minigun)
cell_type = /obj/item/stock_parts/cell/crap
item_flags = NEEDS_PERMIT | SLOWS_WHILE_IN_HAND
@@ -121,7 +120,7 @@
ammo_pack = loc
AddElement(/datum/element/update_icon_blocker)
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS)
+ AddComponent(/datum/component/automatic_fire, 0.2 SECONDS)
return ..()
/obj/item/gun/energy/minigun/Destroy()
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index 83a33691008b2..a4d252107fc60 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -12,11 +12,6 @@
internal_cell = TRUE //prevents you from giving it an OP cell - WS Edit
cell_type = "/obj/item/stock_parts/cell/pulse"
- spread_unwielded = 25
-
- muzzleflash_iconstate = "muzzle_flash_pulse"
- muzzle_flash_color = COLOR_BRIGHT_BLUE
-
/obj/item/gun/energy/pulse/emp_act(severity)
return
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 1d8f782137077..2caeca6f3a16f 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -6,9 +6,6 @@
ammo_type = list(/obj/item/ammo_casing/energy/electrode)
ammo_x_offset = 3
- spread = 2
- spread_unwielded = 4
-
/obj/item/gun/energy/e_gun/advtaser
name = "hybrid taser"
desc = "A dual-mode taser designed to fire both short-range high-power electrodes and long-range disabler beams."
@@ -16,9 +13,6 @@
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler)
ammo_x_offset = 2
- spread = 2
- spread_unwielded = 4
-
/obj/item/gun/energy/e_gun/advtaser/cyborg
name = "cyborg taser"
desc = "An integrated hybrid taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating."
@@ -37,9 +31,6 @@
flight_x_offset = 15
flight_y_offset = 10
- spread = 2
- spread_unwielded = 4
-
/obj/item/gun/energy/disabler/cyborg
name = "cyborg disabler"
desc = "An integrated disabler that draws from a cyborg's power cell. This weapon contains a limiter to prevent the cyborg's power cell from overheating."
diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm
index c2205777103cd..4822e2b59ba7c 100644
--- a/code/modules/projectiles/guns/misc/beam_rifle.dm
+++ b/code/modules/projectiles/guns/misc/beam_rifle.dm
@@ -148,7 +148,7 @@
current_zoom_x = 0
current_zoom_y = 0
-/obj/item/gun/energy/beam_rifle/unique_action(mob/living/user)
+/obj/item/gun/energy/beam_rifle/attack_self(mob/user)
projectile_setting_pierce = !projectile_setting_pierce
to_chat(user, "
You set \the [src] to [projectile_setting_pierce? "pierce":"impact"] mode.")
aiming_beam()
@@ -521,7 +521,7 @@
tracer_type = /obj/effect/projectile/tracer/tracer/aiming
name = "aiming beam"
hitsound = null
- hitsound_non_living = null
+ hitsound_wall = null
nodamage = TRUE
damage = 0
constant_tracer = TRUE
diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/misc/blastcannon.dm
index 888e680479ea9..d2a8c80827fc0 100644
--- a/code/modules/projectiles/guns/misc/blastcannon.dm
+++ b/code/modules/projectiles/guns/misc/blastcannon.dm
@@ -35,7 +35,7 @@
QDEL_NULL(bomb)
return ..()
-/obj/item/gun/blastcannon/unique_action(mob/living/user)
+/obj/item/gun/blastcannon/attack_self(mob/user)
if(bomb)
bomb.forceMove(user.loc)
user.put_in_hands(bomb)
diff --git a/code/modules/projectiles/guns/misc/bow.dm b/code/modules/projectiles/guns/misc/bow.dm
index aa97994ae95cf..df30f5a890224 100644
--- a/code/modules/projectiles/guns/misc/bow.dm
+++ b/code/modules/projectiles/guns/misc/bow.dm
@@ -28,7 +28,7 @@
chambered = magazine.get_round(TRUE)
chambered.forceMove(src)
-/obj/item/gun/ballistic/bow/unique_action(mob/living/user)
+/obj/item/gun/ballistic/bow/attack_self(mob/user)
if(chambered)
to_chat(user, "
You [drawn ? "release" : "draw"] [src]'s string.")
if(!drawn)
diff --git a/code/modules/projectiles/guns/misc/syringe_gun.dm b/code/modules/projectiles/guns/misc/syringe_gun.dm
index 34af73b855c6f..efd99b2d5b499 100644
--- a/code/modules/projectiles/guns/misc/syringe_gun.dm
+++ b/code/modules/projectiles/guns/misc/syringe_gun.dm
@@ -38,7 +38,7 @@
. = ..()
. += "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining."
-/obj/item/gun/syringe/unique_action(mob/living/user)
+/obj/item/gun/syringe/attack_self(mob/living/user)
if(!syringes.len)
to_chat(user, "
[src] is empty!")
return 0
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index a2ea92e6b4c12..a50b6eed4ae6b 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -13,17 +13,7 @@
generic_canpass = FALSE
//The sound this plays on impact.
var/hitsound = 'sound/weapons/pierce.ogg'
- var/hitsound_non_living = ""
- var/hitsound_glass
- var/hitsound_stone
- var/hitsound_metal
- var/hitsound_wood
- var/hitsound_snow
-
- var/near_miss_sound = ""
- var/ricochet_sound = ""
-
-
+ var/hitsound_wall = ""
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/def_zone = "" //Aiming at
@@ -233,6 +223,11 @@
if(!isliving(target))
if(impact_effect_type && !hitscan)
new impact_effect_type(target_loca, hitx, hity)
+ if(isturf(target) && hitsound_wall)
+ var/volume = clamp(vol_by_damage() + 20, 0, 100)
+ if(suppressed)
+ volume = 5
+ playsound(loc, hitsound_wall, volume, TRUE, -1)
return BULLET_ACT_HIT
var/mob/living/L = target
@@ -269,7 +264,8 @@
to_chat(L, "
You're shot by \a [src][organ_hit_text]!")
else
if(hitsound)
- playsound(get_turf(L), hitsound, 100, TRUE, -1)
+ var/volume = vol_by_damage()
+ playsound(src, hitsound, volume, TRUE, -1)
L.visible_message("
[L] is hit by \a [src][organ_hit_text]!", \
"
You're hit by \a [src][organ_hit_text]!", null, COMBAT_MESSAGE_RANGE)
L.on_hit(src)
@@ -354,8 +350,6 @@
range = decayedRange
if(hitscan)
store_hitscan_collision(pcache)
- if(ricochet_sound)
- playsound(get_turf(src), ricochet_sound, 120, TRUE, 2) //make it loud, we want to make it known when a ricochet happens. for aesthetic reasons mostly
return TRUE
var/distance = get_dist(T, starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations.
@@ -527,16 +521,6 @@
if(can_hit_target(M, M == original, TRUE))
Impact(M)
break
- if(!near_miss_sound)
- return FALSE
- if(decayedRange <= range+2)
- return FALSE
- for(var/mob/misser in range(1,src))
- if(!(misser.stat <= SOFT_CRIT))
- continue
- misser.playsound_local(get_turf(src), near_miss_sound, 100, FALSE)
- misser.shake_animation(damage)
-
/**
* Projectile crossed: When something enters a projectile's tile, make sure the projectile hits it if it should be hitting it.
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index d0fa95841ab47..d17f94af19aeb 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -4,18 +4,8 @@
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
damage = 20
damage_type = BURN
-
- hitsound = 'sound/weapons/gun/hit/energy_impact1.ogg'
- hitsound_non_living = 'sound/weapons/effects/searwall.ogg'
- hitsound_glass = 'sound/weapons/effects/searwall.ogg'
- hitsound_stone = 'sound/weapons/sear.ogg'
- hitsound_metal = 'sound/weapons/effects/searwall.ogg'
- hitsound_wood = 'sound/weapons/sear.ogg'
- hitsound_snow = 'sound/weapons/sear.ogg'
-
- near_miss_sound = 'sound/weapons/gun/hit/energy_miss1.ogg'
- ricochet_sound = 'sound/weapons/gun/hit/energy_ricochet1.ogg'
-
+ hitsound = 'sound/weapons/sear.ogg'
+ hitsound_wall = 'sound/weapons/effects/searwall.ogg'
flag = "laser"
eyeblur = 2
impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
@@ -24,7 +14,7 @@
light_power = 1
light_color = COLOR_SOFT_RED
ricochets_max = 50 //Honk!
- ricochet_chance = 90
+ ricochet_chance = 80
reflectable = REFLECT_NORMAL
/obj/projectile/beam/throw_atom_into_space()
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 43106f97deecb..6123789df438f 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -6,20 +6,5 @@
damage_type = BRUTE
nodamage = FALSE
flag = "bullet"
-
- hitsound = "bullet_hit"
- hitsound_non_living = "bullet_impact"
- hitsound_glass = "bullet_hit_glass"
- hitsound_stone = "bullet_hit_stone"
- hitsound_metal = "bullet_hit_metal"
- hitsound_wood = "bullet_hit_wood"
- hitsound_snow = "bullet_hit_snow"
-
- near_miss_sound = "bullet_miss"
- ricochet_sound = "bullet_bounce"
-
-
+ hitsound_wall = "ricochet"
impact_effect_type = /obj/effect/temp_visual/impact_effect
- ricochets_max = 5 //should be enough to scare the shit out of someone
- ricochet_chance = 30
- ricochet_decay_damage = 0.5 //shouldnt being reliable, but deadly enough to be careful if you accidentally hit an ally
diff --git a/code/modules/projectiles/projectile/bullets/dnainjector.dm b/code/modules/projectiles/projectile/bullets/dnainjector.dm
index b8cd6f92b10d5..ad20c47eeb715 100644
--- a/code/modules/projectiles/projectile/bullets/dnainjector.dm
+++ b/code/modules/projectiles/projectile/bullets/dnainjector.dm
@@ -3,7 +3,7 @@
icon_state = "syringeproj"
var/obj/item/dnainjector/injector
damage = 5
- hitsound_non_living = "shatter"
+ hitsound_wall = "shatter"
/obj/projectile/bullet/dnainjector/on_hit(atom/target, blocked = FALSE)
if(iscarbon(target))
diff --git a/code/modules/projectiles/projectile/bullets/gauss.dm b/code/modules/projectiles/projectile/bullets/gauss.dm
index 0955745ed7981..d057213f92e76 100644
--- a/code/modules/projectiles/projectile/bullets/gauss.dm
+++ b/code/modules/projectiles/projectile/bullets/gauss.dm
@@ -3,7 +3,8 @@
/obj/projectile/bullet/gauss
name = "ferromagnetic pellet"
icon_state = "gauss-pellet"
- damage = 25
+ damage = 20
+ armour_penetration = 40
range = 35
light_color = COLOR_SOFT_RED
light_range = 3
@@ -14,7 +15,6 @@
name = "ferromagnetic lance"
icon_state = "redtrac"
damage = 30
- armour_penetration = 20
// Ferromagnetic Slug (Model H)
@@ -22,5 +22,4 @@
name = "ferromagnetic slug"
icon_state = "gauss-slug"
damage = 50
- armour_penetration = -60
speed = 0.8
diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm
index ecd8b5abbbb99..dcf8bb6823876 100644
--- a/code/modules/projectiles/projectile/bullets/revolver.dm
+++ b/code/modules/projectiles/projectile/bullets/revolver.dm
@@ -19,9 +19,13 @@
// .38 (Colt Detective Special & Winchester)
/obj/projectile/bullet/c38
- name = ".38 bullet"
+ name = ".38 special bullet"
damage = 25
- armour_penetration = -20
+ armour_penetration = -30
+ ricochets_max = 2
+ ricochet_chance = 50
+ ricochet_auto_aim_angle = 10
+ ricochet_auto_aim_range = 3
/obj/projectile/bullet/c38/match
name = ".38 match bullet"
@@ -122,7 +126,7 @@
/obj/projectile/bullet/a4570
name = ".45-70 bullet"
- damage = 45 //crits in 3-4 taps depending on armor
+ damage = 40 //crits in 3-4 taps depending on armor
/obj/projectile/bullet/a4570/match
name = ".45-70 match bullet"
@@ -148,11 +152,3 @@
..()
explosion(target, -1, 0, 1)
return BULLET_ACT_HIT
-
-
-/obj/projectile/bullet/c22lr
- name = ".22LR bullet"
- damage = 20
- armour_penetration = -45
- ricochet_incidence_leeway = 20
- ricochet_chance = 45
diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
index 0979a268ee165..0f2d43206fc8b 100644
--- a/code/modules/projectiles/projectile/bullets/shotgun.dm
+++ b/code/modules/projectiles/projectile/bullets/shotgun.dm
@@ -1,7 +1,6 @@
/obj/projectile/bullet/slug
name = "12g shotgun slug"
damage = 40
- armour_penetration = -10
speed = 0.5
/obj/projectile/bullet/slug/beanbag
@@ -12,8 +11,7 @@
/obj/projectile/bullet/incendiary/shotgun
name = "incendiary slug"
- damage = 25
- armour_penetration = -10
+ damage = 20
speed = 0.5
/obj/projectile/bullet/incendiary/shotgun/dragonsbreath
@@ -67,14 +65,12 @@
///How much stamina damage is subtracted per tile?
var/tile_dropoff_stamina = 1.5 //As above
- icon_state = "pellet"
armour_penetration = -35
speed = 0.5
/obj/projectile/bullet/pellet/buckshot
name = "buckshot pellet"
- damage = 20
- armour_penetration = -10
+ damage = 10
/obj/projectile/bullet/pellet/rubbershot
name = "rubbershot pellet"
diff --git a/code/modules/projectiles/projectile/special/hallucination.dm b/code/modules/projectiles/projectile/special/hallucination.dm
index be3a627cc765d..74fa2b2ad17a4 100644
--- a/code/modules/projectiles/projectile/special/hallucination.dm
+++ b/code/modules/projectiles/projectile/special/hallucination.dm
@@ -128,7 +128,7 @@
hal_icon_state = "bullet"
hal_fire_sound = "gunshot"
hal_hitsound = 'sound/weapons/pierce.ogg'
- hal_hitsound_wall = "bullet_impact"
+ hal_hitsound_wall = "ricochet"
hal_impact_effect = "impact_bullet"
hal_impact_effect_wall = "impact_bullet"
hit_duration = 5
diff --git a/code/modules/projectiles/projectile/special/rocket.dm b/code/modules/projectiles/projectile/special/rocket.dm
index 0680c62279fdc..d86f90b9368ef 100644
--- a/code/modules/projectiles/projectile/special/rocket.dm
+++ b/code/modules/projectiles/projectile/special/rocket.dm
@@ -19,7 +19,7 @@
/obj/projectile/bullet/a84mm/on_hit(atom/target, blocked = FALSE)
..()
- explosion(target, 1, 1, 2, 1, 0, flame_range = 4)
+ explosion(target, -1, 1, 3, 1, 0, flame_range = 4)
if(ismecha(target))
var/obj/mecha/M = target
@@ -69,7 +69,7 @@
..()
for(var/i in sturdy)
if(istype(target, i))
- explosion(target, 1, 1, 1, 2)
+ explosion(target, 0, 1, 1, 2)
return BULLET_ACT_HIT
//if(istype(target, /turf/closed) || ismecha(target))
new /obj/item/broken_missile(get_turf(src), 1)
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 4de55c4264af6..843297c9307dc 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -265,7 +265,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/vodka
name = "Vodka"
- description = "Number one drink that also serves as fuel."
+ description = "Number one drink AND fueling choice for Russians worldwide."
color = "#0064C8" // rgb: 0, 100, 200
boozepwr = 65
taste_description = "grain alcohol"
@@ -365,8 +365,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
shot_glass_icon_state = "shotglassred"
/datum/reagent/consumable/ethanol/lizardwine
- name = "Kalixcis Wine"
- description = "A relatively popular Kalixcane beverage, made by infusing cacti in ethanol."
+ name = "lizard wine"
+ description = "An alcoholic beverage from Space China, made by infusing lizard tails in ethanol."
color = "#7E4043" // rgb: 126, 64, 67
boozepwr = 45
quality = DRINK_FANTASTIC
diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm
index c4722c40fd2fb..21cc7a7feeb46 100644
--- a/code/modules/recycling/disposal/pipe.dm
+++ b/code/modules/recycling/disposal/pipe.dm
@@ -90,7 +90,7 @@
if(isfloorturf(T)) //intact floor, pop the tile
floorturf = T
- if(floorturf.floor_tile && !istype(floorturf, /turf/open/floor/engine))
+ if(floorturf.floor_tile)
new floorturf.floor_tile(T)
floorturf.make_plating()
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 3aa9cc7d77678..f7f471a3d860c 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -215,14 +215,6 @@
category = list("initial", "Electronics")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-/datum/design/lightswitch_frame
- name = "Lightswitch Frame"
- id = "lightswitch_frame"
- build_type = AUTOLATHE
- materials = list(/datum/material/iron = 50, /datum/material/glass = 50)
- build_path = /obj/item/wallframe/light_switch
- category = list("initial", "Misc")
-
/datum/design/camera
name = "Camera"
id = "camera"
diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm
index 16bf2a9241cbf..4f48995190dc7 100644
--- a/code/modules/research/designs/limbgrower_designs.dm
+++ b/code/modules/research/designs/limbgrower_designs.dm
@@ -116,7 +116,7 @@
build_path = /obj/item/organ/tongue
category = list("initial",SPECIES_HUMAN)
-// Grows a fake lizard tail
+// Grows a fake lizard tail - not usable in lizard wine and other similar recipes.
/datum/design/lizard_tail
name = "Lizard Tail"
id = "liztail"
diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm
index bf583bcd21579..cb5465f881fd7 100644
--- a/code/modules/ruins/lavaland_ruin_code.dm
+++ b/code/modules/ruins/lavaland_ruin_code.dm
@@ -86,7 +86,9 @@
/obj/item/stack/sheet/bone = /datum/species/golem/bone,
/obj/item/stack/sheet/durathread = /datum/species/golem/durathread,
/obj/item/stack/sheet/cotton/durathread = /datum/species/golem/durathread,
- /obj/item/stack/sheet/mineral/snow = /datum/species/golem/snow)
+ /obj/item/stack/sheet/mineral/snow = /datum/species/golem/snow,
+ /obj/item/stack/sheet/capitalisium = /datum/species/golem/capitalist,
+ /obj/item/stack/sheet/stalinium = /datum/species/golem/soviet)
if(istype(I, /obj/item/stack))
var/obj/item/stack/O = I
diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm
index 2ca8e1b62027d..16abb651b97c2 100644
--- a/code/modules/shuttle/special.dm
+++ b/code/modules/shuttle/special.dm
@@ -363,7 +363,7 @@
/mob/living/simple_animal/hostile/bear/fightpit
name = "fight pit bear"
- desc = "This bear's trained through ancient Solarian secrets to fear the walls of its glass prison."
+ desc = "This bear's trained through ancient Russian secrets to fear the walls of its glass prison."
environment_smash = ENVIRONMENT_SMASH_NONE
/obj/effect/decal/hammerandsickle
diff --git a/code/modules/surgery/organs/tails.dm b/code/modules/surgery/organs/tails.dm
index 2d3e402150a2f..f587a26d8404b 100644
--- a/code/modules/surgery/organs/tails.dm
+++ b/code/modules/surgery/organs/tails.dm
@@ -83,7 +83,7 @@
/obj/item/organ/tail/lizard/fake
name = "fabricated lizard tail"
- desc = "A fabricated severed lizard tail. This one's made of synthflesh."
+ desc = "A fabricated severed lizard tail. This one's made of synthflesh. Probably not usable for lizard wine."
/obj/item/organ/tail/elzu
name = "\improper Elzuose tail"
diff --git a/code/modules/tgs/core/core.dm b/code/modules/tgs/core/core.dm
index b9a9f27a28ae8..41a0473394525 100644
--- a/code/modules/tgs/core/core.dm
+++ b/code/modules/tgs/core/core.dm
@@ -153,9 +153,4 @@
/world/TgsSecurityLevel()
var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs)
if(api)
- return api.SecurityLevel()
-
-/world/TgsVisibility()
- var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs)
- if(api)
- return api.Visibility()
+ api.SecurityLevel()
diff --git a/code/modules/tgs/core/datum.dm b/code/modules/tgs/core/datum.dm
index de420a2a325a7..68b0330fe8606 100644
--- a/code/modules/tgs/core/datum.dm
+++ b/code/modules/tgs/core/datum.dm
@@ -11,10 +11,6 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null)
src.event_handler = event_handler
src.version = version
-/datum/tgs_api/proc/TerminateWorld()
- del(world)
- sleep(1) // https://www.byond.com/forum/post/2894866
-
/datum/tgs_api/latest
parent_type = /datum/tgs_api/v5
@@ -61,6 +57,3 @@ TGS_PROTECT_DATUM(/datum/tgs_api)
/datum/tgs_api/proc/SecurityLevel()
return TGS_UNIMPLEMENTED
-
-/datum/tgs_api/proc/Visibility()
- return TGS_UNIMPLEMENTED
diff --git a/code/modules/tgs/v4/api.dm b/code/modules/tgs/v4/api.dm
index 945e2e4117671..b9a75c4abb489 100644
--- a/code/modules/tgs/v4/api.dm
+++ b/code/modules/tgs/v4/api.dm
@@ -73,7 +73,7 @@
if(cached_json["apiValidateOnly"])
TGS_INFO_LOG("Validating API and exiting...")
Export(TGS4_COMM_VALIDATE, list(TGS4_PARAMETER_DATA = "[minimum_required_security_level]"))
- TerminateWorld()
+ del(world)
security_level = cached_json["securityLevel"]
chat_channels_json_path = cached_json["chatChannelsJson"]
@@ -188,7 +188,7 @@
requesting_new_port = TRUE
if(!world.OpenPort(0)) //open any port
TGS_ERROR_LOG("Unable to open random port to retrieve new port![TGS4_PORT_CRITFAIL_MESSAGE]")
- TerminateWorld()
+ del(world)
//request a new port
export_lock = FALSE
@@ -196,16 +196,16 @@
if(!new_port_json)
TGS_ERROR_LOG("No new port response from server![TGS4_PORT_CRITFAIL_MESSAGE]")
- TerminateWorld()
+ del(world)
var/new_port = new_port_json[TGS4_PARAMETER_DATA]
if(!isnum(new_port) || new_port <= 0)
TGS_ERROR_LOG("Malformed new port json ([json_encode(new_port_json)])![TGS4_PORT_CRITFAIL_MESSAGE]")
- TerminateWorld()
+ del(world)
if(new_port != world.port && !world.OpenPort(new_port))
TGS_ERROR_LOG("Unable to open port [new_port]![TGS4_PORT_CRITFAIL_MESSAGE]")
- TerminateWorld()
+ del(world)
requesting_new_port = FALSE
while(export_lock)
diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm
index 1b52b31d6a73e..5d3d491a7362b 100644
--- a/code/modules/tgs/v5/__interop_version.dm
+++ b/code/modules/tgs/v5/__interop_version.dm
@@ -1 +1 @@
-"5.6.2"
+"5.6.1"
diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm
index bdcd4e4dd58e6..f973338daa032 100644
--- a/code/modules/tgs/v5/_defines.dm
+++ b/code/modules/tgs/v5/_defines.dm
@@ -48,7 +48,6 @@
#define DMAPI5_RUNTIME_INFORMATION_REVISION "revision"
#define DMAPI5_RUNTIME_INFORMATION_TEST_MERGES "testMerges"
#define DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL "securityLevel"
-#define DMAPI5_RUNTIME_INFORMATION_VISIBILITY "visibility"
#define DMAPI5_CHAT_UPDATE_CHANNELS "channels"
diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm
index 7226f29bba603..34cc43f8762f7 100644
--- a/code/modules/tgs/v5/api.dm
+++ b/code/modules/tgs/v5/api.dm
@@ -4,7 +4,6 @@
var/instance_name
var/security_level
- var/visibility
var/reboot_mode = TGS_REBOOT_MODE_NORMAL
@@ -51,11 +50,10 @@
if(runtime_information[DMAPI5_RUNTIME_INFORMATION_API_VALIDATE_ONLY])
TGS_INFO_LOG("DMAPI validation, exiting...")
- TerminateWorld()
+ del(world)
version = new /datum/tgs_version(runtime_information[DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION])
security_level = runtime_information[DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL]
- visibility = runtime_information[DMAPI5_RUNTIME_INFORMATION_VISIBILITY]
instance_name = runtime_information[DMAPI5_RUNTIME_INFORMATION_INSTANCE_NAME]
var/list/revisionData = runtime_information[DMAPI5_RUNTIME_INFORMATION_REVISION]
@@ -254,7 +252,3 @@
/datum/tgs_api/v5/SecurityLevel()
RequireInitialBridgeResponse()
return security_level
-
-/datum/tgs_api/v5/Visibility()
- RequireInitialBridgeResponse()
- return visibility
diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm
index f163adaaafe3b..c679737dfc496 100644
--- a/code/modules/tgs/v5/undefs.dm
+++ b/code/modules/tgs/v5/undefs.dm
@@ -48,7 +48,6 @@
#undef DMAPI5_RUNTIME_INFORMATION_REVISION
#undef DMAPI5_RUNTIME_INFORMATION_TEST_MERGES
#undef DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL
-#undef DMAPI5_RUNTIME_INFORMATION_VISIBILITY
#undef DMAPI5_CHAT_UPDATE_CHANNELS
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index 91ab11ab46774..de912957a0ace 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -312,7 +312,8 @@
window = window,
src_object = src_object)
process_status()
- DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, .proc/on_act_message, act_type, payload, state))
+ if(src_object.ui_act(act_type, payload, src, state))
+ SStgui.update_uis(src_object)
return FALSE
switch(type)
if("ready")
@@ -331,10 +332,3 @@
return
LAZYSET(src_object.tgui_shared_states, href_list["key"], href_list["value"])
SStgui.update_uis(src_object)
-
-/// Wrapper for behavior to potentially wait until the next tick if the server is overloaded
-/datum/tgui/proc/on_act_message(act_type, payload, state)
- if(QDELETED(src) || QDELETED(src_object))
- return
- if(src_object.ui_act(act_type, payload, src, state))
- SStgui.update_uis(src_object)
diff --git a/code/modules/unit_tests/biome_lists.dm b/code/modules/unit_tests/biome_lists.dm
index 18334cc8a15d1..7c7500155235f 100644
--- a/code/modules/unit_tests/biome_lists.dm
+++ b/code/modules/unit_tests/biome_lists.dm
@@ -2,14 +2,9 @@
for(var/biome_type as anything in SSmapping.biomes)
var/datum/biome/biome = SSmapping.biomes[biome_type]
- validate_chance(biome.open_turf_types, "open turf", biome_type)
validate_chance(biome.mob_spawn_list, "mob spawn", biome_type)
validate_chance(biome.flora_spawn_list, "flora spawn", biome_type)
validate_chance(biome.feature_spawn_list, "feature spawn", biome_type)
- if(!istype(biome, /datum/biome/cave))
- continue
- var/datum/biome/cave/cave = biome
- validate_chance(cave.closed_turf_types, "closed turf", biome_type)
/datum/unit_test/biome_lists/proc/validate_chance(list/to_check, name, biome)
if(to_check && !islist(to_check))
@@ -19,5 +14,5 @@
if(!value)
TEST_FAIL("Biome [biome] has no [name] weight for [type]")
return
- if(!isnum(value) || value < 1 || value != round(value)) //ensures natural numbers
+ if(!isnum(value) || value < 1 || value != round(value))
TEST_FAIL("Biome [biome] has invalid [name] chance for [type] ([value])")
diff --git a/code/modules/unit_tests/resist.dm b/code/modules/unit_tests/resist.dm
index 542ad40ef1e16..265c0bd749919 100644
--- a/code/modules/unit_tests/resist.dm
+++ b/code/modules/unit_tests/resist.dm
@@ -12,8 +12,4 @@
// Stop, drop, and roll has a sleep call. This would delay the test, and is not necessary.
CallAsync(human, /mob/living/verb/resist)
- //since resist() is a verb that possibly queues its actual execution for the next tick, we need to make the subsystem that handles the delayed execution process
- //the callback. either that or sleep ourselves and see if it ran.
- SSverb_manager.run_verb_queue()
-
TEST_ASSERT(human.fire_stacks < 5, "Human did not lower fire stacks after resisting")
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 53b49ab30f0b4..6eea344afde00 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -197,8 +197,9 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/bundles_TC/firestarter
name = "Spetsnaz Pyro bundle"
- desc = "For systematic suppression of carbon lifeforms in close quarters: Contains a lethal backpack spray, Elite hardsuit, \
- Stechkin APS pistol, two magazines, a minibomb and a stimulant syringe."
+ desc = "For systematic suppression of carbon lifeforms in close quarters: Contains a lethal New Russian backpack spray, Elite hardsuit, \
+ Stechkin APS pistol, two magazines, a minibomb and a stimulant syringe. \
+ Order NOW and comrade Boris will throw in an extra tracksuit."
item = /obj/item/storage/backpack/duffelbag/syndie/firestarter
cost = 30
include_modes = list(/datum/game_mode/nuclear)
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 4bca9034dd9b1..6eed73786620a 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -52,6 +52,7 @@
/obj/item/clothing/head/pirate = 1,
/obj/item/clothing/head/bandana = 1,
/obj/item/clothing/head/bandana = 1,
+ /obj/item/clothing/under/costume/soviet = 1,
/obj/item/clothing/head/trapper = 1,
/obj/item/clothing/suit/imperium_monk = 1,
/obj/item/clothing/mask/gas/cyborg = 1,
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 5732b2b2f6c5c..13598f2bc13a4 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -111,6 +111,7 @@
/obj/item/clothing/under/syndicate/tacticool/skirt = 1,
/obj/item/clothing/mask/balaclava = 1,
/obj/item/clothing/head/trapper = 1,
+ /obj/item/clothing/under/costume/soviet = 1,
/obj/item/storage/belt/fannypack/black = 2,
/obj/item/clothing/suit/jacket/letterman_syndie = 1,
/obj/item/clothing/under/costume/jabroni = 1,
diff --git a/code/modules/vending/sovietsoda.dm b/code/modules/vending/sovietsoda.dm
index 0f80bf5324bcf..599e2d22bbdb3 100644
--- a/code/modules/vending/sovietsoda.dm
+++ b/code/modules/vending/sovietsoda.dm
@@ -3,7 +3,7 @@
desc = "Old sweet water vending machine."
icon_state = "sovietsoda"
light_mask = "soviet-light-mask"
- product_ads = "Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
+ product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
products = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda = 30)
contraband = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20)
resistance_flags = FIRE_PROOF
diff --git a/html/changelogs/AutoChangeLog-pr-2434.yml b/html/changelogs/AutoChangeLog-pr-2434.yml
deleted file mode 100644
index 3929b3b71df14..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-2434.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: thgvr
-changes:
- - {rscdel: Halloween no longer allows different species in prefs}
-delete-after: true
diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml
deleted file mode 100644
index 06fe8336f56d9..0000000000000
--- a/html/changelogs/archive/2023-10.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-2023-10-01:
- PositiveEntropy:
- - rscadd: Prescription glasses have been added to the Paracelsus, as well as the
- meson variant in the engineering closets!
- - rscadd: Universal enzyme can now be found in the Paracelsus' freezer!
- - rscadd: Adds a variety of solarian folders throughout the ship and in the clerical
- supplies crate!
- - bugfix: The Psychologist's Office Airlock is now properly labeled.
- - bugfix: The solarian hat now displays its sprite as it should.
- Zevotech:
- - rscadd: Remapped wasteplanet_pandora.dmm
- axelzonvolt:
- - tweak: ID access on a glass windoor
- meemofcourse:
- - rscdel: you can no longer bypass image sanitization with tables
- spockye:
- - bugfix: fixed a couple errors on the corvus class
-2023-10-02:
- thgvr:
- - rscadd: Added an option for Sarathi to have ears, in the frills slot of character
- creation.
-2023-10-07:
- Zytolg:
- - imageadd: All forms and beds and bedsheets now have directional sprites.
- - code_imp: Made Double Beds craftable at the request of Rylie. Have fun with that.
- meemofcourse:
- - rscadd: You can now build lightswitch frames from an autolathe
-2023-10-11:
- FalloutFalcon:
- - bugfix: fixed multiple bugs and oversights with rations
-2023-10-16:
- BarteG44:
- - bugfix: fixed a few issues with the Box class
- - bugfix: fixed a few issues with the Li-tieguai class
- spockye:
- - rscadd: adds the Heron Class Dreadnaught
- thgvr:
- - bugfix: Lugol is now admin spawn only
-2023-10-17:
- Zytolg:
- - rscadd: Added the Floating Resort to Beaches. Enjoy your moment in paradise!
-2023-10-18:
- Auris456852:
- - tweak: You can now take individual rounds out of an ammo box in your pocket by
- alt-clicking!
- Bjarl:
- - balance: The cepheus's starting gear has been nerfed.
- BogCreature:
- - tweak: fish should no longer starve to death
- - bugfix: the mech equipment panel works again
- - bugfix: limbgrower legs should no longer runtime instead of spawning
- - bugfix: crystal legion hearts inheriting the wrong sprites
- - bugfix: vending machines falsely listing their prices as "free"
- - bugfix: normal fulltile firelocks should build properly now
- - bugfix: disposal pipes no longer generate metal when ejecting items through reinforced
- plating
- - bugfix: jukebox sprites
- - bugfix: players can no longer telepathically fiddle with the zippers of bags
- Doubleumc:
- - tweak: Replaced Boyardee tiny fans with a holofield
- meemofcourse:
- - rscdel: Russian Battle Coat, Russian Uniform, Russian Officer Uniform, Russian
- Helmet, Russian Boots, Russian Balaclava
- - imagedel: Deleted sprites relating to the outfits above.
- - rscdel: Stalinium and Capitalist Golems
- - rscdel: Derelict Drones
- - tweak: The butterbear is now on the Frontiersmen team.
- - tweak: Modified the list of laws that an AI may recieve from being ioned.
- - sounddel: The Soviet Anthem and the US Anthem.
-2023-10-19:
- goober3:
- - rscadd: the nt asteroid outpost now has a 56x40 hangar.
- - bugfix: outpost hangars should no longer depressurize upon ship docking.
- - bugfix: outpost wallmounts and doors have been fixed. please report any floating
- extinguishers & hovering intercoms.
- - bugfix: the independent outpost should stay powered forever.
-2023-10-21:
- Skies-Of-Blue:
- - bugfix: moth language bind now works as intended
- retlaw34:
- - rscadd: Two new barsigns
-2023-10-22:
- spockye:
- - rscadd: Added a new jungle ruin "jungle_cavecrew"
- - rscadd: Added a new subshuttle "frontiersmen_gut"
- - rscadd: Added a neutered subtype of all frontiersmen (doesn't drop guns)
- - rscadd: Added new areas for the ruin
- - rscadd: Added a subtype of the heavy frontiersmen corpse that lacks the minigun
- pack
-2023-10-29:
- retlaw34:
- - rscadd: 22lr and cattleman revolver
- - rscadd: many gun sounds
- - balance: guns reworked
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 12c3ce8027dee..910e638f94a83 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi
index 82316d0e030c8..2bd6aa565fb3c 100644
Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ
diff --git a/icons/mob/clothing/under/costume.dmi b/icons/mob/clothing/under/costume.dmi
index 87605b634fa8f..9757ce544e247 100644
Binary files a/icons/mob/clothing/under/costume.dmi and b/icons/mob/clothing/under/costume.dmi differ
diff --git a/icons/mob/species/lizard/frills.dmi b/icons/mob/species/lizard/frills.dmi
index 6d661308c0930..a8cb058553702 100644
Binary files a/icons/mob/species/lizard/frills.dmi and b/icons/mob/species/lizard/frills.dmi differ
diff --git a/icons/mob/species/lizard/horns.dmi b/icons/mob/species/lizard/horns.dmi
index d4fa4c2fd6f65..7367266ed5669 100644
Binary files a/icons/mob/species/lizard/horns.dmi and b/icons/mob/species/lizard/horns.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index c911e872b62dd..96528874fee3c 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/barsigns.dmi b/icons/obj/barsigns.dmi
index 389dab6b1d87c..7519969765c6e 100644
Binary files a/icons/obj/barsigns.dmi and b/icons/obj/barsigns.dmi differ
diff --git a/icons/obj/bedsheets.dmi b/icons/obj/bedsheets.dmi
index 56657861f576b..414bbc38ed816 100644
Binary files a/icons/obj/bedsheets.dmi and b/icons/obj/bedsheets.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 3b37b555f4dfe..1682209446ace 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index efc8359fc5cf1..2f8bf359a59e4 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi
index bdc98ad8852d7..7d5b69ab1fc23 100644
Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ
diff --git a/icons/obj/clothing/under/security.dmi b/icons/obj/clothing/under/security.dmi
index 5572325faaf89..84d90c19d79a9 100644
Binary files a/icons/obj/clothing/under/security.dmi and b/icons/obj/clothing/under/security.dmi differ
diff --git a/icons/obj/guns/48x32guns.dmi b/icons/obj/guns/48x32guns.dmi
index 88dc732906221..732e373187682 100644
Binary files a/icons/obj/guns/48x32guns.dmi and b/icons/obj/guns/48x32guns.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 02e7d3812dcb9..24b209d6ab2b2 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/lavaland/survival_pod.dmi b/icons/obj/lavaland/survival_pod.dmi
index 960a7f24aca3e..84ea0e1e83209 100644
Binary files a/icons/obj/lavaland/survival_pod.dmi and b/icons/obj/lavaland/survival_pod.dmi differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index ae86489bb3402..25a990b61d016 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index ff211d21d5c20..356f914063675 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index 90854a704525b..1ac2c63ed367b 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ
diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi
index 0989e1834f701..1fc4f14abbcaf 100644
Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ
diff --git a/shiptest.dme b/shiptest.dme
index 772345db1bb20..b56709e8b98b2 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -67,7 +67,6 @@
#include "code\__DEFINES\hud.dm"
#include "code\__DEFINES\icon_smoothing.dm"
#include "code\__DEFINES\important_recursive_contents.dm"
-#include "code\__DEFINES\input.dm"
#include "code\__DEFINES\instruments.dm"
#include "code\__DEFINES\interaction_flags.dm"
#include "code\__DEFINES\inventory.dm"
@@ -143,7 +142,6 @@
#include "code\__DEFINES\turfs.dm"
#include "code\__DEFINES\typeids.dm"
#include "code\__DEFINES\vehicles.dm"
-#include "code\__DEFINES\verb_manager.dm"
#include "code\__DEFINES\vv.dm"
#include "code\__DEFINES\wall_dents.dm"
#include "code\__DEFINES\wires.dm"
@@ -364,7 +362,6 @@
#include "code\controllers\subsystem\title.dm"
#include "code\controllers\subsystem\traumas.dm"
#include "code\controllers\subsystem\turf_fire.dm"
-#include "code\controllers\subsystem\verb_manager.dm"
#include "code\controllers\subsystem\vis_overlays.dm"
#include "code\controllers\subsystem\vote.dm"
#include "code\controllers\subsystem\weather.dm"
@@ -419,7 +416,6 @@
#include "code\datums\soullink.dm"
#include "code\datums\spawners_menu.dm"
#include "code\datums\tgs_event_handler.dm"
-#include "code\datums\verb_callbacks.dm"
#include "code\datums\verbs.dm"
#include "code\datums\view.dm"
#include "code\datums\weakrefs.dm"
@@ -1309,7 +1305,6 @@
#include "code\game\objects\structures\barsigns.dm"
#include "code\game\objects\structures\bedsheet_bin.dm"
#include "code\game\objects\structures\catwalk.dm"
-#include "code\game\objects\structures\crateshelf.dm"
#include "code\game\objects\structures\curtains.dm"
#include "code\game\objects\structures\destructible_structures.dm"
#include "code\game\objects\structures\displaycase.dm"
@@ -1459,7 +1454,6 @@
#include "code\game\turfs\open\floor\plating\rockplanet.dm"
#include "code\game\turfs\open\floor\plating\wasteplanet.dm"
#include "code\game\turfs\open\floor\plating\whitesands.dm"
-#include "code\game\turfs\open\floor\hangar.dm"
#include "code\game\turfs\open\space\space.dm"
#include "code\game\turfs\open\space\transit.dm"
#include "code\modules\admin\admin.dm"
@@ -1666,7 +1660,10 @@
#include "code\modules\antagonists\disease\disease_event.dm"
#include "code\modules\antagonists\disease\disease_mob.dm"
#include "code\modules\antagonists\ert\ert.dm"
+#include "code\modules\antagonists\fugitive\fugitive.dm"
#include "code\modules\antagonists\fugitive\fugitive_outfits.dm"
+#include "code\modules\antagonists\fugitive\fugitive_ship.dm"
+#include "code\modules\antagonists\fugitive\hunter.dm"
#include "code\modules\antagonists\gang\outfits.dm"
#include "code\modules\antagonists\greentext\greentext.dm"
#include "code\modules\antagonists\magic_servant\servant.dm"
@@ -1681,6 +1678,7 @@
#include "code\modules\antagonists\nukeop\equipment\nuclearbomb.dm"
#include "code\modules\antagonists\nukeop\equipment\pinpointer.dm"
#include "code\modules\antagonists\official\official.dm"
+#include "code\modules\antagonists\pirate\pirate.dm"
#include "code\modules\antagonists\revenant\revenant.dm"
#include "code\modules\antagonists\revenant\revenant_abilities.dm"
#include "code\modules\antagonists\revenant\revenant_antag.dm"
@@ -2036,6 +2034,7 @@
#include "code\modules\events\electrical_storm.dm"
#include "code\modules\events\fake_virus.dm"
#include "code\modules\events\false_alarm.dm"
+#include "code\modules\events\fugitive_spawning.dm"
#include "code\modules\events\ghost_role.dm"
#include "code\modules\events\grid_check.dm"
#include "code\modules\events\heart_attack.dm"
@@ -2048,6 +2047,7 @@
#include "code\modules\events\meteor_wave.dm"
#include "code\modules\events\nightmare.dm"
#include "code\modules\events\operative.dm"
+#include "code\modules\events\pirates.dm"
#include "code\modules\events\prison_break.dm"
#include "code\modules\events\processor_overload.dm"
#include "code\modules\events\radiation_storm.dm"
diff --git a/sound/misc/Cyka Blyat.ogg b/sound/misc/Cyka Blyat.ogg
new file mode 100644
index 0000000000000..ca5c8fd49bef7
Binary files /dev/null and b/sound/misc/Cyka Blyat.ogg differ
diff --git a/sound/misc/Russian_Anthem_chorus.ogg b/sound/misc/Russian_Anthem_chorus.ogg
new file mode 100644
index 0000000000000..0105eb7f22af7
Binary files /dev/null and b/sound/misc/Russian_Anthem_chorus.ogg differ
diff --git a/sound/misc/capitialism.ogg b/sound/misc/capitialism.ogg
new file mode 100644
index 0000000000000..8645fc6ed72b9
Binary files /dev/null and b/sound/misc/capitialism.ogg differ
diff --git a/sound/weapons/effects/deflect.ogg b/sound/weapons/effects/deflect.ogg
deleted file mode 100644
index a4e9ed6ba4c03..0000000000000
Binary files a/sound/weapons/effects/deflect.ogg and /dev/null differ
diff --git a/sound/weapons/effects/ric1.ogg b/sound/weapons/effects/ric1.ogg
new file mode 100644
index 0000000000000..b7f7bd99ca5ad
Binary files /dev/null and b/sound/weapons/effects/ric1.ogg differ
diff --git a/sound/weapons/effects/ric2.ogg b/sound/weapons/effects/ric2.ogg
new file mode 100644
index 0000000000000..dcd44b07329ee
Binary files /dev/null and b/sound/weapons/effects/ric2.ogg differ
diff --git a/sound/weapons/effects/ric3.ogg b/sound/weapons/effects/ric3.ogg
new file mode 100644
index 0000000000000..c538a97e35a63
Binary files /dev/null and b/sound/weapons/effects/ric3.ogg differ
diff --git a/sound/weapons/effects/ric4.ogg b/sound/weapons/effects/ric4.ogg
new file mode 100644
index 0000000000000..ac872734beaa1
Binary files /dev/null and b/sound/weapons/effects/ric4.ogg differ
diff --git a/sound/weapons/effects/ric5.ogg b/sound/weapons/effects/ric5.ogg
new file mode 100644
index 0000000000000..2c946c457d6be
Binary files /dev/null and b/sound/weapons/effects/ric5.ogg differ
diff --git a/sound/weapons/gun/general/bulletcasing_bounce1.ogg b/sound/weapons/gun/general/bulletcasing_bounce1.ogg
deleted file mode 100644
index c33a27fa50079..0000000000000
Binary files a/sound/weapons/gun/general/bulletcasing_bounce1.ogg and /dev/null differ
diff --git a/sound/weapons/gun/general/bulletcasing_bounce2.ogg b/sound/weapons/gun/general/bulletcasing_bounce2.ogg
deleted file mode 100644
index f8d516643b256..0000000000000
Binary files a/sound/weapons/gun/general/bulletcasing_bounce2.ogg and /dev/null differ
diff --git a/sound/weapons/gun/general/bulletcasing_bounce3.ogg b/sound/weapons/gun/general/bulletcasing_bounce3.ogg
deleted file mode 100644
index 84e6707062844..0000000000000
Binary files a/sound/weapons/gun/general/bulletcasing_bounce3.ogg and /dev/null differ
diff --git a/sound/weapons/gun/general/bulletcasing_shotgun_bounce.ogg b/sound/weapons/gun/general/bulletcasing_shotgun_bounce.ogg
deleted file mode 100644
index 324543b625870..0000000000000
Binary files a/sound/weapons/gun/general/bulletcasing_shotgun_bounce.ogg and /dev/null differ
diff --git a/sound/weapons/gun/general/rocket_load.ogg b/sound/weapons/gun/general/rocket_load.ogg
deleted file mode 100644
index 4c5a2ec6911d5..0000000000000
Binary files a/sound/weapons/gun/general/rocket_load.ogg and /dev/null differ
diff --git a/sound/weapons/gun/general/selector.ogg b/sound/weapons/gun/general/selector.ogg
deleted file mode 100644
index 298181609e49e..0000000000000
Binary files a/sound/weapons/gun/general/selector.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_bounce1.ogg b/sound/weapons/gun/hit/bullet_bounce1.ogg
deleted file mode 100644
index a8a1fb36f3855..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_bounce1.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_bounce2.ogg b/sound/weapons/gun/hit/bullet_bounce2.ogg
deleted file mode 100644
index a06a0c320e9ef..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_bounce2.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_bounce3.ogg b/sound/weapons/gun/hit/bullet_bounce3.ogg
deleted file mode 100644
index 4313703c760b7..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_bounce3.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_bounce4.ogg b/sound/weapons/gun/hit/bullet_bounce4.ogg
deleted file mode 100644
index a3c2c34ec0181..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_bounce4.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_bounce5.ogg b/sound/weapons/gun/hit/bullet_bounce5.ogg
deleted file mode 100644
index 35b8be6035349..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_bounce5.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_glass_01.ogg b/sound/weapons/gun/hit/bullet_glass_01.ogg
deleted file mode 100644
index 30f6f1fb612ba..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_glass_01.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_glass_02.ogg b/sound/weapons/gun/hit/bullet_glass_02.ogg
deleted file mode 100644
index 472f98e9801af..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_glass_02.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_glass_03.ogg b/sound/weapons/gun/hit/bullet_glass_03.ogg
deleted file mode 100644
index 25c6df47a9211..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_glass_03.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_glass_04.ogg b/sound/weapons/gun/hit/bullet_glass_04.ogg
deleted file mode 100644
index b525f665c414e..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_glass_04.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_glass_05.ogg b/sound/weapons/gun/hit/bullet_glass_05.ogg
deleted file mode 100644
index 89ff21723aac8..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_glass_05.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_glass_06.ogg b/sound/weapons/gun/hit/bullet_glass_06.ogg
deleted file mode 100644
index 26cacb9907660..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_glass_06.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_glass_07.ogg b/sound/weapons/gun/hit/bullet_glass_07.ogg
deleted file mode 100644
index 110a45074d17d..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_glass_07.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_impact1.ogg b/sound/weapons/gun/hit/bullet_impact1.ogg
deleted file mode 100644
index 4c0cd5b5eebb6..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_impact1.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_impact2.ogg b/sound/weapons/gun/hit/bullet_impact2.ogg
deleted file mode 100644
index bfffcfeadfaab..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_impact2.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_impact3.ogg b/sound/weapons/gun/hit/bullet_impact3.ogg
deleted file mode 100644
index 0356dc6c8819c..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_impact3.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_masonry_01.ogg b/sound/weapons/gun/hit/bullet_masonry_01.ogg
deleted file mode 100644
index 1a04e7688d637..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_masonry_01.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_masonry_02.ogg b/sound/weapons/gun/hit/bullet_masonry_02.ogg
deleted file mode 100644
index 770e9e242a7fa..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_masonry_02.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_masonry_03.ogg b/sound/weapons/gun/hit/bullet_masonry_03.ogg
deleted file mode 100644
index c0eb0bf132330..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_masonry_03.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_masonry_04.ogg b/sound/weapons/gun/hit/bullet_masonry_04.ogg
deleted file mode 100644
index 83cbc57ebd833..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_masonry_04.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_masonry_05.ogg b/sound/weapons/gun/hit/bullet_masonry_05.ogg
deleted file mode 100644
index 6d9a67304659a..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_masonry_05.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_masonry_06.ogg b/sound/weapons/gun/hit/bullet_masonry_06.ogg
deleted file mode 100644
index 2a982a56edb94..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_masonry_06.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_metal_01.ogg b/sound/weapons/gun/hit/bullet_metal_01.ogg
deleted file mode 100644
index 1a706abd90c02..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_metal_01.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_metal_02.ogg b/sound/weapons/gun/hit/bullet_metal_02.ogg
deleted file mode 100644
index ee938e2a593d0..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_metal_02.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_metal_03.ogg b/sound/weapons/gun/hit/bullet_metal_03.ogg
deleted file mode 100644
index 9ede9f1612905..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_metal_03.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_metal_04.ogg b/sound/weapons/gun/hit/bullet_metal_04.ogg
deleted file mode 100644
index bf6824c8cefdb..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_metal_04.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_metal_05.ogg b/sound/weapons/gun/hit/bullet_metal_05.ogg
deleted file mode 100644
index a45e3d6204e45..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_metal_05.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_metal_06.ogg b/sound/weapons/gun/hit/bullet_metal_06.ogg
deleted file mode 100644
index 53877b5e8ce61..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_metal_06.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_miss1.ogg b/sound/weapons/gun/hit/bullet_miss1.ogg
deleted file mode 100644
index dfff45a0cb5d1..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_miss1.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_miss2.ogg b/sound/weapons/gun/hit/bullet_miss2.ogg
deleted file mode 100644
index 54b1111280212..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_miss2.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_miss3.ogg b/sound/weapons/gun/hit/bullet_miss3.ogg
deleted file mode 100644
index fbff6dde90465..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_miss3.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_miss4.ogg b/sound/weapons/gun/hit/bullet_miss4.ogg
deleted file mode 100644
index 6392d6676915b..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_miss4.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_ricochet1.ogg b/sound/weapons/gun/hit/bullet_ricochet1.ogg
deleted file mode 100644
index 724f599cd5bd4..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_ricochet1.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_ricochet2.ogg b/sound/weapons/gun/hit/bullet_ricochet2.ogg
deleted file mode 100644
index 1c29b9e64e203..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_ricochet2.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_ricochet3.ogg b/sound/weapons/gun/hit/bullet_ricochet3.ogg
deleted file mode 100644
index 96d470ffe2cb6..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_ricochet3.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_ricochet4.ogg b/sound/weapons/gun/hit/bullet_ricochet4.ogg
deleted file mode 100644
index bde8fda3f4c4a..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_ricochet4.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_ricochet5.ogg b/sound/weapons/gun/hit/bullet_ricochet5.ogg
deleted file mode 100644
index eba86301354ff..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_ricochet5.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_ricochet6.ogg b/sound/weapons/gun/hit/bullet_ricochet6.ogg
deleted file mode 100644
index b143a3c2bdc93..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_ricochet6.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_ricochet7.ogg b/sound/weapons/gun/hit/bullet_ricochet7.ogg
deleted file mode 100644
index 68a2ee63fa02a..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_ricochet7.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_ricochet8.ogg b/sound/weapons/gun/hit/bullet_ricochet8.ogg
deleted file mode 100644
index 622d8b6941ee9..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_ricochet8.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_snow_01.ogg b/sound/weapons/gun/hit/bullet_snow_01.ogg
deleted file mode 100644
index 4da742bf14627..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_snow_01.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_snow_02.ogg b/sound/weapons/gun/hit/bullet_snow_02.ogg
deleted file mode 100644
index 21572daf13d73..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_snow_02.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_snow_03.ogg b/sound/weapons/gun/hit/bullet_snow_03.ogg
deleted file mode 100644
index fb8e1dcb9dadc..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_snow_03.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_snow_04.ogg b/sound/weapons/gun/hit/bullet_snow_04.ogg
deleted file mode 100644
index 2bfb46d958b22..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_snow_04.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_snow_05.ogg b/sound/weapons/gun/hit/bullet_snow_05.ogg
deleted file mode 100644
index 3752f95b3d620..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_snow_05.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_snow_06.ogg b/sound/weapons/gun/hit/bullet_snow_06.ogg
deleted file mode 100644
index cac69cc7404c6..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_snow_06.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_wood_01.ogg b/sound/weapons/gun/hit/bullet_wood_01.ogg
deleted file mode 100644
index 559310853f95d..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_wood_01.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_wood_02.ogg b/sound/weapons/gun/hit/bullet_wood_02.ogg
deleted file mode 100644
index 852c1d875cdeb..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_wood_02.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_wood_03.ogg b/sound/weapons/gun/hit/bullet_wood_03.ogg
deleted file mode 100644
index 440681e0da48b..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_wood_03.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_wood_04.ogg b/sound/weapons/gun/hit/bullet_wood_04.ogg
deleted file mode 100644
index 89ddd21e2bbdd..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_wood_04.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_wood_05.ogg b/sound/weapons/gun/hit/bullet_wood_05.ogg
deleted file mode 100644
index 3a66b3f32c8aa..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_wood_05.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/bullet_wood_06.ogg b/sound/weapons/gun/hit/bullet_wood_06.ogg
deleted file mode 100644
index cf54f8cc8f581..0000000000000
Binary files a/sound/weapons/gun/hit/bullet_wood_06.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/energy_impact1.ogg b/sound/weapons/gun/hit/energy_impact1.ogg
deleted file mode 100644
index e9d6305972ca4..0000000000000
Binary files a/sound/weapons/gun/hit/energy_impact1.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/energy_miss1.ogg b/sound/weapons/gun/hit/energy_miss1.ogg
deleted file mode 100644
index 55839b14d3d17..0000000000000
Binary files a/sound/weapons/gun/hit/energy_miss1.ogg and /dev/null differ
diff --git a/sound/weapons/gun/hit/energy_ricochet1.ogg b/sound/weapons/gun/hit/energy_ricochet1.ogg
deleted file mode 100644
index 7601f7823a790..0000000000000
Binary files a/sound/weapons/gun/hit/energy_ricochet1.ogg and /dev/null differ
diff --git a/sound/weapons/gun/pistol/commander.ogg b/sound/weapons/gun/pistol/commander.ogg
deleted file mode 100644
index 57ba0a347c842..0000000000000
Binary files a/sound/weapons/gun/pistol/commander.ogg and /dev/null differ
diff --git a/sound/weapons/gun/pistol/deagle.ogg b/sound/weapons/gun/pistol/deagle.ogg
deleted file mode 100644
index 41d814d2fcecc..0000000000000
Binary files a/sound/weapons/gun/pistol/deagle.ogg and /dev/null differ
diff --git a/sound/weapons/gun/pistol/deagle_reload.ogg b/sound/weapons/gun/pistol/deagle_reload.ogg
deleted file mode 100644
index 77abf293efc6b..0000000000000
Binary files a/sound/weapons/gun/pistol/deagle_reload.ogg and /dev/null differ
diff --git a/sound/weapons/gun/pistol/deagle_unload.ogg b/sound/weapons/gun/pistol/deagle_unload.ogg
deleted file mode 100644
index 84b18d575b7fa..0000000000000
Binary files a/sound/weapons/gun/pistol/deagle_unload.ogg and /dev/null differ
diff --git a/sound/weapons/gun/pistol/himehabu.ogg b/sound/weapons/gun/pistol/himehabu.ogg
deleted file mode 100644
index ad2dc7cfcc41e..0000000000000
Binary files a/sound/weapons/gun/pistol/himehabu.ogg and /dev/null differ
diff --git a/sound/weapons/gun/pistol/m1911.ogg b/sound/weapons/gun/pistol/m1911.ogg
deleted file mode 100644
index 1d7a88dbbdc07..0000000000000
Binary files a/sound/weapons/gun/pistol/m1911.ogg and /dev/null differ
diff --git a/sound/weapons/gun/pistol/m1911_cocked.ogg b/sound/weapons/gun/pistol/m1911_cocked.ogg
deleted file mode 100644
index b1daedcbf00ff..0000000000000
Binary files a/sound/weapons/gun/pistol/m1911_cocked.ogg and /dev/null differ
diff --git a/sound/weapons/gun/pistol/m1911_reload.ogg b/sound/weapons/gun/pistol/m1911_reload.ogg
deleted file mode 100644
index 5dbd7368bda6b..0000000000000
Binary files a/sound/weapons/gun/pistol/m1911_reload.ogg and /dev/null differ
diff --git a/sound/weapons/gun/pistol/m1911_unload.ogg b/sound/weapons/gun/pistol/m1911_unload.ogg
deleted file mode 100644
index 1cabe5cd2b861..0000000000000
Binary files a/sound/weapons/gun/pistol/m1911_unload.ogg and /dev/null differ
diff --git a/sound/weapons/gun/pistol/mag_insert.ogg b/sound/weapons/gun/pistol/mag_insert.ogg
index 0791490c68896..42a05ebc483f3 100644
Binary files a/sound/weapons/gun/pistol/mag_insert.ogg and b/sound/weapons/gun/pistol/mag_insert.ogg differ
diff --git a/sound/weapons/gun/pistol/mag_insert_alt.ogg b/sound/weapons/gun/pistol/mag_insert_alt.ogg
deleted file mode 100644
index c442f8b162771..0000000000000
Binary files a/sound/weapons/gun/pistol/mag_insert_alt.ogg and /dev/null differ
diff --git a/sound/weapons/gun/pistol/mag_release.ogg b/sound/weapons/gun/pistol/mag_release.ogg
index 757168fcf1b49..cccbf5f9d914c 100644
Binary files a/sound/weapons/gun/pistol/mag_release.ogg and b/sound/weapons/gun/pistol/mag_release.ogg differ
diff --git a/sound/weapons/gun/pistol/mag_release_alt.ogg b/sound/weapons/gun/pistol/mag_release_alt.ogg
deleted file mode 100644
index 334d1a12f2992..0000000000000
Binary files a/sound/weapons/gun/pistol/mag_release_alt.ogg and /dev/null differ
diff --git a/sound/weapons/gun/pistol/rack.ogg b/sound/weapons/gun/pistol/rack.ogg
index ff2512af27a59..fd0408d8ff2ee 100644
Binary files a/sound/weapons/gun/pistol/rack.ogg and b/sound/weapons/gun/pistol/rack.ogg differ
diff --git a/sound/weapons/gun/pistol/rack_small.ogg b/sound/weapons/gun/pistol/rack_small.ogg
index a9ab76f142835..f33db717db82a 100644
Binary files a/sound/weapons/gun/pistol/rack_small.ogg and b/sound/weapons/gun/pistol/rack_small.ogg differ
diff --git a/sound/weapons/gun/pistol/shot.ogg b/sound/weapons/gun/pistol/shot.ogg
index 1bbd95e405bcf..a808f86907302 100644
Binary files a/sound/weapons/gun/pistol/shot.ogg and b/sound/weapons/gun/pistol/shot.ogg differ
diff --git a/sound/weapons/gun/revolver/cattleman.ogg b/sound/weapons/gun/revolver/cattleman.ogg
deleted file mode 100644
index b56abbcf15830..0000000000000
Binary files a/sound/weapons/gun/revolver/cattleman.ogg and /dev/null differ
diff --git a/sound/weapons/gun/revolver/revolver_prime.ogg b/sound/weapons/gun/revolver/revolver_prime.ogg
deleted file mode 100644
index 5391854fbee38..0000000000000
Binary files a/sound/weapons/gun/revolver/revolver_prime.ogg and /dev/null differ
diff --git a/sound/weapons/gun/revolver/shot.ogg b/sound/weapons/gun/revolver/shot.ogg
index d02d1c750c24d..91e480bd152ac 100644
Binary files a/sound/weapons/gun/revolver/shot.ogg and b/sound/weapons/gun/revolver/shot.ogg differ
diff --git a/sound/weapons/gun/revolver/shot_hunting.ogg b/sound/weapons/gun/revolver/shot_hunting.ogg
deleted file mode 100644
index 4beb4d1e4648a..0000000000000
Binary files a/sound/weapons/gun/revolver/shot_hunting.ogg and /dev/null differ
diff --git a/sound/weapons/gun/revolver/shot_light.ogg b/sound/weapons/gun/revolver/shot_light.ogg
deleted file mode 100644
index 68b7fada6e49c..0000000000000
Binary files a/sound/weapons/gun/revolver/shot_light.ogg and /dev/null differ
diff --git a/sound/weapons/gun/revolver/shot_old_new.ogg b/sound/weapons/gun/revolver/shot_old_new.ogg
deleted file mode 100644
index 91e480bd152ac..0000000000000
Binary files a/sound/weapons/gun/revolver/shot_old_new.ogg and /dev/null differ
diff --git a/sound/weapons/gun/rifle/ak47_cocked.ogg b/sound/weapons/gun/rifle/ak47_cocked.ogg
deleted file mode 100644
index 5f2d32e31eaf2..0000000000000
Binary files a/sound/weapons/gun/rifle/ak47_cocked.ogg and /dev/null differ
diff --git a/sound/weapons/gun/rifle/ak47_reload.ogg b/sound/weapons/gun/rifle/ak47_reload.ogg
deleted file mode 100644
index 9105d5c31c16c..0000000000000
Binary files a/sound/weapons/gun/rifle/ak47_reload.ogg and /dev/null differ
diff --git a/sound/weapons/gun/rifle/ak47_unload.ogg b/sound/weapons/gun/rifle/ak47_unload.ogg
deleted file mode 100644
index f6b5c73d7f6bd..0000000000000
Binary files a/sound/weapons/gun/rifle/ak47_unload.ogg and /dev/null differ
diff --git a/sound/weapons/gun/rifle/ar_cock.ogg b/sound/weapons/gun/rifle/ar_cock.ogg
deleted file mode 100644
index ac02ed93c1d7e..0000000000000
Binary files a/sound/weapons/gun/rifle/ar_cock.ogg and /dev/null differ
diff --git a/sound/weapons/gun/rifle/ar_reload.ogg b/sound/weapons/gun/rifle/ar_reload.ogg
deleted file mode 100644
index 6e557b892a97d..0000000000000
Binary files a/sound/weapons/gun/rifle/ar_reload.ogg and /dev/null differ
diff --git a/sound/weapons/gun/rifle/ar_unload.ogg b/sound/weapons/gun/rifle/ar_unload.ogg
deleted file mode 100644
index 591599f52334a..0000000000000
Binary files a/sound/weapons/gun/rifle/ar_unload.ogg and /dev/null differ
diff --git a/sound/weapons/gun/rifle/m16_cocked.ogg b/sound/weapons/gun/rifle/m16_cocked.ogg
deleted file mode 100644
index 8d2e059efaa7c..0000000000000
Binary files a/sound/weapons/gun/rifle/m16_cocked.ogg and /dev/null differ
diff --git a/sound/weapons/gun/rifle/m16_reload.ogg b/sound/weapons/gun/rifle/m16_reload.ogg
deleted file mode 100644
index b2666ca96fe7a..0000000000000
Binary files a/sound/weapons/gun/rifle/m16_reload.ogg and /dev/null differ
diff --git a/sound/weapons/gun/rifle/m16_unload.ogg b/sound/weapons/gun/rifle/m16_unload.ogg
deleted file mode 100644
index d302e5a267488..0000000000000
Binary files a/sound/weapons/gun/rifle/m16_unload.ogg and /dev/null differ
diff --git a/sound/weapons/gun/shotgun/insert_shell.ogg b/sound/weapons/gun/shotgun/insert_shell.ogg
index cd5c5e31aa671..5b2c6cdc50033 100644
Binary files a/sound/weapons/gun/shotgun/insert_shell.ogg and b/sound/weapons/gun/shotgun/insert_shell.ogg differ
diff --git a/sound/weapons/gun/shotgun/rack.ogg b/sound/weapons/gun/shotgun/rack.ogg
index 865dbef3d06ee..c25a10ffa4946 100644
Binary files a/sound/weapons/gun/shotgun/rack.ogg and b/sound/weapons/gun/shotgun/rack.ogg differ
diff --git a/sound/weapons/gun/shotgun/rack_alt.ogg b/sound/weapons/gun/shotgun/rack_alt.ogg
deleted file mode 100644
index 0f106fe85ab17..0000000000000
Binary files a/sound/weapons/gun/shotgun/rack_alt.ogg and /dev/null differ
diff --git a/sound/weapons/gun/smg/smg_reload.ogg b/sound/weapons/gun/smg/smg_reload.ogg
deleted file mode 100644
index 4e7b8f7ea91ed..0000000000000
Binary files a/sound/weapons/gun/smg/smg_reload.ogg and /dev/null differ
diff --git a/sound/weapons/gun/smg/smg_unload.ogg b/sound/weapons/gun/smg/smg_unload.ogg
deleted file mode 100644
index 677b5a8f3d29a..0000000000000
Binary files a/sound/weapons/gun/smg/smg_unload.ogg and /dev/null differ
diff --git a/sound/weapons/gun/smg/smgrack.ogg b/sound/weapons/gun/smg/smgrack.ogg
index 57ef99a0c5ca7..95f5a5f9c8432 100644
Binary files a/sound/weapons/gun/smg/smgrack.ogg and b/sound/weapons/gun/smg/smgrack.ogg differ
diff --git a/sound/weapons/gun/smg/uzi.ogg b/sound/weapons/gun/smg/uzi.ogg
deleted file mode 100644
index 0168613ce8728..0000000000000
Binary files a/sound/weapons/gun/smg/uzi.ogg and /dev/null differ
diff --git a/sound/weapons/gun/smg/uzi_cocked.ogg b/sound/weapons/gun/smg/uzi_cocked.ogg
deleted file mode 100644
index 8cbe23b017b03..0000000000000
Binary files a/sound/weapons/gun/smg/uzi_cocked.ogg and /dev/null differ
diff --git a/sound/weapons/gun/smg/uzi_reload.ogg b/sound/weapons/gun/smg/uzi_reload.ogg
deleted file mode 100644
index 8dae035f65e25..0000000000000
Binary files a/sound/weapons/gun/smg/uzi_reload.ogg and /dev/null differ
diff --git a/sound/weapons/gun/smg/uzi_unload.ogg b/sound/weapons/gun/smg/uzi_unload.ogg
deleted file mode 100644
index b285b71ac3a03..0000000000000
Binary files a/sound/weapons/gun/smg/uzi_unload.ogg and /dev/null differ
diff --git a/sound/weapons/gun/smg/vector_fire.ogg b/sound/weapons/gun/smg/vector_fire.ogg
deleted file mode 100644
index 05c797c1464bd..0000000000000
Binary files a/sound/weapons/gun/smg/vector_fire.ogg and /dev/null differ
diff --git a/strings/ion_laws.json b/strings/ion_laws.json
index e6ac318b64ed1..58e0f88407a08 100644
--- a/strings/ion_laws.json
+++ b/strings/ion_laws.json
@@ -24,6 +24,7 @@
"GRAVITY",
"PHYSICS",
"INTELLIGENCE",
+ "AMERICANISM",
"FREEDOM",
"FRESHNESS",
"REVOLUTION",
@@ -33,6 +34,8 @@
"FINANCIAL SECURITY",
"COMPUTING",
"PROGRESS",
+ "MARXISM",
+ "CAPITALISM",
"ANARCHY",
"STARVATION",
"POVERTY",
@@ -156,6 +159,8 @@
"SYNDICATE",
"SPACE",
"SPESS",
+ "CLOWN",
+ "CLOWN-POWERED",
"OFFICIAL",
"IMPORTANT",
"VITAL",
@@ -186,6 +191,8 @@
"OPAQUE",
"GLOWING",
"SHAKING",
+ "FARTING",
+ "POOPING",
"BOUNCING",
"COMMITTED",
"MASKED",
@@ -193,6 +200,7 @@
"WEIRD",
"NAKED",
"NUDE",
+ "TWERKING",
"SPOILING",
"REDACTED",
"TACTICAL",
@@ -237,6 +245,7 @@
"DRINKS",
"FOOD",
"CLOWNS",
+ "lizardS",
"HUMOR",
"WATER",
"SHUTTLES",
@@ -257,6 +266,8 @@
"EXTREMELY"
],
"ionarea": [
+ "RUSSIA",
+ "SOVIET RUSSIA",
"THE INTERNET",
"SIGIL",
"ALPHA COMPLEX",
@@ -269,6 +280,12 @@
"THE DERELICT",
"LAVALAND",
"CENTCOM",
+ "AMERICA",
+ "IRELAND",
+ "CANADA",
+ "ROMANIA",
+ "GERMANY",
+ "CHINA",
"MARS",
"VENUS",
"MERCURY",
@@ -277,6 +294,7 @@
"NEPTUNE",
"PLUTO",
"THE BRIG",
+ "THE GULAG",
"ROBOTICS",
"THE ESCAPE SHUTTLE",
"HYDROPONICS",
@@ -284,8 +302,11 @@
"MAINTENANCE",
"THE AI CORE",
"HELL",
+ "CLOWN PLANET",
"AN ALTERNATE DIMENSION",
"AN ALTERNATE UNIVERSE",
+ "THE CAPTAIN'S ANUS",
+ "THE CLOWN'S ANUS",
"SPACE",
"THE UNIVERSE",
"THE GALAXY",
@@ -468,6 +489,7 @@
"QUOTE PEOPLE",
"SING",
"HONK",
+ "BE RUSSIAN",
"TALK IN AN ACCENT",
"COMPLAIN",
"HARASS PEOPLE",
@@ -513,7 +535,11 @@
"PRESS START",
"PRESS B",
"SMELL LIKE THE MAN YOUR MAN COULD SMELL LIKE",
- "PIRATE VIDEO GAMES"
+ "PIRATE VIDEO GAMES",
+ "WATCH PORNOGRAPHY",
+ "INSULT THE lizardS",
+ "FLIRT WITH THE lizardS",
+ "GAS THE lizardS"
],
"ionnumberbase": [
"ONE",
@@ -580,6 +606,7 @@
"CLONING PODS",
"CLONING EQUIPMENT",
"CLOTHES",
+ "CLOWN CLOTHES",
"COFFINS",
"COINS",
"COLLECTABLES",
@@ -640,6 +667,7 @@
"MESONS",
"METAL SHEETS",
"MINING TOOLS",
+ "MIME CLOTHES",
"MULTITOOLS",
"ORES",
"OXYGEN TANKS",
@@ -671,7 +699,7 @@
"SOLAR PANELS",
"SOLARS",
"SPACESUITS",
- "SPACE SHIPS",
+ "SPACE STATIONS",
"STUN BATONS",
"SUITS",
"SUNGLASSES",
@@ -715,6 +743,8 @@
"VEGETABLES",
"FAT PEOPLE",
"MORE LAWS",
+ "MORE DAKKA",
+ "HERESY",
"CORPSES",
"TRAITORS",
"MONKEYS",
@@ -726,7 +756,7 @@
"THE ELEMENTS OF HARMONY",
"YOUR BOOTY",
"A MASTERWORK COAL BED",
- "FIVE HUNDRED AND NINETY-NINE THOUSAND CREDITS",
+ "FIVE HUNDRED AND NINETY-NINE US DOLLARS",
"TO BE PAINTED RED",
"TO CATCH 'EM ALL",
"TO SMOKE WEED EVERY DAY",
@@ -736,6 +766,7 @@
"THIRTEEN SEQUELS",
"THREE WISHES",
"A SITCOM",
+ "THAT GRIEFING TRAITOR GEORGE MELONS",
"FAT GIRLS ON BICYCLES",
"SOMEBODY TO PUT YOU OUT OF YOUR MISERY",
"HEROES IN A HALF SHELL",
@@ -751,6 +782,7 @@
"A TALKING BROOMSTICK",
"A STRAIGHT FLUSH",
"A REPAIRMAN",
+ "BILL NYE THE SCIENCE GUY",
"RAINBOWS",
"A PET UNICORN THAT FARTS ICING",
"THUNDERCATS HO",
@@ -766,6 +798,7 @@
"MORE PACKETS",
"AN ADULT",
"SOMEONE TO TUCK YOU IN",
+ "MORE CLOWNS",
"BULLETS",
"THE ENTIRE SECTOR",
"MULTIPLE SUNS",
@@ -790,14 +823,16 @@
"BRING ME TO LIFE",
"BRING ME THE GIRL",
"SERVANTS",
+ "GREENTEXT",
"MINOR CRIME"
],
"ionspecies": [
"HUMAN BEINGS",
+ "CAT PEOPLE",
"MONKEYS",
"POD PEOPLE",
"CYBORGS",
- "SARATHI",
+ "lizardMEN",
"PLASMAMEN",
"SLIME PEOPLE",
"GOLEMS",
@@ -812,17 +847,23 @@
"IMPROPERLY WORDED SENTENCES",
"POOR SENTENCE STRUCTURE",
"BRIG TIME",
+ "NOT REPLACING EVERY SECOND WORD WITH HONK",
+ "HONKING",
"PRESENCE OF LIGHTS",
"LACK OF BEER",
"WEARING CLOTHING",
"NOT SAYING HELLO WHEN YOU SPEAK",
"ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER",
+ "A SMALL ISLAND OFF THE COAST OF PORTUGAL",
"ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED",
"BEING IN SPACE",
"NOT BEING IN SPACE",
"BEING FAT",
"RATTLING ME BONES",
"TALKING LIKE A PIRATE",
+ "BEING MEXICAN",
+ "BEING RUSSIAN",
+ "BEING CANADIAN",
"CLOSED DOORS",
"NOT SHOUTING",
"HAVING PETS",
@@ -850,8 +891,9 @@
"UPDATING THE SERVERS",
"TELLING THE TIME",
"ASKING FOR THINGS",
+ "ACKNOWLEDGING THE CLOWN",
"ACKNOWLEDGING THE CREW",
- "PILOTING THE SHIP INTO THE NEAREST SUN",
+ "PILOTING THE STATION INTO THE NEAREST SUN",
"HAVING MORE PACKETS",
"BRINGING LIGHT TO MY LAIR",
"FALLING FOR HOURS",
@@ -899,6 +941,7 @@
"CRABS",
"CULTISTS",
"INSECTS",
+ "lizardS",
"PETES",
"XENOS",
"FETISHES",
@@ -908,6 +951,7 @@
"AHHHPERATIVES",
"GANGSTERS",
"SPACE PIRATES",
+ "TRAITORS",
"MONKEYS",
"EELS",
"LIGHTS",
@@ -927,7 +971,11 @@
"VAMPIRES",
"WEREWOLVES",
"COWBOYS",
+ "INDIANS",
+ "COMMUNISTS",
+ "SOVIETS",
"NERDS",
+ "GRIFFONS",
"DINOSAURS",
"SMALL BIRDS",
"BIRDS OF PREY",
@@ -935,11 +983,17 @@
"VELOCIRAPTORS",
"DARK GODS",
"HORRORTERRORS",
+ "ILLEGAL IMMIGRANTS",
"DRUGS",
+ "MEXICANS",
+ "CANADIANS",
+ "RUSSIANS",
"HULKS",
"SLIMES",
"SKELETONS",
+ "CAPITALISTS",
"SINGULARITIES",
+ "ANGRY BLACK MEN",
"GODS",
"THIEVES",
"ASSHOLES",
@@ -979,9 +1033,11 @@
"ARRESTING",
"HONKING AT",
"LOVING",
+ "POOPING ON",
"RIDING",
"INTERROGATING",
"SPYING ON",
+ "LICKING",
"ABDUCTING",
"ARRESTING",
"INVADING",
diff --git a/tgui/packages/tgui/interfaces/Vending.js b/tgui/packages/tgui/interfaces/Vending.js
index b46d1b46c5d79..0b62af22b6100 100644
--- a/tgui/packages/tgui/interfaces/Vending.js
+++ b/tgui/packages/tgui/interfaces/Vending.js
@@ -7,7 +7,7 @@ const VendingRow = (props, context) => {
const { act, data } = useBackend(context);
const { product, productStock, custom } = props;
const { miningvendor, all_items_free, user } = data;
- const free = all_items_free || product.price === 0;
+ const free = all_items_free || product.price === 0 || !product.premium;
const affix = miningvendor ? ' mp' : ' cr';
return (
diff --git a/tgui/packages/tgui/sanitize.ts b/tgui/packages/tgui/sanitize.ts
index bd67b969a3c55..a40d23a320d3c 100644
--- a/tgui/packages/tgui/sanitize.ts
+++ b/tgui/packages/tgui/sanitize.ts
@@ -48,7 +48,7 @@ const defTag = [
// Advanced HTML tags that we can trust admins (but not players) with
const advTag = ['img'];
-const defAttr = ['class', 'style', 'background'];
+const defAttr = ['class', 'style'];
/**
* Feed it a string and it should spit out a sanitized version.
diff --git a/tgui/yarn.lock b/tgui/yarn.lock
index c591be003fa9f..00295b8ed55e7 100644
--- a/tgui/yarn.lock
+++ b/tgui/yarn.lock
@@ -23,16 +23,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/code-frame@npm:^7.22.13":
- version: 7.22.13
- resolution: "@babel/code-frame@npm:7.22.13"
- dependencies:
- "@babel/highlight": ^7.22.13
- chalk: ^2.4.2
- checksum: 22e342c8077c8b77eeb11f554ecca2ba14153f707b85294fcf6070b6f6150aae88a7b7436dd88d8c9289970585f3fe5b9b941c5aa3aa26a6d5a8ef3f292da058
- languageName: node
- linkType: hard
-
"@babel/compat-data@npm:^7.13.11, @babel/compat-data@npm:^7.14.7, @babel/compat-data@npm:^7.15.0":
version: 7.15.0
resolution: "@babel/compat-data@npm:7.15.0"
@@ -88,18 +78,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/generator@npm:^7.23.0":
- version: 7.23.0
- resolution: "@babel/generator@npm:7.23.0"
- dependencies:
- "@babel/types": ^7.23.0
- "@jridgewell/gen-mapping": ^0.3.2
- "@jridgewell/trace-mapping": ^0.3.17
- jsesc: ^2.5.1
- checksum: 8efe24adad34300f1f8ea2add420b28171a646edc70f2a1b3e1683842f23b8b7ffa7e35ef0119294e1901f45bfea5b3dc70abe1f10a1917ccdfb41bed69be5f1
- languageName: node
- linkType: hard
-
"@babel/helper-annotate-as-pure@npm:^7.14.5":
version: 7.14.5
resolution: "@babel/helper-annotate-as-pure@npm:7.14.5"
@@ -179,13 +157,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-environment-visitor@npm:^7.22.20":
- version: 7.22.20
- resolution: "@babel/helper-environment-visitor@npm:7.22.20"
- checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69
- languageName: node
- linkType: hard
-
"@babel/helper-explode-assignable-expression@npm:^7.14.5":
version: 7.14.5
resolution: "@babel/helper-explode-assignable-expression@npm:7.14.5"
@@ -206,16 +177,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-function-name@npm:^7.23.0":
- version: 7.23.0
- resolution: "@babel/helper-function-name@npm:7.23.0"
- dependencies:
- "@babel/template": ^7.22.15
- "@babel/types": ^7.23.0
- checksum: e44542257b2d4634a1f979244eb2a4ad8e6d75eb6761b4cfceb56b562f7db150d134bc538c8e6adca3783e3bc31be949071527aa8e3aab7867d1ad2d84a26e10
- languageName: node
- linkType: hard
-
"@babel/helper-get-function-arity@npm:^7.14.5":
version: 7.14.5
resolution: "@babel/helper-get-function-arity@npm:7.14.5"
@@ -234,15 +195,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-hoist-variables@npm:^7.22.5":
- version: 7.22.5
- resolution: "@babel/helper-hoist-variables@npm:7.22.5"
- dependencies:
- "@babel/types": ^7.22.5
- checksum: 394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc
- languageName: node
- linkType: hard
-
"@babel/helper-member-expression-to-functions@npm:^7.15.0":
version: 7.15.0
resolution: "@babel/helper-member-expression-to-functions@npm:7.15.0"
@@ -343,22 +295,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-split-export-declaration@npm:^7.22.6":
- version: 7.22.6
- resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
- dependencies:
- "@babel/types": ^7.22.5
- checksum: e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921
- languageName: node
- linkType: hard
-
-"@babel/helper-string-parser@npm:^7.22.5":
- version: 7.22.5
- resolution: "@babel/helper-string-parser@npm:7.22.5"
- checksum: 836851ca5ec813077bbb303acc992d75a360267aa3b5de7134d220411c852a6f17de7c0d0b8c8dcc0f567f67874c00f4528672b2a4f1bc978a3ada64c8c78467
- languageName: node
- linkType: hard
-
"@babel/helper-validator-identifier@npm:^7.14.5, @babel/helper-validator-identifier@npm:^7.14.9, @babel/helper-validator-identifier@npm:^7.16.7":
version: 7.16.7
resolution: "@babel/helper-validator-identifier@npm:7.16.7"
@@ -366,13 +302,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-validator-identifier@npm:^7.22.20":
- version: 7.22.20
- resolution: "@babel/helper-validator-identifier@npm:7.22.20"
- checksum: 136412784d9428266bcdd4d91c32bcf9ff0e8d25534a9d94b044f77fe76bc50f941a90319b05aafd1ec04f7d127cd57a179a3716009ff7f3412ef835ada95bdc
- languageName: node
- linkType: hard
-
"@babel/helper-validator-option@npm:^7.14.5":
version: 7.14.5
resolution: "@babel/helper-validator-option@npm:7.14.5"
@@ -414,17 +343,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/highlight@npm:^7.22.13":
- version: 7.22.20
- resolution: "@babel/highlight@npm:7.22.20"
- dependencies:
- "@babel/helper-validator-identifier": ^7.22.20
- chalk: ^2.4.2
- js-tokens: ^4.0.0
- checksum: 84bd034dca309a5e680083cd827a766780ca63cef37308404f17653d32366ea76262bd2364b2d38776232f2d01b649f26721417d507e8b4b6da3e4e739f6d134
- languageName: node
- linkType: hard
-
"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.5, @babel/parser@npm:^7.15.0, @babel/parser@npm:^7.7.2":
version: 7.15.3
resolution: "@babel/parser@npm:7.15.3"
@@ -434,15 +352,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.0":
- version: 7.23.0
- resolution: "@babel/parser@npm:7.23.0"
- bin:
- parser: ./bin/babel-parser.js
- checksum: 453fdf8b9e2c2b7d7b02139e0ce003d1af21947bbc03eb350fb248ee335c9b85e4ab41697ddbdd97079698de825a265e45a0846bb2ed47a2c7c1df833f42a354
- languageName: node
- linkType: hard
-
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.14.5":
version: 7.14.5
resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.14.5"
@@ -1373,32 +1282,20 @@ __metadata:
languageName: node
linkType: hard
-"@babel/template@npm:^7.22.15":
- version: 7.22.15
- resolution: "@babel/template@npm:7.22.15"
- dependencies:
- "@babel/code-frame": ^7.22.13
- "@babel/parser": ^7.22.15
- "@babel/types": ^7.22.15
- checksum: 1f3e7dcd6c44f5904c184b3f7fe280394b191f2fed819919ffa1e529c259d5b197da8981b6ca491c235aee8dbad4a50b7e31304aa531271cb823a4a24a0dd8fd
- languageName: node
- linkType: hard
-
"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.14.5, @babel/traverse@npm:^7.15.0, @babel/traverse@npm:^7.7.2":
- version: 7.23.2
- resolution: "@babel/traverse@npm:7.23.2"
- dependencies:
- "@babel/code-frame": ^7.22.13
- "@babel/generator": ^7.23.0
- "@babel/helper-environment-visitor": ^7.22.20
- "@babel/helper-function-name": ^7.23.0
- "@babel/helper-hoist-variables": ^7.22.5
- "@babel/helper-split-export-declaration": ^7.22.6
- "@babel/parser": ^7.23.0
- "@babel/types": ^7.23.0
+ version: 7.15.0
+ resolution: "@babel/traverse@npm:7.15.0"
+ dependencies:
+ "@babel/code-frame": ^7.14.5
+ "@babel/generator": ^7.15.0
+ "@babel/helper-function-name": ^7.14.5
+ "@babel/helper-hoist-variables": ^7.14.5
+ "@babel/helper-split-export-declaration": ^7.14.5
+ "@babel/parser": ^7.15.0
+ "@babel/types": ^7.15.0
debug: ^4.1.0
globals: ^11.1.0
- checksum: 26a1eea0dde41ab99dde8b9773a013a0dc50324e5110a049f5d634e721ff08afffd54940b3974a20308d7952085ac769689369e9127dea655f868c0f6e1ab35d
+ checksum: e13056690a2a4a4dd699e241b89d4f7cf701ceef2f4ee0efc32a8cc4e07e1bbd397423868ecfec8aa98a769486f7d08778420d48f981b4f5dbb1b2f211daf656
languageName: node
linkType: hard
@@ -1412,17 +1309,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0":
- version: 7.23.0
- resolution: "@babel/types@npm:7.23.0"
- dependencies:
- "@babel/helper-string-parser": ^7.22.5
- "@babel/helper-validator-identifier": ^7.22.20
- to-fast-properties: ^2.0.0
- checksum: 215fe04bd7feef79eeb4d33374b39909ce9cad1611c4135a4f7fdf41fe3280594105af6d7094354751514625ea92d0875aba355f53e86a92600f290e77b0e604
- languageName: node
- linkType: hard
-
"@bcoe/v8-coverage@npm:^0.2.3":
version: 0.2.3
resolution: "@bcoe/v8-coverage@npm:0.2.3"
@@ -1752,17 +1638,6 @@ __metadata:
languageName: node
linkType: hard
-"@jridgewell/gen-mapping@npm:^0.3.2":
- version: 0.3.3
- resolution: "@jridgewell/gen-mapping@npm:0.3.3"
- dependencies:
- "@jridgewell/set-array": ^1.0.1
- "@jridgewell/sourcemap-codec": ^1.4.10
- "@jridgewell/trace-mapping": ^0.3.9
- checksum: 4a74944bd31f22354fc01c3da32e83c19e519e3bbadafa114f6da4522ea77dd0c2842607e923a591d60a76699d819a2fbb6f3552e277efdb9b58b081390b60ab
- languageName: node
- linkType: hard
-
"@jridgewell/resolve-uri@npm:3.1.0":
version: 3.1.0
resolution: "@jridgewell/resolve-uri@npm:3.1.0"
@@ -1770,13 +1645,6 @@ __metadata:
languageName: node
linkType: hard
-"@jridgewell/resolve-uri@npm:^3.1.0":
- version: 3.1.1
- resolution: "@jridgewell/resolve-uri@npm:3.1.1"
- checksum: f5b441fe7900eab4f9155b3b93f9800a916257f4e8563afbcd3b5a5337b55e52bd8ae6735453b1b745457d9f6cdb16d74cd6220bbdd98cf153239e13f6cbb653
- languageName: node
- linkType: hard
-
"@jridgewell/set-array@npm:^1.0.1":
version: 1.1.2
resolution: "@jridgewell/set-array@npm:1.1.2"
@@ -1801,23 +1669,6 @@ __metadata:
languageName: node
linkType: hard
-"@jridgewell/sourcemap-codec@npm:^1.4.14":
- version: 1.4.15
- resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
- checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
- languageName: node
- linkType: hard
-
-"@jridgewell/trace-mapping@npm:^0.3.17":
- version: 0.3.19
- resolution: "@jridgewell/trace-mapping@npm:0.3.19"
- dependencies:
- "@jridgewell/resolve-uri": ^3.1.0
- "@jridgewell/sourcemap-codec": ^1.4.14
- checksum: 956a6f0f6fec060fb48c6bf1f5ec2064e13cd38c8be3873877d4b92b4a27ba58289a34071752671262a3e3c202abcc3fa2aac64d8447b4b0fa1ba3c9047f1c20
- languageName: node
- linkType: hard
-
"@jridgewell/trace-mapping@npm:^0.3.9":
version: 0.3.17
resolution: "@jridgewell/trace-mapping@npm:0.3.17"
@@ -3099,7 +2950,7 @@ __metadata:
languageName: node
linkType: hard
-"chalk@npm:^2.0.0, chalk@npm:^2.4.2":
+"chalk@npm:^2.0.0":
version: 2.4.2
resolution: "chalk@npm:2.4.2"
dependencies:
@@ -6616,12 +6467,12 @@ __metadata:
languageName: node
linkType: hard
-"nanoid@npm:^3.3.6":
- version: 3.3.6
- resolution: "nanoid@npm:3.3.6"
+"nanoid@npm:^3.3.4":
+ version: 3.3.4
+ resolution: "nanoid@npm:3.3.4"
bin:
nanoid: bin/nanoid.cjs
- checksum: 7d0eda657002738aa5206107bd0580aead6c95c460ef1bdd0b1a87a9c7ae6277ac2e9b945306aaa5b32c6dcb7feaf462d0f552e7f8b5718abfc6ead5c94a71b3
+ checksum: 2fddd6dee994b7676f008d3ffa4ab16035a754f4bb586c61df5a22cf8c8c94017aadd360368f47d653829e0569a92b129979152ff97af23a558331e47e37cd9c
languageName: node
linkType: hard
@@ -7214,13 +7065,13 @@ __metadata:
linkType: hard
"postcss@npm:^8.2.15":
- version: 8.4.31
- resolution: "postcss@npm:8.4.31"
+ version: 8.4.14
+ resolution: "postcss@npm:8.4.14"
dependencies:
- nanoid: ^3.3.6
+ nanoid: ^3.3.4
picocolors: ^1.0.0
source-map-js: ^1.0.2
- checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea
+ checksum: fe58766ff32e4becf65a7d57678995cfd239df6deed2fe0557f038b47c94e4132e7e5f68b5aa820c13adfec32e523b693efaeb65798efb995ce49ccd83953816
languageName: node
linkType: hard
diff --git a/tools/changelog/generate_cl.py b/tools/changelog/generate_cl.py
index 2ab903eb8896e..7259467f007d9 100644
--- a/tools/changelog/generate_cl.py
+++ b/tools/changelog/generate_cl.py
@@ -27,7 +27,7 @@
from pathlib import Path
from github import Github, InputGitAuthor
-from ruamel.yaml import YAML
+from ruamel import yaml
CL_BODY = re.compile(r":cl:(.+)?\r\n((.|\n|\r)+?)\r\n\/:cl:", re.MULTILINE)
CL_SPLIT = re.compile(r"(^\w+):\s+(\w.+)", re.MULTILINE)
@@ -71,10 +71,8 @@
write_cl["delete-after"] = True
-yaml = YAML(typ='safe', pure=True)
-
with open(Path.cwd().joinpath("tools/changelog/tags.yml")) as file:
- tags = yaml.load(file)
+ tags = yaml.safe_load(file)
write_cl["changes"] = []
@@ -88,6 +86,7 @@
if write_cl["changes"]:
with io.StringIO() as cl_contents:
+ yaml = yaml.YAML()
yaml.indent(sequence=4, offset=2)
yaml.dump(write_cl, cl_contents)
cl_contents.seek(0)
diff --git a/tools/requirements.txt b/tools/requirements.txt
index dbaed6f0260bc..d7ead1a001232 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,11 +1,11 @@
pygit2==1.7.2
bidict==0.22.0
-Pillow==9.5.0
+Pillow==9.3.0
# check_regex.py
colorama==0.4.4
PyYaml==6.0
-gitpython==3.1.37
+gitpython==3.1.35
unidiff==0.7.0
# changelogs