Name | Points | Notes | | Lance Phillips | 10 | Hit 2 out of 3 targets. | | Hetchel Catuwe-Plakat | 0 | Missed every shot. Relegated to knife duty. | | Weer-Topith | 30 | Hit all three targets. | | Kahyarawkkahskre | 50 | Hit all three targets one handed with a revolver. | | Salhree-Yik | 100 | Hit all three targets while blindfolded. | | Kiahkkati | -1000 | Tried to one up Salhree and spun three times blindfolded before firing. Hit me in the knee. | "
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index eaf51fc9b25b..9065c7a87fd4 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -102,8 +102,9 @@
visible_message("\The [src] hits [H] in the eye[eyes ? "" : " socket"]!")
H.adjust_blurriness(6)
eyes?.applyOrganDamage(rand(6,8))
- H.Paralyze(40)
- H.emote("scream")
+ H.force_scream()
+ if(!HAS_TRAIT(H, TRAIT_ANALGESIA))
+ H.Paralyze(40)
/obj/item/paper/examine(mob/user)
. = ..()
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 40b0771981e4..c1982475c66a 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -135,10 +135,6 @@
if(istype(paper_copy, /obj/item/paper))
do_copy_loop(CALLBACK(src, PROC_REF(make_paper_copy)), usr)
return TRUE
- // Devil contract paper.
- if(istype(paper_copy, /obj/item/paper/contract/employment))
- do_copy_loop(CALLBACK(src, PROC_REF(make_devil_paper_copy)), usr)
- return TRUE
// Copying photo.
if(photo_copy)
do_copy_loop(CALLBACK(src, PROC_REF(make_photo_copy)), usr)
@@ -268,22 +264,6 @@
copied_item.pixel_x = rand(-10, 10)
copied_item.pixel_y = rand(-10, 10)
-/**
- * Handles the copying of devil contract paper. Transfers all the text, stamps and so on from the old paper, to the copy.
- *
- * Checks first if `paper_copy` exists. Since this proc is called from a timer, it's possible that it was removed.
- * Does not check if it has enough toner because devil contracts cost no toner to print.
- */
-/obj/machinery/photocopier/proc/make_devil_paper_copy(obj/item/paper/contract/employment/to_copy)
- if(!paper_copy && !to_copy)
- return
- to_copy = to_copy ? to_copy : paper_copy
- var/obj/item/paper/contract/employment/E = to_copy
- var/obj/item/paper/contract/employment/C = new(loc, E.target.current)
- give_pixel_offset(C)
-
- return C
-
/**
* Handles the copying of paper. Transfers all the text, stamps and so on from the old paper, to the copy.
*
@@ -408,15 +388,10 @@
/obj/machinery/photocopier/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/paper))
if(copier_empty())
- if(istype(O, /obj/item/paper/contract/infernal))
- to_chat(user, "[src] smokes, smelling of brimstone!")
- resistance_flags |= FLAMMABLE
- fire_act()
- else
- if(!user.dropItemToGround(O))
- return
- paper_copy = O
- do_insertion(O, user)
+ if(!user.dropItemToGround(O))
+ return
+ paper_copy = O
+ do_insertion(O, user)
else
to_chat(user, "There is already something in [src]!")
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index 45893f8d5fc5..46fd25ac685d 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -81,11 +81,6 @@
icon_state = "stamp-chap"
dye_color = DYE_CHAP
-/obj/item/stamp/centcom
- name = "CentCom rubber stamp"
- icon_state = "stamp-centcom"
- dye_color = DYE_CENTCOM
-
/obj/item/stamp/syndicate
name = "Syndicate rubber stamp"
icon_state = "stamp-syndicate"
@@ -97,10 +92,40 @@
dye_color = DYE_SYNDICATE
/obj/item/stamp/cybersun
- name = "Cybersun rubber stamp"
+ name = "Cybersun Virtual Solutions rubber stamp"
icon_state = "stamp-cybersun"
dye_color = DYE_SYNDICATE
+/obj/item/stamp/cybersun/biodynamics
+ name = "Cybersun Biodynamics rubber stamp"
+ icon_state = "stamp-biodynamics"
+ dye_color = DYE_CMO
+
+/obj/item/stamp/ngr
+ name = "New Gorlex Republic rubber stamp"
+ icon_state = "stamp-ngr"
+ dye_color = DYE_REDCOAT
+
+/obj/item/stamp/ngr/captain
+ name = "Captain's rubber stamp"
+ icon_state = "stamp-ngr_cap"
+ dye_color = DYE_QM
+
+/obj/item/stamp/ngr/foreman
+ name = "Foreman's rubber stamp"
+ icon_state = "stamp-ngr_fore"
+ dye_color = DYE_QM
+
+/obj/item/stamp/ngr/lieutenant
+ name = "Lieutenant's rubber stamp"
+ icon_state = "stamp-ngr_lieu"
+ dye_color = DYE_QM
+
+/obj/item/stamp/ngr/ensign
+ name = "Ensign's rubber stamp"
+ icon_state = "stamp-ngr_ensign"
+ dye_color = DYE_QM
+
/obj/item/stamp/solgov
name = "SolGov rubber stamp"
icon_state = "stamp-solgov"
@@ -110,32 +135,33 @@
icon_state = "stamp-inteq"
dye_color = DYE_QM
-/obj/item/stamp/vanguard
+/obj/item/stamp/inteq/vanguard
name = "Vanguard's rubber stamp"
- icon_state = "stamp-vanguard"
- dye_color = DYE_QM
+ icon_state = "stamp-inteq_vanguard"
-/obj/item/stamp/maa
+/obj/item/stamp/inteq/maa
name = "Master at Arms' rubber stamp"
- icon_state = "stamp-maa"
- dye_color = DYE_QM
+ icon_state = "stamp-inteq_maa"
-/obj/item/stamp/artificer
- name = "Class II Artificer's rubber stamp"
- icon_state = "stamp-artificer"
- dye_color = DYE_QM
+/obj/item/stamp/inteq/artificer
+ name = "Honorable Artificer's rubber stamp"
+ icon_state = "stamp-inteq_artificer"
+
+/obj/item/stamp/inteq/corpsman
+ name = "Honorable Corpsman's rubber stamp"
+ icon_state = "stamp-inteq_corpsman"
/obj/item/stamp/clip
name = "CLIP Minutemen rubber stamp"
icon_state = "stamp-cmm"
dye_color = DYE_FO
-/obj/item/stamp/gold
+/obj/item/stamp/clip/gold
name = "GOLD rubber stamp"
icon_state = "stamp-gold"
dye_color = DYE_FO
-/obj/item/stamp/bard
+/obj/item/stamp/clip/bard
name = "BARD rubber stamp"
icon_state = "stamp-bard"
dye_color = DYE_FO
@@ -145,5 +171,66 @@
icon_state = "stamp-suns"
dye_color = DYE_PURPLE
+/obj/item/stamp/nanotrasen
+ name = "Nanotrasen rubber stamp"
+ desc = "A small rubber stamp for stamping important documents."
+ icon_state = "stamp-nt"
+ dye_color = DYE_BLUE
+
+/obj/item/stamp/nanotrasen/captain
+ name = "NT Captain's rubber stamp"
+ icon_state = "stamp-nt_cap"
+
+/obj/item/stamp/nanotrasen/officer
+ name = "NT Officer's rubber stamp"
+ icon_state = "stamp-nt_fo"
+
+/obj/item/stamp/nanotrasen/engineering
+ name = "NT Engineering Director's rubber stamp"
+ icon_state = "stamp-nt_engdir"
+
+/obj/item/stamp/nanotrasen/medical
+ name = "NT Medical Director's rubber stamp"
+ icon_state = "stamp-nt_meddir"
+
+/obj/item/stamp/nanotrasen/science
+ name = "NT Science Director's rubber stamp"
+ icon_state = "stamp-nt_scidir"
+
+/obj/item/stamp/nanotrasen/ns
+ name = "N+S Logistics rubber stamp"
+ icon_state = "stamp-ns"
+ dye_color = DYE_ORANGE
+
+/obj/item/stamp/nanotrasen/ns/captain
+ name = "N+S Captain's rubber stamp"
+ icon_state = "stamp-ns_cap"
+
+/obj/item/stamp/nanotrasen/ns/supply
+ name = "N+S Supply Director's rubber stamp"
+ icon_state = "stamp-ns_supdir"
+
+/obj/item/stamp/nanotrasen/vigilitas
+ name = "Vigilitas Interstellar rubber stamp"
+ icon_state = "stamp-vi"
+ dye_color = DYE_HOS
+
+/obj/item/stamp/nanotrasen/vigilitas/captain
+ name = "VI Captain's rubber stamp"
+ icon_state = "stamp-vi_cap"
+
+/obj/item/stamp/nanotrasen/vigilitas/security
+ name = "VI Security Director's rubber stamp"
+ icon_state = "stamp-vi_secdir"
+
+/obj/item/stamp/nanotrasen/vigilitas/loss_prevention
+ name = "VI Loss Prevention rubber stamp"
+ icon_state = "stamp-vi_lp"
+
+/obj/item/stamp/nanotrasen/central
+ name = "NT Central Command rubber stamp"
+ desc = "A rubber stamp for stamping important documents." // Needed, because base nt has "small" added.
+ icon_state = "stamp-nt_central"
+
/obj/item/stamp/attack_paw(mob/user)
return attack_hand(user)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 4f2d70b680ad..48651a3146c4 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -900,6 +900,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
ui = new(user, src, "Apc", name)
ui.open()
+/obj/machinery/power/apc/examine_more(mob/user)
+ ui_interact(user)
+ return ..()
+
/obj/machinery/power/apc/ui_data(mob/user)
var/list/data = list(
"locked" = locked,
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index b1847513a941..0e29e53da52e 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -29,13 +29,15 @@
/obj/item/stock_parts/cell/get_cell()
return src
-/obj/item/stock_parts/cell/Initialize(mapload, override_maxcharge)
+/obj/item/stock_parts/cell/Initialize(mapload, spawn_empty, override_maxcharge)
. = ..()
START_PROCESSING(SSobj, src)
create_reagents(5, INJECTABLE | DRAINABLE)
if (override_maxcharge)
maxcharge = override_maxcharge
charge = maxcharge
+ if(spawn_empty)
+ charge = 0
if(ratingdesc)
desc += " This one has a rating of [DisplayEnergy(maxcharge)], and you should not swallow it."
update_appearance()
@@ -342,18 +344,6 @@
custom_materials = null
grown_battery = TRUE //it has the overlays for wires
-/obj/item/stock_parts/cell/high/slime
- name = "charged slime core"
- desc = "A yellow slime core infused with plasma, it crackles with power."
- icon = 'icons/mob/slimes.dmi'
- icon_state = "yellow slime extract"
- custom_materials = null
- rating = 5 //self-recharge makes these desirable
- self_recharge = 1 // Infused slime cores self-recharge, over time
-
-/*Hypercharged slime cell - located in /code/modules/research/xenobiology/crossbreeding/_misc.dm
-/obj/item/stock_parts/cell/high/slime/hypercharged */
-
/obj/item/stock_parts/cell/emproof
name = "\improper EMP-proof cell"
desc = "An EMP-proof cell."
@@ -410,6 +400,8 @@
chargerate = 1500
rating = 0 //Makes it incompatible with RPED
+/obj/item/stock_parts/cell/gun/empty
+
/obj/item/stock_parts/cell/gun/empty/Initialize()
. = ..()
charge = 0
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 73920780bef3..a6cd227550ec 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -119,6 +119,7 @@
log_game("Emitter deleted at [AREACOORD(T)]")
investigate_log("deleted at [AREACOORD(T)]", INVESTIGATE_SINGULO)
QDEL_NULL(sparks)
+ QDEL_NULL(wires)
return ..()
/obj/machinery/power/emitter/update_icon_state()
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
deleted file mode 100644
index aefc5249f54d..000000000000
--- a/code/modules/power/singularity/narsie.dm
+++ /dev/null
@@ -1,238 +0,0 @@
-/obj/singularity/narsie //Moving narsie to a child object of the singularity so it can be made to function differently. --NEO
- name = "Nar'Sie's Avatar"
- desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees."
- icon = 'icons/obj/narsie_small.dmi'
- icon_state = "narsie"
- pixel_x = -89
- pixel_y = -85
- density = FALSE
- current_size = 9 //It moves/eats like a max-size singulo, aside from range. --NEO
- contained = 0 //Are we going to move around?
- dissipate = 0 //Do we lose energy over time?
- move_self = 1 //Do we move on our own?
- grav_pull = 5 //How many tiles out do we pull?
- consume_range = 6 //How many tiles out do we eat
- light_power = 0.7
- light_range = 15
- light_color = COLOR_RED
- gender = FEMALE
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
-
-/obj/singularity/narsie/large
- name = "Nar'Sie"
- icon = 'icons/obj/narsie.dmi'
- // Pixel stuff centers Narsie.
- pixel_x = -236
- pixel_y = -256
- current_size = 12
- grav_pull = 10
- consume_range = 12 //How many tiles out do we eat
-
-/obj/singularity/narsie/large/Initialize()
- . = ..()
- send_to_playing_players("NAR'SIE HAS RISEN")
- sound_to_playing_players('sound/creatures/narsie_rises.ogg')
-
- var/area/A = get_area(src)
- if(A)
- var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/cult_effects.dmi', "ghostalertsie")
- notify_ghosts("Nar'Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.", source = src, alert_overlay = alert_overlay, action=NOTIFY_ATTACK)
- narsie_spawn_animation()
- UnregisterSignal(src, COMSIG_ATOM_BSA_BEAM) //set up in /singularity/Initialize()
-
-/obj/singularity/narsie/large/cult // For the new cult ending, guaranteed to end the round within 3 minutes
- var/list/souls_needed = list()
- var/soul_goal = 0
- var/souls = 0
- var/resolved = FALSE
-
-/obj/singularity/narsie/large/cult/Initialize()
- . = ..()
- GLOB.cult_narsie = src
- var/list/all_cults = list()
- for(var/datum/antagonist/cult/C in GLOB.antagonists)
- if(!C.owner)
- continue
- all_cults |= C.cult_team
- for(var/datum/team/cult/T in all_cults)
- deltimer(T.blood_target_reset_timer)
- T.blood_target = src
- var/datum/objective/eldergod/summon_objective = locate() in T.objectives
- if(summon_objective)
- summon_objective.summoned = TRUE
- for(var/datum/mind/cult_mind in SSticker.mode.cult)
- if(isliving(cult_mind.current))
- var/mob/living/L = cult_mind.current
- L.narsie_act()
- for(var/mob/living/player in GLOB.player_list)
- if(player.stat != DEAD && player.loc && !iscultist(player) && !isanimal(player))
- souls_needed[player] = TRUE
- soul_goal = round(1 + LAZYLEN(souls_needed) * 0.75)
- INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(begin_the_end))
-
-/proc/begin_the_end()
- SSredbot.send_discord_message("admin","Nar'sie has been summoned.","round ending event")
- sleep(50)
- if(QDELETED(GLOB.cult_narsie)) // uno
- priority_announce("Status report? We detected a anomaly, but it disappeared almost immediately.","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg')
- GLOB.cult_narsie = null
- sleep(20)
- INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), 2)
- return
- priority_announce("An acausal dimensional event has been detected in your sector. Event has been flagged EXTINCTION-CLASS. Directing all available assets toward simulating solutions. SOLUTION ETA: 60 SECONDS.","Central Command Higher Dimensional Affairs", 'sound/misc/airraid.ogg')
- sleep(500)
- if(QDELETED(GLOB.cult_narsie)) // dos
- priority_announce("Simulations aborted, sensors report that the acasual event is normalizing. Good work, crew.","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg')
- GLOB.cult_narsie = null
- sleep(20)
- INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), 2)
- return
- priority_announce("Simulations on acausal dimensional event complete. Deploying solution package now. Deployment ETA: ONE MINUTE. ","Central Command Higher Dimensional Affairs")
- sleep(50)
- set_security_level("delta")
- SSshuttle.lockdown = TRUE
- sleep(600)
- if(QDELETED(GLOB.cult_narsie)) // tres
- priority_announce("Normalization detected! Abort the solution package!","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg')
- GLOB.cult_narsie = null
- sleep(20)
- set_security_level("red")
- SSshuttle.lockdown = FALSE
- INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), 2)
- return
- if(GLOB.cult_narsie.resolved == FALSE)
- GLOB.cult_narsie.resolved = TRUE
- sound_to_playing_players('sound/machines/alarm.ogg')
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper)), 120)
-
-/obj/singularity/narsie/large/cult/Destroy()
- send_to_playing_players("\"[pick("Nooooo...", "Not die. How-", "Die. Mort-", "Sas tyen re-")]\"")
- sound_to_playing_players('sound/magic/demon_dies.ogg', 50)
- if(GLOB.cult_narsie == src)
- GLOB.cult_narsie = null
- var/list/all_cults = list()
- for(var/datum/antagonist/cult/C in GLOB.antagonists)
- if(!C.owner)
- continue
- all_cults |= C.cult_team
- for(var/datum/team/cult/T in all_cults)
- var/datum/objective/eldergod/summon_objective = locate() in T.objectives
- if(summon_objective)
- summon_objective.summoned = FALSE
- summon_objective.killed = TRUE
- return ..()
-
-/proc/ending_helper()
- SSticker.force_ending = 1
-
-/proc/cult_ending_helper(ending_type = 0)
- if(ending_type == 2) //narsie fukkin died
- Cinematic(CINEMATIC_CULT_FAIL,world,CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper)))
- else if(ending_type) //no explosion
- Cinematic(CINEMATIC_CULT,world,CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper)))
- else // explosion
- Cinematic(CINEMATIC_CULT_NUKE,world,CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper)))
-
-//ATTACK GHOST IGNORING PARENT RETURN VALUE
-/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
- makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, user, cultoverride = TRUE, loc_override = src.loc)
-
-/obj/singularity/narsie/process()
- eat()
- if(!target || prob(5))
- pickcultist()
- move()
- if(prob(25))
- mezzer()
-
-
-/obj/singularity/narsie/Bump(atom/A)
- var/turf/T = get_turf(A)
- if(T == loc)
- T = get_step(A, A.dir) //please don't slam into a window like a bird, Nar'Sie
- forceMove(T)
-
-
-/obj/singularity/narsie/mezzer()
- for(var/mob/living/carbon/M in viewers(consume_range, src))
- if(M.stat == CONSCIOUS)
- if(!iscultist(M))
- to_chat(M, "You feel conscious thought crumble away in an instant as you gaze upon [src.name]...")
- M.apply_effect(60, EFFECT_STUN)
-
-
-/obj/singularity/narsie/consume(atom/A)
- if(isturf(A))
- A.narsie_act()
-
-
-/obj/singularity/narsie/ex_act() //No throwing bombs at her either.
- return
-
-
-/obj/singularity/narsie/proc/pickcultist() //Narsie rewards her cultists with being devoured first, then picks a ghost to follow.
- var/list/cultists = list()
- var/list/noncultists = list()
-
- for(var/mob/living/carbon/food in GLOB.alive_mob_list) //we don't care about constructs or cult-Ians or whatever. cult-monkeys are fair game i guess
- var/turf/pos = get_turf(food)
- if(!pos || (pos.virtual_z() != virtual_z()))
- continue
-
- if(iscultist(food))
- cultists += food
- else
- noncultists += food
-
- if(cultists.len) //cultists get higher priority
- acquire(pick(cultists))
- return
-
- if(noncultists.len)
- acquire(pick(noncultists))
- return
-
- //no living humans, follow a ghost instead.
- for(var/mob/dead/observer/ghost in GLOB.player_list)
- var/turf/pos = get_turf(ghost)
- if(!pos || (pos.virtual_z() != virtual_z()))
- continue
- cultists += ghost
- if(cultists.len)
- acquire(pick(cultists))
- return
-
-
-/obj/singularity/narsie/proc/acquire(atom/food)
- if(food == target)
- return
- to_chat(target, "NAR'SIE HAS LOST INTEREST IN YOU.")
- target = food
- if(ishuman(target))
- to_chat(target, "NAR'SIE HUNGERS FOR YOUR SOUL.")
- else
- to_chat(target, "NAR'SIE HAS CHOSEN YOU TO LEAD HER TO HER NEXT MEAL.")
-
-//Wizard narsie
-/obj/singularity/narsie/wizard
- grav_pull = 0
-
-/obj/singularity/narsie/wizard/eat()
-// if(defer_powernet_rebuild != 2)
-// defer_powernet_rebuild = 1
- for(var/atom/X in urange(consume_range,src,1))
- if(isturf(X) || ismovable(X))
- consume(X)
-// if(defer_powernet_rebuild != 2)
-// defer_powernet_rebuild = 0
- return
-
-
-/obj/singularity/narsie/proc/narsie_spawn_animation()
- setDir(SOUTH)
- move_self = FALSE
- flick("narsie_spawn_anim",src)
- addtimer(CALLBACK(src, PROC_REF(narsie_spawn_animation_end)), 3.5 SECONDS)
-
-/obj/singularity/narsie/proc/narsie_spawn_animation_end()
- move_self = TRUE
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 400366415d9a..9903beaf6ad8 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -29,7 +29,7 @@
#define PLASMA_TRANSMIT_MODIFIER 4
#define BZ_TRANSMIT_MODIFIER -2
#define TRITIUM_TRANSMIT_MODIFIER 30 //We divide by 10, so this works out to 3
-#define PLUOXIUM_TRANSMIT_MODIFIER -5 //Should halve the power output
+#define OZONE_TRANSMIT_MODIFIER -5 //Should halve the power output
#define H2O_TRANSMIT_MODIFIER -9
#define BZ_RADIOACTIVITY_MODIFIER 5 //Improves the effect of transmit modifiers
@@ -154,7 +154,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
GAS_CO2,
GAS_NITROUS,
GAS_N2,
- GAS_PLUOXIUM,
+ GAS_O3,
GAS_TRITIUM,
GAS_BZ,
GAS_FREON,
@@ -167,7 +167,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
GAS_CO2 = 0,
GAS_NITROUS = 0,
GAS_N2 = 0,
- GAS_PLUOXIUM = 0,
+ GAS_O3 = 0,
GAS_TRITIUM = 0,
GAS_BZ = 0,
GAS_FREON = 0,
@@ -177,7 +177,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
GAS_O2 = OXYGEN_TRANSMIT_MODIFIER,
GAS_H2O = H2O_TRANSMIT_MODIFIER,
GAS_PLASMA = PLASMA_TRANSMIT_MODIFIER,
- GAS_PLUOXIUM = PLUOXIUM_TRANSMIT_MODIFIER,
+ GAS_O3 = OZONE_TRANSMIT_MODIFIER,
GAS_TRITIUM = TRITIUM_TRANSMIT_MODIFIER,
GAS_BZ = BZ_TRANSMIT_MODIFIER,
)
@@ -188,7 +188,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
GAS_PLASMA = PLASMA_HEAT_PENALTY,
GAS_CO2 = CO2_HEAT_PENALTY,
GAS_N2 = NITROGEN_HEAT_PENALTY,
- GAS_PLUOXIUM = PLUOXIUM_HEAT_PENALTY,
+ GAS_O3 = PLUOXIUM_HEAT_PENALTY,
GAS_TRITIUM = TRITIUM_HEAT_PENALTY,
GAS_BZ = BZ_HEAT_PENALTY,
GAS_FREON = FREON_HEAT_PENALTY,
@@ -196,7 +196,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
///The list of gases mapped against their heat resistance. We use it to moderate heat damage.
var/list/gas_resist = list(
GAS_NITROUS = N2O_HEAT_RESISTANCE,
- GAS_PLUOXIUM = PLUOXIUM_HEAT_RESISTANCE,
+ GAS_O3 = PLUOXIUM_HEAT_RESISTANCE,
)
///The list of gases mapped against their powermix ratio
var/list/gas_powermix = list(
@@ -205,7 +205,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
GAS_PLASMA = 1,
GAS_CO2 = 1,
GAS_N2 = -1,
- GAS_PLUOXIUM = -1,
+ GAS_O3 = -1,
GAS_TRITIUM = 1,
GAS_BZ = 1,
GAS_FREON = -1,
@@ -518,13 +518,13 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
var/list/resistance_mod = gases_we_care_about.Copy()
//We're concerned about pluoxium being too easy to abuse at low percents, so we make sure there's a substantial amount.
- var/pluoxiumbonus = (gas_comp[GAS_PLUOXIUM] >= 0.15) //makes pluoxium only work at 15%+
+ var/pluoxiumbonus = (gas_comp[GAS_O3] >= 0.15) //makes pluoxium only work at 15%+
var/h2obonus = 1 - (gas_comp[GAS_H2O] * 0.25)//At max this value should be 0.75
var/freonbonus = (gas_comp[GAS_FREON] <= 0.03) //Let's just yeet power output if this shit is high
- heat_mod[GAS_PLUOXIUM] = pluoxiumbonus
- transit_mod[GAS_PLUOXIUM] = pluoxiumbonus
- resistance_mod[GAS_PLUOXIUM] = pluoxiumbonus
+ heat_mod[GAS_O3] = pluoxiumbonus
+ transit_mod[GAS_O3] = pluoxiumbonus
+ resistance_mod[GAS_O3] = pluoxiumbonus
//No less then zero, and no greater then one, we use this to do explosions and heat to power transfer
//Be very careful with modifing this var by large amounts, and for the love of god do not push it past 1
diff --git a/code/modules/projectiles/ammunition/_ammo_casing.dm b/code/modules/projectiles/ammunition/_ammo_casing.dm
new file mode 100644
index 000000000000..b478523f7b95
--- /dev/null
+++ b/code/modules/projectiles/ammunition/_ammo_casing.dm
@@ -0,0 +1,260 @@
+/obj/item/ammo_casing
+ name = "bullet casing"
+ desc = "A bullet casing."
+ icon = 'icons/obj/ammunition/ammo_bullets.dmi'
+ icon_state = "pistol-brass"
+ flags_1 = CONDUCT_1
+ slot_flags = ITEM_SLOT_BELT
+ throwforce = 0
+ w_class = WEIGHT_CLASS_TINY
+ custom_materials = list(/datum/material/iron = 500)
+
+ /// Instance of the projectile to be shot, or null if there is no loaded projectile.
+ var/obj/projectile/BB = null
+ /// The projectile type to create in Initialize(), populating the BB variable with a projectile.
+ var/projectile_type = null
+ /// Caliber string, used to determine if the casing can be loaded into specific guns or magazines.
+ var/caliber = null
+ /// Used for pacifism checks. Set to FALSE if the bullet is non-lethal and pacifists should be able to fire.
+ var/harmful = TRUE
+ /// String, used to determine the appearance of the bullet on the casing sprite if the casing is filled.
+ var/bullet_skin
+
+ /// 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
+ /// 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().
+ /// Disable for things like rockets or other heavy ammunition that should only appear right-side up.
+ var/auto_rotate = TRUE
+ /// If you dont want to bullets to randomly change position on spawn. For mapping.
+ var/auto_scatter = TRUE
+
+ ///Pellets for spreadshot
+ var/pellets = 1
+ ///Variance for inaccuracy fundamental to the casing
+ var/variance = 0
+ ///Randomspread for automatics
+ var/randomspread = FALSE
+ ///Delay for energy weapons
+ var/delay = 0
+ ///Override this to make your gun have a faster fire rate, in tenths of a second. 4 is the default gun cooldown.
+ var/click_cooldown_override = 0
+ ///If true, overrides the bouncing sfx from the turf to this one
+ var/list/bounce_sfx_override
+
+ ///What this casing can be stacked into.
+ var/obj/item/ammo_box/magazine/stack_type = /obj/item/ammo_box/magazine/ammo_stack
+ ///Maximum stack size of ammunition
+ var/stack_size = 15
+
+/obj/item/ammo_casing/attackby(obj/item/attacking_item, mob/user, params)
+ if(istype(attacking_item, /obj/item/pen))
+ if(!user.is_literate())
+ to_chat(user, "You scribble illegibly on the [src]!")
+ return
+ var/inputvalue = stripped_input(user, "What would you like to label the round?", "Bullet Labelling", "", MAX_NAME_LEN)
+
+ if(!inputvalue)
+ return
+
+ if(user.canUseTopic(src, BE_CLOSE))
+ name = "[initial(src.name)][(inputvalue ? " - '[inputvalue]'" : null)]"
+ if(BB)
+ BB.name = "[initial(BB.name)][(inputvalue ? " - '[inputvalue]'" : null)]"
+ else if(istype(attacking_item, /obj/item/ammo_box) && user.is_holding(src))
+ add_fingerprint(user)
+ var/obj/item/ammo_box/ammo_box = attacking_item
+ var/obj/item/ammo_casing/other_casing = ammo_box.get_round(TRUE)
+
+ if(try_stacking(other_casing, user))
+ ammo_box.stored_ammo -= other_casing
+ ammo_box.update_ammo_count()
+ return
+
+ else if(istype(attacking_item, /obj/item/ammo_box/magazine/ammo_stack))
+ add_fingerprint(user)
+ var/obj/item/ammo_box/magazine/ammo_stack = attacking_item
+ if(isturf(loc))
+ var/boolets = 0
+ for(var/obj/item/ammo_casing/bullet in loc)
+ if(bullet == src)
+ continue
+ if(!bullet.BB)
+ continue
+ if(length(ammo_stack.stored_ammo) >= ammo_stack.max_ammo)
+ break
+ if(ammo_stack.give_round(bullet, FALSE))
+ boolets++
+ break
+ if((boolets <= 0) && BB && !(length(ammo_stack.stored_ammo) >= ammo_stack.max_ammo))
+ if(ammo_stack.give_round(src, FALSE))
+ boolets++
+ if(boolets > 0)
+ ammo_stack.update_ammo_count()
+ to_chat(user, span_notice("You collect [boolets] round\s. [ammo_stack] now contains [length(ammo_stack.stored_ammo)] round\s."))
+ else
+ to_chat(user, span_warning("You can't stack any more!"))
+ return
+
+ else if(istype(attacking_item, /obj/item/ammo_casing))
+ try_stacking(attacking_item, user)
+ return
+
+ return ..()
+
+/obj/item/ammo_casing/examine(mob/user)
+ . = ..()
+ . += span_notice("You could write a message on \the [src] by writing on it with a pen.")
+
+/obj/item/ammo_casing/proc/try_stacking(obj/item/ammo_casing/other_casing, mob/living/user)
+ if(user)
+ add_fingerprint(user)
+ if(!other_casing.stack_type)
+ if(user)
+ to_chat(user, span_warning("[other_casing] can't be stacked."))
+ return
+ if(!stack_type)
+ if(user)
+ to_chat(user, span_warning("[src] can't be stacked."))
+ return
+ if(name != other_casing.name) //Has to match exactly
+ if(user)
+ to_chat(user, span_warning("You can't stack different types of ammunition."))
+ return
+ if(stack_type != other_casing.stack_type)
+ if(user)
+ to_chat(user, span_warning("You can't stack [other_casing] with [src]."))
+ return
+ if(!BB || !other_casing.BB) //maybe allow empty casing stacking at a later date, when there's a feature to recycle casings
+ if(user)
+ to_chat(user, span_warning("You can't stack empty casings."))
+ return
+ if((item_flags & IN_STORAGE) || (other_casing.item_flags & IN_STORAGE))
+ if(user)
+ to_chat(user, span_warning("You can't stack casings while they are inside storage."))
+ return
+ var/obj/item/ammo_box/magazine/ammo_stack/ammo_stack = other_casing.stack_with(src)
+ if(user)
+ user.put_in_hands(ammo_stack)
+ to_chat(user, span_notice("[src] has been stacked with [other_casing]."))
+ return ammo_stack
+
+/obj/item/ammo_casing/proc/stack_with(obj/item/ammo_casing/other_casing)
+ var/obj/item/ammo_box/magazine/ammo_stack/ammo_stack = new stack_type(drop_location())
+ ammo_stack.name = "handful of [name]s" //"handful of .9mm bullet casings"
+ ammo_stack.base_icon_state = other_casing.icon_state
+ ammo_stack.caliber = caliber
+ ammo_stack.max_ammo = stack_size
+ ammo_stack.give_round(src)
+ ammo_stack.give_round(other_casing)
+ ammo_stack.update_ammo_count()
+ return ammo_stack
+
+/obj/item/ammo_casing/Initialize()
+ . = ..()
+ if(projectile_type)
+ BB = new projectile_type(src)
+ if(auto_scatter)
+ pixel_x = base_pixel_x + rand(-10, 10)
+ pixel_y = base_pixel_y + rand(-10, 10)
+ item_flags |= NO_PIXEL_RANDOM_DROP
+ if(auto_rotate)
+ transform = transform.Turn(round(45 * rand(0, 32) / 2))
+ update_appearance()
+
+/obj/item/ammo_casing/Destroy()
+ . = ..()
+ if(BB)
+ QDEL_NULL(BB)
+
+/obj/item/ammo_casing/update_icon_state()
+ icon_state = "[initial(icon_state)][BB ? (bullet_skin ? "-[bullet_skin]" : "") : "-empty"]"
+ // [CELADON-ADD] - CELADON_BALANCE - Патроны
+ if(icon_state == "[initial(icon_state)]-empty")
+ custom_materials = list(/datum/material/iron=500)
+ // [/CELADON-ADD]
+ return ..()
+
+/obj/item/ammo_casing/update_desc()
+ desc = "[initial(desc)][BB ? null : " This one is spent."]"
+ return ..()
+
+///Proc to magically refill a casing with a new projectile
+/obj/item/ammo_casing/proc/newshot() //For energy weapons, syringe gun, shotgun shells and wands (!).
+ if(!BB)
+ BB = new projectile_type(src, src)
+
+
+/obj/item/ammo_casing/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+ bounce_away(FALSE, NONE)
+ . = ..()
+
+/obj/item/ammo_casing/proc/on_eject(atom/shooter)
+ forceMove(drop_location()) //Eject casing onto ground.
+ pixel_x = rand(-4, 4)
+ pixel_y = rand(-4, 4)
+ pixel_z = 8 //bounce time
+ var/angle_of_movement = !isnull(shooter) ? (rand(-3000, 3000) / 100) + dir2angle(turn(shooter.dir, 180)) : rand(-3000, 3000) / 100
+ AddComponent(/datum/component/movable_physics, _horizontal_velocity = rand(400, 450) / 100, _vertical_velocity = rand(400, 450) / 100, _horizontal_friction = rand(20, 24) / 100, _z_gravity = PHYSICS_GRAV_STANDARD, _z_floor = 0, _angle_of_movement = angle_of_movement, _bounce_sound = bounce_sfx_override)
+
+/obj/item/ammo_casing/proc/bounce_away(still_warm = FALSE, bounce_delay = 3)
+ if(!heavy_metal)
+ return
+ update_appearance()
+ SpinAnimation(10, 1)
+ var/turf/location = get_turf(src)
+ if(bounce_sfx_override)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(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(!location)
+ return
+
+ if(still_warm && location.bullet_sizzle)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(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(location.bullet_bounce_sound)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, pick(location.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.
+
+/obj/item/ammo_casing/spent
+ name = "spent bullet casing"
+ projectile_type = null
+ BB = null
+
+/obj/item/ammo_casing/spent/pistol_brass
+ icon_state = "pistol-brass"
+
+/obj/item/ammo_casing/spent/pistol_steel
+ icon_state = "pistol-steel"
+
+/obj/item/ammo_casing/spent/magnum_brass
+ icon_state = "magnum-brass"
+
+/obj/item/ammo_casing/spent/magnum_steel
+ icon_state = "magnum-steel"
+
+/obj/item/ammo_casing/spent/rifle_brass
+ icon_state = "rifle-brass"
+
+/obj/item/ammo_casing/spent/rifle_steel
+ icon_state = "rifle-steel"
+
+/obj/item/ammo_casing/spent/big_brass
+ icon_state = "big-brass"
+
+/obj/item/ammo_casing/spent/big_steel
+ icon_state = "big-steel" //balls
+
+/obj/item/ammo_casing/spent/slug
+ icon_state = "slug"
+
+/obj/item/ammo_casing/spent/slug/buck
+ icon_state = "buckshot"
+
+/obj/item/ammo_casing/spent/slug/beanbag
+ icon_state = "beanbag"
+
+/obj/item/ammo_casing/spent/slug/rubber
+ icon_state = "rubber"
diff --git a/code/modules/projectiles/ammunition/_ammunition.dm b/code/modules/projectiles/ammunition/_ammunition.dm
deleted file mode 100644
index 51b9b2fb5715..000000000000
--- a/code/modules/projectiles/ammunition/_ammunition.dm
+++ /dev/null
@@ -1,139 +0,0 @@
-/obj/item/ammo_casing
- name = "bullet casing"
- desc = "A bullet casing."
- icon = 'icons/obj/ammo_bullets.dmi'
- icon_state = "pistol-brass"
- flags_1 = CONDUCT_1
- slot_flags = ITEM_SLOT_BELT
- throwforce = 0
- w_class = WEIGHT_CLASS_TINY
- custom_materials = list(/datum/material/iron = 500)
-
- /// Instance of the projectile to be shot, or null if there is no loaded projectile.
- var/obj/projectile/BB = null
- /// The projectile type to create in Initialize(), populating the BB variable with a projectile.
- var/projectile_type = null
- /// Caliber string, used to determine if the casing can be loaded into specific guns or magazines.
- var/caliber = null
- /// Used for pacifism checks. Set to FALSE if the bullet is non-lethal and pacifists should be able to fire.
- var/harmful = TRUE
- /// String, used to determine the appearance of the bullet on the casing sprite if the casing is filled.
- var/bullet_skin
-
- /// 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
- /// 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().
- /// Disable for things like rockets or other heavy ammunition that should only appear right-side up.
- var/auto_rotate = TRUE
-
- var/pellets = 1 //Pellets for spreadshot
- var/variance = 0 //Variance for inaccuracy fundamental to the casing
- var/randomspread = FALSE //Randomspread for automatics
- 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
-
- var/bullet_per_box
-
-
-/obj/item/ammo_casing/spent
- name = "spent bullet casing"
- BB = null
-
-/obj/item/ammo_casing/Initialize()
- . = ..()
- if(projectile_type)
- BB = new projectile_type(src)
- pixel_x = base_pixel_x + rand(-10, 10)
- pixel_y = base_pixel_y + rand(-10, 10)
- item_flags |= NO_PIXEL_RANDOM_DROP
- if(auto_rotate)
- transform = transform.Turn(pick(0, 90, 180, 270))
- update_appearance()
-
-/obj/item/ammo_casing/Destroy()
- . = ..()
-
- if(BB)
- QDEL_NULL(BB)
- else
- SSblackbox.record_feedback("tally", "station_mess_destroyed", 1, name)
-
-/obj/item/ammo_casing/update_icon_state()
- icon_state = "[initial(icon_state)][BB ? (bullet_skin ? "-[bullet_skin]" : "") : "-empty"]"
- // [CELADON-ADD] - CELADON_BALANCE - Патроны
- if(icon_state == "[initial(icon_state)]-empty")
- custom_materials = list(/datum/material/iron=500)
- // [/CELADON-ADD]
- return ..()
-
-/obj/item/ammo_casing/update_desc()
- desc = "[initial(desc)][BB ? null : " This one is spent."]"
- return ..()
-
-//proc to magically refill a casing with a new projectile
-/obj/item/ammo_casing/proc/newshot() //For energy weapons, syringe gun, shotgun shells and wands (!).
- if(!BB)
- BB = new projectile_type(src, src)
-
-/obj/item/ammo_casing/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/ammo_box))
- var/obj/item/ammo_box/box = I
- if(isturf(loc))
- var/boolets = 0
- for(var/obj/item/ammo_casing/bullet in loc)
- if (box.stored_ammo.len >= box.max_ammo)
- break
- if (bullet.BB)
- if (box.give_round(bullet, 0))
- boolets++
- // [CELADON-ADD] - CELADON_BALANCE
- playsound(loc, 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE)
- break
- // [/CELADON-ADD]
- else
- continue
- if (boolets > 0)
- box.update_appearance()
- to_chat(user, "You collect [boolets] shell\s. [box] now contains [box.stored_ammo.len] shell\s.")
- else
- to_chat(user, "You fail to collect anything!")
- else
- return ..()
-
-
-/obj/item/ammo_casing/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- bounce_away(FALSE, NONE)
- . = ..()
-
-/obj/item/ammo_casing/proc/on_eject(atom/shooter)
- forceMove(drop_location()) //Eject casing onto ground.
- pixel_x = rand(-4, 4)
- pixel_y = rand(-4, 4)
- pixel_z = 8 //bounce time
- var/angle_of_movement = !isnull(shooter) ? (rand(-3000, 3000) / 100) + dir2angle(turn(shooter.dir, 180)) : rand(-3000, 3000) / 100
- AddComponent(/datum/component/movable_physics, _horizontal_velocity = rand(400, 450) / 100, _vertical_velocity = rand(400, 450) / 100, _horizontal_friction = rand(20, 24) / 100, _z_gravity = PHYSICS_GRAV_STANDARD, _z_floor = 0, _angle_of_movement = angle_of_movement, _bounce_sound = bounce_sfx_override)
-
-
-/obj/item/ammo_casing/proc/bounce_away(still_warm = FALSE, bounce_delay = 3)
- if(!heavy_metal)
- return
- update_appearance()
- SpinAnimation(10, 1)
- var/turf/location = get_turf(src)
- if(bounce_sfx_override)
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(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(!location)
- return
-
- if(still_warm && location.bullet_sizzle)
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(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(location.bullet_bounce_sound)
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, pick(location.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/_firing.dm b/code/modules/projectiles/ammunition/_firing.dm
index bdc5254f13c9..cfa4e91e645c 100644
--- a/code/modules/projectiles/ammunition/_firing.dm
+++ b/code/modules/projectiles/ammunition/_firing.dm
@@ -8,7 +8,7 @@
spread = round((rand() - 0.5) * distro)
else //Smart spread
spread = round(1 - 0.5) * distro
- if(!throw_proj(target, targloc, user, params, spread))
+ if(!throw_proj(target, targloc, user, params, spread, fired_from))
return FALSE
else
if(isnull(BB))
@@ -45,7 +45,7 @@
reagents.trans_to(BB, reagents.total_volume, transfered_by = user) //For chemical darts/bullets
qdel(reagents)
-/obj/item/ammo_casing/proc/throw_proj(atom/target, turf/targloc, mob/living/user, params, spread)
+/obj/item/ammo_casing/proc/throw_proj(atom/target, turf/targloc, mob/living/user, params, spread, atom/fired_from)
var/turf/curloc
if(user)
curloc = get_turf(user)
diff --git a/code/modules/projectiles/ammunition/ballistic/lmg.dm b/code/modules/projectiles/ammunition/ballistic/lmg.dm
index d46001951ba4..d716618b0d60 100644
--- a/code/modules/projectiles/ammunition/ballistic/lmg.dm
+++ b/code/modules/projectiles/ammunition/ballistic/lmg.dm
@@ -6,7 +6,6 @@
icon_state = "rifle-steel"
caliber = "7.12x82mm"
projectile_type = /obj/projectile/bullet/mm712x82
- bullet_per_box = 100
/obj/item/ammo_casing/mm712x82/ap
name = "7.12x82mm armor-piercing bullet casing"
@@ -20,12 +19,6 @@
projectile_type = /obj/projectile/bullet/mm712x82/hp
bullet_skin = "hollow"
-/obj/item/ammo_casing/mm712x82/inc
- name = "7.12x82mm incendiary bullet casing"
- desc = "A 7.12x82mm incendiary bullet casing."
- projectile_type = /obj/projectile/bullet/incendiary/mm712x82
- bullet_skin = "incen"
-
/obj/item/ammo_casing/mm712x82/match
name = "7.12x82mm match bullet casing"
desc = "A 7.12x82mm match bullet casing."
diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm
index e8cb64a673d2..aabc86f3c51e 100644
--- a/code/modules/projectiles/ammunition/ballistic/pistol.dm
+++ b/code/modules/projectiles/ammunition/ballistic/pistol.dm
@@ -6,7 +6,6 @@
icon_state = "pistol-steel"
caliber = "10mm"
projectile_type = /obj/projectile/bullet/c10mm
- bullet_per_box = 50
/obj/item/ammo_casing/c10mm/surplus
name = "10mm surplus bullet casing"
@@ -26,12 +25,6 @@
projectile_type = /obj/projectile/bullet/c10mm/hp
bullet_skin = "hollow"
-/obj/item/ammo_casing/c10mm/inc
- name = "10mm incendiary bullet casing"
- desc = "A 10mm incendiary bullet casing."
- bullet_skin = "incen"
- projectile_type = /obj/projectile/bullet/incendiary/c10mm
-
/obj/item/ammo_casing/c10mm/rubber
name = "10mm rubber bullet casing"
desc = "A 10mm rubber bullet casing."
@@ -46,7 +39,7 @@
icon_state = "pistol-brass"
caliber = "9mm"
projectile_type = /obj/projectile/bullet/c9mm
- bullet_per_box = 50
+ stack_size = 15
/obj/item/ammo_casing/c9mm/surplus
name = "9mm surplus bullet casing"
@@ -58,7 +51,7 @@
name = "9mm armor-piercing bullet casing"
desc = "A 9mm armor-piercing bullet casing."
bullet_skin = "ap"
- projectile_type =/obj/projectile/bullet/c9mm/ap
+ projectile_type = /obj/projectile/bullet/c9mm/ap
/obj/item/ammo_casing/c9mm/hp
name = "9mm hollow point bullet casing"
@@ -66,12 +59,6 @@
bullet_skin = "hollow"
projectile_type = /obj/projectile/bullet/c9mm/hp
-/obj/item/ammo_casing/c9mm/inc
- name = "9mm incendiary bullet casing"
- desc = "A 9mm incendiary bullet casing."
- bullet_skin = "incen"
- projectile_type = /obj/projectile/bullet/incendiary/c9mm
-
/obj/item/ammo_casing/c9mm/rubber
name = "9mm rubber bullet casing"
desc = "A 9mm rubber bullet casing."
@@ -86,7 +73,7 @@
icon_state = "pistol-steel"
caliber = ".45"
projectile_type = /obj/projectile/bullet/c45
- bullet_per_box = 50
+ stack_size = 12
/obj/item/ammo_casing/c45/surplus
name = ".45 surplus bullet casing"
@@ -106,12 +93,6 @@
bullet_skin = "hollow"
projectile_type = /obj/projectile/bullet/c45/hp
-/obj/item/ammo_casing/c45/inc
- name = ".45 incendiary bullet casing"
- desc = "A .45 incendiary bullet casing."
- bullet_skin = "incen"
- projectile_type = /obj/projectile/bullet/incendiary/c45
-
/obj/item/ammo_casing/c45/rubber
name = ".45 rubber bullet casing"
desc = "A .45 rubber bullet casing."
@@ -125,18 +106,35 @@
desc = "A .50 AE bullet casing."
caliber = ".50 AE"
projectile_type = /obj/projectile/bullet/a50AE
- bullet_per_box = 20
/obj/item/ammo_casing/a50AE/hp
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)
+// .22 LR (Himehabu, Pounder)
+
/obj/item/ammo_casing/c22lr
name = ".22 LR bullet casing"
desc = "A .22 LR bullet casing."
projectile_type = /obj/projectile/bullet/c22lr
caliber = "22lr"
- bullet_per_box = 75
+ stack_size = 25
+
+/obj/item/ammo_casing/c22lr/hp
+ name = ".22 LR HP bullet casing"
+ desc = "A .22 LR bullet HP casing."
+ projectile_type = /obj/projectile/bullet/c22lr/hp
+ bullet_skin = "hollow"
+/obj/item/ammo_casing/c22lr/ap
+ name = ".22 LR AP bullet casing"
+ desc = "A .22 LR bullet casing."
+ projectile_type = /obj/projectile/bullet/c22lr/ap
+ bullet_skin = "ap"
+
+/obj/item/ammo_casing/c22lr/rubber
+ name = ".22 LR rubber bullet casing"
+ desc = "A .22 LR bullet casing."
+ projectile_type = /obj/projectile/bullet/c22lr/rubber
+ bullet_skin = "rubber"
diff --git a/code/modules/projectiles/ammunition/ballistic/revolver.dm b/code/modules/projectiles/ammunition/ballistic/revolver.dm
index 8705a932b392..60c3722b934a 100644
--- a/code/modules/projectiles/ammunition/ballistic/revolver.dm
+++ b/code/modules/projectiles/ammunition/ballistic/revolver.dm
@@ -6,7 +6,6 @@
caliber = ".357"
icon_state = "magnum-brass"
projectile_type = /obj/projectile/bullet/a357
- bullet_per_box = 50
/obj/item/ammo_casing/a357/match
name = ".357 match bullet casing"
@@ -29,7 +28,7 @@
caliber = ".45-70"
icon_state = "magnum-brass"
projectile_type = /obj/projectile/bullet/a4570
- bullet_per_box = 12
+ stack_size = 5
/obj/item/ammo_casing/a4570/match
name = ".45-70 match bullet casing"
@@ -55,14 +54,12 @@
desc = "A .38 Special bullet casing."
caliber = ".38"
projectile_type = /obj/projectile/bullet/c38
- bullet_per_box = 50
/obj/item/ammo_casing/c38/surplus
name = ".38 surplus bullet casing"
desc = "A .38 surplus bullet casing."
projectile_type = /obj/projectile/bullet/c38/surplus
-
/obj/item/ammo_casing/c38/trac
name = ".38 TRAC bullet casing"
desc = "A .38 \"TRAC\" bullet casing."
@@ -79,7 +76,7 @@
name = ".38 rubber bullet casing"
desc = "A .38 rubber bullet casing."
bullet_skin = "rubber"
- projectile_type = /obj/projectile/bullet/c38/match/bouncy
+ projectile_type = /obj/projectile/bullet/c38/bouncy
/obj/item/ammo_casing/c38/dumdum
name = ".38 dum-dum bullet casing"
diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm
index b9753df2f210..5da3febd795d 100644
--- a/code/modules/projectiles/ammunition/ballistic/rifle.dm
+++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm
@@ -6,15 +6,25 @@
icon_state = "rifle-brass"
caliber = "8x50mmR"
projectile_type = /obj/projectile/bullet/a8_50r
- bullet_per_box = 20
+ stack_size = 10
-/obj/item/ammo_casing/a8_50rhp
+/obj/item/ammo_casing/a8_50r/hp
name = "8x50mmR hollow point bullet casing"
desc = "A 8x50mmR hollow point bullet casing."
- icon_state = "rifle-brass-hollow"
- caliber = "8x50mmR"
- projectile_type = /obj/projectile/bullet/a8_50rhp
+ bullet_skin = "hollow"
+ projectile_type = /obj/projectile/bullet/a8_50r/hp
+
+/obj/item/ammo_casing/a8_50r/match
+ name = "8x50mmR match bullet casing"
+ desc = "A 8x50mmR hollow point bullet casing."
+ bullet_skin = "ap"
+ projectile_type = /obj/projectile/bullet/a8_50r/match
+/obj/item/ammo_casing/a8_50r/trac
+ name = "8x50mmR tracker casing"
+ desc = "A 8x50mmR tracker casing."
+ bullet_skin = "trac"
+ projectile_type = /obj/projectile/bullet/a8_50r/trac
// 8x58mm Caseless (SSG-669C)
@@ -24,17 +34,13 @@
icon_state = "caseless"
caliber = "a858"
projectile_type = /obj/projectile/bullet/a858
- bullet_per_box = 20
+ stack_size = 10
-// .300 Magnum (Smile Rifle)
+/obj/item/ammo_casing/caseless/a858/trac
+ name = "8x58mm tracker round"
+ desc = "A 8x58mm caseless tracker round."
+ projectile_type = /obj/projectile/bullet/a858/trac
-/obj/item/ammo_casing/a300
- name = ".300 Magnum bullet casing"
- desc = "A .300 Magnum bullet casing."
- icon_state = "rifle-steel"
- caliber = "a300"
- projectile_type = /obj/projectile/bullet/a300
- bullet_per_box = 20
// 5.56x42mm CLIP (CM82, Hydra variants)
@@ -44,25 +50,26 @@
icon_state = "rifle-brass"
caliber = "5.56x42mm"
projectile_type = /obj/projectile/bullet/a556_42
- bullet_per_box = 80
+ stack_size = 15
-// 5.45x39mm (SKM-24v)
+/obj/item/ammo_casing/a556_42/hp
+ name = "5.56x42mm CLIP HP bullet casing"
+ desc = "A 5.56x42mm CLIP hollow point bullet casing."
+ bullet_skin = "hollow"
+ projectile_type = /obj/projectile/bullet/a556_42/hp
-/obj/item/ammo_casing/a545_39
- name = "5.45x39mm bullet casing"
- desc = "A 5.45x39mm bullet casing."
- icon_state = "rifle-brass"
- caliber = "5.45x39mm"
- randomspread = TRUE
- projectile_type = /obj/projectile/bullet/a545_39
- bullet_per_box = 80
-
-/obj/item/ammo_casing/a545_39/recycled
- name = "recycled 5.45x39mm bullet casing"
- desc = "A recycled 5.45x39mm bullet casing."
- bullet_skin = "surplus"
- caliber = "5.45x39mm"
- projectile_type = /obj/projectile/bullet/a545_39
+/obj/item/ammo_casing/a556_42/ap
+ name = "5.56x42mm CLIP bullet casing"
+ desc = "A 5.56x42mm CLIP bullet casing."
+ bullet_skin = "ap"
+ projectile_type = /obj/projectile/bullet/a556_42/ap
+
+/obj/item/ammo_casing/a556_42/rubber
+ name = "5.56x42mm CLIP rubber bullet casing"
+ desc = "A 5.56x42mm CLIP rubber bullet casing."
+ bullet_skin = "rubber"
+ projectile_type = /obj/projectile/bullet/a556_42/rubber
+ stack_size = 15
// 7.62x40mm CLIP (SKM Rifles)
@@ -72,7 +79,25 @@
icon_state = "rifle-brass"
caliber = "7.62x40mm"
projectile_type = /obj/projectile/bullet/a762_40
- bullet_per_box = 80
+ stack_size = 15
+
+/obj/item/ammo_casing/a762_40/hp
+ name = "7.62x40mm CLIP HP bullet casing"
+ desc = "A 7.62x40mm CLIP HP bullet casing."
+ bullet_skin = "hollow"
+ projectile_type = /obj/projectile/bullet/a762_40/hp
+
+/obj/item/ammo_casing/a762_40/ap
+ name = "7.62x40mm CLIP AP bullet casing"
+ desc = "A 7.62x40mm CLIP AP bullet casing."
+ bullet_skin = "ap"
+ projectile_type = /obj/projectile/bullet/a762_40/ap
+
+/obj/item/ammo_casing/a762_40/rubber
+ name = "7.62x40mm CLIP rubber bullet casing"
+ desc = "A 7.62x40mm CLIP rubber bullet casing."
+ bullet_skin = "rubber"
+ projectile_type = /obj/projectile/bullet/a762_40/rubber
//.308 (M514 EBR & CM-GAL-S)
@@ -84,21 +109,28 @@
icon_state = "rifle-brass"
caliber = ".308"
projectile_type = /obj/projectile/bullet/a308
- bullet_per_box = 20
+ bullet_per_box = 10
*/
//[/СELADON-REMOVE]
+/obj/item/ammo_casing/a308/ap
+ name = ".308 AP bullet casing"
+ desc = "A .308 AP bullet casing."
+ bullet_skin = "ap"
+ projectile_type = /obj/projectile/bullet/a308/ap
+
+/obj/item/ammo_casing/a308/hp
+ name = ".308 HP bullet casing"
+ desc = "A .308 HP bullet casing."
+ bullet_skin = "hollow"
+ projectile_type = /obj/projectile/bullet/a308/hp
+
+//.299
+
/obj/item/ammo_casing/caseless/c299
name = ".299 Eoehoma caseless bullet casing"
desc = "A .299 Eoehoma caseless bullet casing."
icon_state = "caseless"
caliber = ".299 caseless"
projectile_type = /obj/projectile/bullet/c299
- bullet_per_box = 100
-
-/obj/item/ammo_casing/a65clip
- name = "6.5x57mm CLIP bullet casing"
- desc = "A 6.5x57mm CLIP bullet casing."
- icon_state = "big-brass"
- caliber = "6.5CLIP"
- projectile_type = /obj/projectile/bullet/a65clip
+ stack_size = 15
diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
index e9ef54ac86c4..3b7f67dda0f6 100644
--- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm
+++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
@@ -3,12 +3,11 @@
/obj/item/ammo_casing/shotgun
name = "shotgun slug"
desc = "A 12-gauge lead slug."
- icon = 'icons/obj/ammo_shotshells.dmi'
icon_state = "slug"
caliber = "12ga"
custom_materials = list(/datum/material/iron=4000)
projectile_type = /obj/projectile/bullet/slug
- bullet_per_box = 25
+ stack_size = 8 //Make sure this matches max_ammo variable on prefilled stacks (magazine/ammo_stack/prefilled)
bounce_sfx_override = 'sound/weapons/gun/general/bulletcasing_shotgun_bounce.ogg'
diff --git a/code/modules/projectiles/ammunition/ballistic/smg.dm b/code/modules/projectiles/ammunition/ballistic/smg.dm
index 39086b8cc66f..e949b475e58c 100644
--- a/code/modules/projectiles/ammunition/ballistic/smg.dm
+++ b/code/modules/projectiles/ammunition/ballistic/smg.dm
@@ -6,7 +6,24 @@
icon_state = "rifle-steel"
caliber = "5.7x39mm"
projectile_type = /obj/projectile/bullet/c57x39mm
- bullet_per_box = 50
+
+/obj/item/ammo_casing/c57x39mm/ap
+ name = "5.7x39mm armor piercing bullet casing"
+ desc = "A 5.7x39mm armour-piercing bullet casing."
+ bullet_skin = "ap"
+ projectile_type = /obj/projectile/bullet/c57x39mm/ap
+
+/obj/item/ammo_casing/c57x39mm/hp
+ name = "5.7x39mm hollow point bullet casing"
+ desc = "A 5.7x39mm armour-piercing bullet casing."
+ bullet_skin = "hollow"
+ projectile_type = /obj/projectile/bullet/c57x39mm/hp
+
+/obj/item/ammo_casing/c57x39mm/rubber
+ name = "5.7x39mm rubber bullet casing"
+ desc = "A 5.7x39mm rubber bullet casing."
+ bullet_skin = "rubber"
+ projectile_type = /obj/projectile/bullet/c57x39mm/rubber
// 4.6x30mm (WT-550 Automatic Rifle & SKM-24v)
@@ -16,7 +33,15 @@
icon_state = "rifle-brass"
caliber = "4.6x30mm"
projectile_type = /obj/projectile/bullet/c46x30mm
- bullet_per_box = 50
+ stack_size = 15
+
+/obj/item/ammo_casing/c46x30mm/recycled
+ name = "4.6x30mm recycled bullet casing"
+ desc = "A 4.6x30mm bullet casing."
+ bullet_skin = "surplus"
+ caliber = "4.6x30mm"
+ projectile_type = /obj/projectile/bullet/c46x30mm/recycled
+ stack_size = 15
/obj/item/ammo_casing/c46x30mm/ap
name = "4.6x30mm armor-piercing bullet casing"
@@ -24,12 +49,17 @@
bullet_skin = "ap"
projectile_type = /obj/projectile/bullet/c46x30mm/ap
-/obj/item/ammo_casing/c46x30mm/inc
- name = "4.6x30mm incendiary bullet casing"
- desc = "A 4.6x30mm incendiary bullet casing."
- bullet_skin = "incen"
- projectile_type = /obj/projectile/bullet/incendiary/c46x30mm
- bullet_per_box = 50
+/obj/item/ammo_casing/c46x30mm/hp
+ name = "4.6x30mm HP bullet casing"
+ desc = "A 4.6x30mm HP bullet casing."
+ bullet_skin = "hollow"
+ projectile_type = /obj/projectile/bullet/c46x30mm/hp
+
+/obj/item/ammo_casing/c46x30mm/rubber
+ name = "4.6x30mm rubber bullet casing"
+ desc = "A 4.6x30mm rubber bullet casing."
+ bullet_skin = "rubber"
+ projectile_type = /obj/projectile/bullet/c46x30mm/rubber
// 4.73x33mm caseless (Solar)
@@ -39,7 +69,6 @@
icon_state = "caseless"
caliber = "4.73x33mm caseless"
projectile_type = /obj/projectile/bullet/c47x33mm
- bullet_per_box = 50
// 5.56mm HITP caseless (Pistole C)
diff --git a/code/modules/projectiles/ammunition/ballistic/sniper.dm b/code/modules/projectiles/ammunition/ballistic/sniper.dm
index e4b668c2228f..d481f4d74d53 100644
--- a/code/modules/projectiles/ammunition/ballistic/sniper.dm
+++ b/code/modules/projectiles/ammunition/ballistic/sniper.dm
@@ -6,7 +6,6 @@
icon_state = "big-steel"
caliber = ".50 BMG"
projectile_type = /obj/projectile/bullet/p50
- bullet_per_box = 20
/obj/item/ammo_casing/p50/soporific
name = ".50 BMG soporific bullet casing"
@@ -20,3 +19,35 @@
desc = "A .50 BMG penetrator bullet casing."
bullet_skin = "ap"
projectile_type = /obj/projectile/bullet/p50/penetrator
+
+// .300 Magnum (Smile Rifle)
+
+/obj/item/ammo_casing/a300
+ name = ".300 Magnum bullet casing"
+ desc = "A .300 Magnum bullet casing."
+ icon_state = "rifle-steel"
+ caliber = "a300"
+ projectile_type = /obj/projectile/bullet/a300
+ stack_size = 15
+
+/obj/item/ammo_casing/a300/trac
+ name = ".300 Magnum Trac bullet casing"
+ desc = "A .300 Magnum Tracker casing."
+ projectile_type = /obj/projectile/bullet/a300/trac
+ bullet_skin = "trac"
+
+//6.5 CLIP
+
+/obj/item/ammo_casing/a65clip
+ name = "6.5x57mm CLIP bullet casing"
+ desc = "A 6.5x57mm CLIP bullet casing."
+ icon_state = "big-brass"
+ caliber = "6.5CLIP"
+ projectile_type = /obj/projectile/bullet/a65clip
+ stack_size = 5
+
+/obj/item/ammo_casing/a65clip/trac
+ name = "6.5x57mm CLIP tracker"
+ desc = "A 6.5x57mm CLIP tracker."
+ projectile_type = /obj/projectile/bullet/a65clip/trac
+ bullet_skin = "trac"
diff --git a/code/modules/projectiles/ammunition/caseless/foam.dm b/code/modules/projectiles/ammunition/caseless/foam.dm
index 0051680fd1e8..3c71d31eb5ed 100644
--- a/code/modules/projectiles/ammunition/caseless/foam.dm
+++ b/code/modules/projectiles/ammunition/caseless/foam.dm
@@ -9,7 +9,6 @@
custom_materials = list(/datum/material/iron = 11.25)
harmful = FALSE
var/modified = FALSE
- bullet_per_box = 40
/obj/item/ammo_casing/caseless/foam_dart/update_icon_state()
. = ..()
diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm
index 674d1e4514d8..a6e51733f29a 100644
--- a/code/modules/projectiles/ammunition/energy/laser.dm
+++ b/code/modules/projectiles/ammunition/energy/laser.dm
@@ -6,6 +6,9 @@
projectile_type = /obj/projectile/beam/laser/eoehoma
fire_sound = 'sound/weapons/gun/laser/e-fire.ogg'
+/obj/projectile/beam/laser/eoehoma/hermit // Used for the Hermits with E-11 because apparently you can only set it on projectile for simple mobs? That's fun!
+ spread = 80
+
/obj/item/ammo_casing/energy/laser/assault
projectile_type = /obj/projectile/beam/laser/assault
fire_sound = 'sound/weapons/gun/laser/e40_las.ogg'
@@ -28,7 +31,7 @@
fire_sound = 'sound/weapons/gun/laser/e-fire.ogg'
/obj/item/ammo_casing/energy/laser/smg
- projectile_type = /obj/projectile/beam/laser/weak/negative_ap
+ projectile_type = /obj/projectile/beam/laser/weak
e_cost = 799 //12 shots with a normal power cell, 25 with an upgraded
select_name = "kill"
delay = 0.13 SECONDS
@@ -53,10 +56,10 @@
select_name = "scatter"
/obj/item/ammo_casing/energy/laser/ultima
- projectile_type = /obj/projectile/beam/laser/weak/negative_ap/low_range
- pellets = 3
- variance = 35
- e_cost = 2000
+ projectile_type = /obj/projectile/beam/weak
+ pellets = 6
+ variance = 25
+ e_cost = 1000
select_name = "kill"
/obj/item/ammo_casing/energy/laser/ultima/alt
diff --git a/code/modules/projectiles/ammunition/energy/stun.dm b/code/modules/projectiles/ammunition/energy/stun.dm
index 1f74196eb83b..1d9eda158668 100644
--- a/code/modules/projectiles/ammunition/energy/stun.dm
+++ b/code/modules/projectiles/ammunition/energy/stun.dm
@@ -35,10 +35,10 @@
fire_sound = 'sound/weapons/taser.ogg'
/obj/item/ammo_casing/energy/disabler/scatter/ultima
- projectile_type = /obj/projectile/beam/disabler/weak/negative_ap/low_range
+ projectile_type = /obj/projectile/beam/disabler/weak/negative_ap
pellets = 4
- variance = 35
- e_cost = 2000
+ variance = 25
+ e_cost = 1000
/obj/item/ammo_casing/energy/disabler/scatter/ultima/alt
select_name = "blast"
diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
index a7944630f7e9..9606536d9f66 100644
--- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm
+++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
@@ -4,7 +4,7 @@
/obj/item/ammo_box
name = "ammo box (null_reference_exception)"
desc = "A box of ammo."
- icon = 'icons/obj/ammo.dmi'
+ icon = 'icons/obj/ammunition/ammo.dmi'
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BELT
item_state = "syringe_kit"
@@ -26,7 +26,7 @@
///String, used for checking if ammo of different types but still fits can fit inside it; generally used for magazines
var/caliber
///Allows multiple bullets to be loaded in from one click of another box/magazine
- var/multiload = TRUE
+ var/multiload = FALSE
///Whether or not an ammo box skips the do_after process (e.g. speedloaders)
var/instant_load = FALSE
///Whether the magazine should start with nothing in it
@@ -36,26 +36,52 @@
///cost of the materials in the magazine/box itself
var/list/base_cost
-/obj/item/ammo_box/Initialize()
+/obj/item/ammo_box/Initialize(mapload, spawn_empty)
. = ..()
+ if(spawn_empty)
+ start_empty = TRUE
if(!base_icon_state)
base_icon_state = icon_state
- if (!bullet_cost)
+
+ if(!bullet_cost)
for (var/material in custom_materials)
var/material_amount = custom_materials[material]
LAZYSET(base_cost, material, (material_amount * 0.10))
material_amount *= 0.90 // 10% for the container
material_amount /= max_ammo
- LAZYSET(bullet_cost, material, material_amount)
+ LAZYSET(bullet_cost, material, material_amount).
+
if(!start_empty)
- for(var/i = 1, i <= max_ammo, i++)
- stored_ammo += new ammo_type(src)
- update_ammo_count()
+ top_off(starting = TRUE)
+
+ update_appearance()
+
+/*
+ * top_off is used to refill the magazine to max, in case you want to increase the size of a magazine with VV then refill it at once
+ * Arguments:
+ * load_type - if you want to specify a specific ammo casing type to load, enter the path here, otherwise it'll use the basic [/obj/item/ammo_box/var/ammo_type]. Must be a compatible round
+ * starting - Relevant for revolver cylinders, if FALSE then we mind the nulls that represent the empty cylinders (since those nulls don't exist yet if we haven't initialized when this is TRUE)
+ */
+/obj/item/ammo_box/proc/top_off(load_type, starting=FALSE)
+ if(!load_type) //this check comes first so not defining an argument means we just go with default ammo
+ load_type = ammo_type
+
+ var/obj/item/ammo_casing/round_check = load_type
+ if(!starting && (caliber && initial(round_check.caliber) != caliber) || (!caliber && load_type != ammo_type))
+ stack_trace("Tried loading unsupported ammocasing type [load_type] into ammo box [type].")
+ return
+
+ for(var/i = max(1, stored_ammo.len), i <= max_ammo, i++)
+ stored_ammo += new round_check(src)
+
+/obj/item/ammo_box/Destroy()
+ stored_ammo.Cut()
+ return ..()
///gets a round from the magazine, if keep is TRUE the round will stay in the gun
/obj/item/ammo_box/proc/get_round(keep = FALSE)
- if (!stored_ammo.len)
+ if(!stored_ammo.len)
return null
else
var/b = stored_ammo[stored_ammo.len]
@@ -70,7 +96,7 @@
if(!R || (caliber && R.caliber != caliber) || (!caliber && R.type != ammo_type))
return FALSE
- if (stored_ammo.len < max_ammo)
+ if(stored_ammo.len < max_ammo)
stored_ammo += R
R.forceMove(src)
return TRUE
@@ -93,15 +119,14 @@
/obj/item/ammo_box/attackby(obj/item/attacking_obj, mob/user, params, silent = FALSE, replace_spent = FALSE)
var/num_loaded = 0
+
if(!can_load(user))
return
+
if(istype(attacking_obj, /obj/item/ammo_box))
var/obj/item/ammo_box/attacking_box = attacking_obj
for(var/obj/item/ammo_casing/casing_to_insert in attacking_box.stored_ammo)
- // [CELADON-EDIT] - CELADON_QOL
- // if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after(user, 1 SECONDS, attacking_box))) // CELADON-EDIT - ORIGINAL
- if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after(user, 0.6 SECONDS, attacking_box)))
- // [/CELADON-EDIT]
+ if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || istype(attacking_obj, /obj/item/ammo_box/magazine/ammo_stack) && do_after(user, 0.5 SECONDS, attacking_box, timed_action_flags = IGNORE_USER_LOC_CHANGE)))
break
var/did_load = give_round(casing_to_insert, replace_spent)
if(!did_load)
@@ -117,15 +142,14 @@
var/obj/item/ammo_casing/casing_to_insert = attacking_obj
if(give_round(casing_to_insert, replace_spent))
user.transferItemToLoc(casing_to_insert, src, TRUE)
- if(!silent)
- playsound(casing_to_insert, 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE)
num_loaded++
+ casing_to_insert.update_appearance()
update_ammo_count()
-
if(num_loaded)
if(!silent)
- to_chat(user, "You load [num_loaded] cartridge\s into \the [src]!")
+ to_chat(user, span_notice("You load [num_loaded] cartridge\s into \the [src]!"))
+ playsound(src, 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE)
return num_loaded
/obj/item/ammo_box/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
@@ -148,6 +172,7 @@
if(num_loaded)
to_chat(user, "You load [num_loaded] cartridge\s into \the [to_load]!")
return
+
/obj/item/ammo_box/attack_self(mob/user)
var/obj/item/ammo_casing/A = get_round()
if(!A)
@@ -158,7 +183,7 @@
if(!(user.is_holding(src) || H.l_store == src || H.r_store == 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]!")
+ to_chat(user, span_notice("You remove a round from [src]!"))
update_ammo_count()
/// Updates the materials and appearance of this ammo box
@@ -221,6 +246,7 @@
var/list/L = stored_ammo.Copy()
if(drop_list)
stored_ammo.Cut()
+ update_ammo_count()
return L
///drops the entire contents of the magazine on the floor
@@ -229,6 +255,7 @@
for(var/obj/item/ammo in stored_ammo)
ammo.forceMove(turf_mag)
stored_ammo -= ammo
+ update_ammo_count()
/obj/item/ammo_box/magazine/handle_atom_del(atom/A)
stored_ammo -= A
diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
deleted file mode 100644
index 853fcceca1c6..000000000000
--- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+++ /dev/null
@@ -1,573 +0,0 @@
-// .357 Speed Loaders (Syndicate Revolver)
-
-/obj/item/ammo_box/a357
- name = "speed loader (.357)"
- desc = "A 6-round speed loader for quickly reloading .357 revolvers. These rounds do good damage with average performance against armor."
- icon_state = "speedloader_357-6"
- base_icon_state = "speedloader_357"
- ammo_type = /obj/item/ammo_casing/a357
- caliber = ".357"
- max_ammo = 6
- multiple_sprites = AMMO_BOX_PER_BULLET
- item_flags = NO_MAT_REDEMPTION
- w_class = WEIGHT_CLASS_TINY
- instant_load = TRUE
-
-/obj/item/ammo_box/a357/empty
- start_empty = TRUE
-
-/obj/item/ammo_box/a357/match
- name = "speed loader (.357 match)"
- desc = "A 6-round speed loader for quickly reloading .357 revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets."
- ammo_type = /obj/item/ammo_casing/a357/match
-
-/obj/item/ammo_box/a357/hp
- name = "speed loader (.357 hollow point)"
- desc = "A 6-round speed loader for quickly reloading .357 revolvers. These hollow point rounds do incredible damage against soft targets, but are nearly ineffective against armored ones."
- ammo_type = /obj/item/ammo_casing/a357/hp
-
-/obj/item/ammo_box/a357_box
- name = "ammo box (.357)"
- desc = "A box of standard .357 ammo."
- icon_state = "357box"
- ammo_type = /obj/item/ammo_casing/a357
- max_ammo = 50
-
-/obj/item/ammo_box/a357_box/match
- name = "ammo box (.357)"
- desc = "A box of match .357 ammo."
- icon_state = "357box-match"
- ammo_type = /obj/item/ammo_casing/a357/match
- max_ammo = 50
-
-/obj/item/ammo_box/a357_box/hp
- name = "ammo box (.357)"
- desc = "A box of hollow point .357 ammo."
- icon_state = "357box-hp"
- ammo_type = /obj/item/ammo_casing/a357/hp
- max_ammo = 50
-
-
-// .45-70 Ammo Holders (Hunting Revolver)
-
-/obj/item/ammo_box/a4570
- name = "ammo box (.45-70)"
- desc = "A box of top grade .45-70 ammo. These rounds do significant damage with average performance against armor."
- icon_state = "4570"
- ammo_type = /obj/item/ammo_casing/a4570
- max_ammo = 18
-
-/obj/item/ammo_box/a4570/match
- name = "ammo box (.45-70 match)"
- desc = "A 18-round ammo box for .45-70 revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets."
- icon_state = "4570-match"
- ammo_type = /obj/item/ammo_casing/a4570/match
-
-
-/obj/item/ammo_box/a4570/hp
- name = "ammo box (.45-70 hollow point)"
- desc = "A 18-round ammo box for .45-70 revolvers. These hollow point rounds do legendary damage against soft targets, but are nearly ineffective against armored ones."
- icon_state = "4570-hp"
- ammo_type = /obj/item/ammo_casing/a4570/hp
-
-/obj/item/ammo_box/a4570/explosive
- name = "ammo box (.45-70 explosive)"
- desc = "A 18-round ammo box for .45-70 revolvers. These explosive rounds contain a small explosive charge that detonates on impact, creating large wounds and potentially removing limbs."
- icon_state = "4570-explosive"
- ammo_type = /obj/item/ammo_casing/a4570/explosive
-
-
-// .38 special Speed Loaders (Colt Detective Special)
-
-/obj/item/ammo_box/c38
- name = "speed loader (.38 special)"
- desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These rounds do okay damage, but struggle against armor."
- icon_state = "speedloader_38-6"
- base_icon_state = "speedloader_38"
- ammo_type = /obj/item/ammo_casing/c38
- caliber = ".38"
- max_ammo = 6
- multiple_sprites = AMMO_BOX_PER_BULLET
- custom_materials = list(/datum/material/iron = 15000)
- w_class = WEIGHT_CLASS_TINY
- instant_load = TRUE
-
-/obj/item/ammo_box/c38/trac
- name = "speed loader (.38 TRAC)"
- desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These TRAC rounds do pitiful damage, but embed a tracking device in targets hit."
- ammo_type = /obj/item/ammo_casing/c38/trac
-
-/obj/item/ammo_box/c38/match
- name = "speed loader (.38 match)"
- desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets."
- ammo_type = /obj/item/ammo_casing/c38/match
-
-/obj/item/ammo_box/c38/match/bouncy
- name = "speed loader (.38 rubber)"
- desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These rounds are incredibly bouncy and MOSTLY nonlethal, making them great to show off trickshots with."
- ammo_type = /obj/item/ammo_casing/c38/match/bouncy
-
-/obj/item/ammo_box/c38/dumdum
- name = "speed loader (.38 dum-dum)"
- desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These dum-dum bullets shatter on impact and embed in the target's innards. However, they're nearly ineffective against armor and do okay damage."
- ammo_type = /obj/item/ammo_casing/c38/dumdum
-
-/obj/item/ammo_box/c38/hotshot
- name = "speed loader (.38 hearth)"
- desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These hearthwine bullets contain an incendiary payload that set targets alight."
- ammo_type = /obj/item/ammo_casing/c38/hotshot
-
-/obj/item/ammo_box/c38/iceblox
- name = "speed loader (.38 chilled)"
- desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These icewine bullets contain a cryogenic payload that chills targets."
- ammo_type = /obj/item/ammo_casing/c38/iceblox
-
-/obj/item/ammo_box/c38/empty
- start_empty = TRUE
-
-// 8x58mm Stripper Clip (SSG-669C)
-
-/obj/item/ammo_box/a858
- name = "stripper clip (8x58mm)"
- desc = "A 5-round stripper clip for the SSG-669C rifle. These rounds do good damage with significant armor penetration."
- icon_state = "enbloc_858"
- ammo_type = /obj/item/ammo_casing/caseless/a858
- max_ammo = 5
- multiple_sprites = AMMO_BOX_PER_BULLET
- instant_load = TRUE
-
-/obj/item/ammo_box/a858/empty
- start_empty = TRUE
-
-// .308 Stripper Clip (Vickland)
-
-/obj/item/ammo_box/vickland_a308
- name = "stripper clip (.308)"
- desc = "A 5-round stripper clip for the Vickland Battle Rifle. The Vickland itself has a 10 round capacity, so keep in mind two of these are needed to fully reload it. These rounds do good damage with significant armor penetration."
- icon_state = "stripper_308-5"
- base_icon_state = "stripper_308"
- ammo_type = /obj/item/ammo_casing/a308
- max_ammo = 5
- multiple_sprites = AMMO_BOX_PER_BULLET
- w_class = WEIGHT_CLASS_TINY
- instant_load = TRUE
-
-/obj/item/ammo_box/vickland_a308/empty
- start_empty = TRUE
-
-// .300 Magnum Stripper Clip (Scout)
-
-/obj/item/ammo_box/a300
- name = "stripper clip (.300 Magnum)"
- desc = "A 5-round stripper clip for the Scout Rifle. These rounds do great damage with significant armor penetration."
- icon_state = "300m"
- ammo_type = /obj/item/ammo_casing/a300
- max_ammo = 5
- multiple_sprites = AMMO_BOX_PER_BULLET
- w_class = WEIGHT_CLASS_TINY
- instant_load = TRUE
-
-/obj/item/ammo_box/a300/empty
- start_empty = TRUE
-// 7.62 Stripper Clip (Polymer Survivor Rifle)
-
-/obj/item/ammo_box/a762_stripper
- name = "stripper clip (7.62)"
- desc = "A 5-round stripper clip for makeshift bolt-action rifles. These rounds do good damage with good armor penetration."
- icon_state = "stripper_308-5"
- base_icon_state = "stripper_308"
- ammo_type = /obj/item/ammo_casing/a762_40
- caliber = "7.62x40mm"
- max_ammo = 5
- multiple_sprites = AMMO_BOX_PER_BULLET
- w_class = WEIGHT_CLASS_TINY
- instant_load = TRUE
-
-/obj/item/ammo_box/a762_stripper/empty
- start_empty = TRUE
-// Ferromagnetic Pellet Speed Loader (Claris)
-
-/obj/item/ammo_box/amagpellet_claris
- name = "\improper Claris speed loader (ferromagnetic pellet)"
- desc = "A 22-round speed loader for quickly reloading the Claris rifle. Ferromagnetic pellets do okay damage with significant armor penetration."
- icon_state = "claris-sl-1"
- base_icon_state = "claris-sl"
- ammo_type = /obj/item/ammo_casing/caseless/gauss
- max_ammo = 22
- multiple_sprites = AMMO_BOX_FULL_EMPTY
- item_flags = NO_MAT_REDEMPTION
- instant_load = TRUE
-
-// Ammo Boxes
-
-/obj/item/ammo_box/c38_box
- name = "ammo box (.38)"
- desc = "A box of standard .38 Special ammo."
- icon_state = "38box"
- ammo_type = /obj/item/ammo_casing/c38
- max_ammo = 50
-
-/obj/item/ammo_box/c38_box/surplus
- name = "ammo box (.38 surplus)"
- desc = "A box of low-quality .38 Special ammo."
- icon_state = "38box-surplus"
- ammo_type = /obj/item/ammo_casing/c38/surplus
-
-/obj/item/ammo_box/c38_box/hotshot
- name = "ammo box (.38 hearth)"
- desc = "An unorthodox .38 Special cartridge infused with hearthwine. Catches the target on fire."
- icon_state = "38hotshot"
- ammo_type = /obj/item/ammo_casing/c38/hotshot
-
-/obj/item/ammo_box/c38_box/iceblox
- name = "ammo box (.38 chilled)"
- desc = "An unorthodox .38 Special cartridge infused with icewine. Chills the target, slowing them down."
- icon_state = "38iceblox"
- ammo_type = /obj/item/ammo_casing/c38/iceblox
-
-/obj/item/ammo_box/a12g
- name = "ammo box (12g buckshot)"
- desc = "A box of 12-gauge buckshot shells, devastating at close range."
- icon_state = "12gbox-buckshot"
- ammo_type = /obj/item/ammo_casing/shotgun/buckshot
- max_ammo = 25
-
-/obj/item/ammo_box/a12g/slug
- name = "ammo box (12g slug)"
- desc = "A box of 12-gauge slugs, for improved accuracy and penetration."
- icon_state = "12gbox-slug"
- ammo_type = /obj/item/ammo_casing/shotgun
-
-/obj/item/ammo_box/a12g/beanbag
- name = "ammo box (12g beanbag)"
- desc = "A box of 12-gauge beanbag shells, for incapacitating targets."
- icon_state = "12gbox-beanbag"
- ammo_type = /obj/item/ammo_casing/shotgun/beanbag
-
-/obj/item/ammo_box/a12g/rubbershot
- name = "ammo box (12g rubbershot)"
- desc = "A box of 12-gauge rubbershot shells, designed for riot control."
- icon_state = "12gbox-rubbershot"
- ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
-
-/obj/item/ammo_box/a12g/blanks
- name = "ammo box (12g blanks)"
- desc = "A box of 12-gauge blank shells, designed for training."
- icon_state ="12gbox-slug"
- ammo_type = /obj/item/ammo_casing/shotgun/blank
-
-/obj/item/ammo_box/c9mm
- name = "ammo box (9mm)"
- desc = "A box of standard 9mm ammo."
- icon_state = "9mmbox"
- ammo_type = /obj/item/ammo_casing/c9mm
- max_ammo = 50
-
-/obj/item/ammo_box/c9mm/surplus
- name = "ammo box (9mm surplus)"
- desc = "A box of low-quality 9mm ammo."
- icon_state = "9mmbox-surplus"
- ammo_type = /obj/item/ammo_casing/c9mm/surplus
-
-/obj/item/ammo_box/c9mm/rubbershot
- name = "ammo box (9mm rubbershot)"
- desc = "A box of 9mm rubbershot ammo, designed to disable targets without causing serious damage."
- icon_state = "9mmbox-rubbershot"
- ammo_type = /obj/item/ammo_casing/c9mm/rubber
-
-/obj/item/ammo_box/c9mm/ap
- name = "ammo box (9mm armor-piercing)"
- desc = "A box of 9mm armor-piercing ammo, designed to penetrate through armor at the cost of total damage."
- icon_state = "9mmbox-ap"
- ammo_type = /obj/item/ammo_casing/c9mm/ap
-
-/obj/item/ammo_box/c9mm/hp
- name = "ammo box (9mm hollow point)"
- desc = "A box of 9mm hollow point ammo, designed to cause massive tissue damage at the cost of armor penetration."
- icon_state = "9mmbox-hp"
- ammo_type = /obj/item/ammo_casing/c9mm/hp
-
-/obj/item/ammo_box/c9mm/fire
- name = "ammo box (9mm incendiary)"
- desc = "A box of 9mm incendiary ammo, designed to ignite targets at the cost of initial damage."
- icon_state = "9mmbox-incendiary"
- ammo_type = /obj/item/ammo_casing/c9mm/inc
-
-/obj/item/ammo_box/c10mm
- name = "ammo box (10mm)"
- desc = "A box of standard 10mm ammo."
- icon_state = "10mmbox"
- ammo_type = /obj/item/ammo_casing/c10mm
- max_ammo = 50
-
-/obj/item/ammo_box/c10mm/surplus
- name = "ammo box (10mm surplus)"
- desc = "A box of low-quality 10mm ammo."
- icon_state = "10mmbox-surplus"
- ammo_type = /obj/item/ammo_casing/c10mm/surplus
-
-/obj/item/ammo_box/c10mm/rubbershot
- name = "ammo box (10mm rubbershot)"
- desc = "A box of 10mm rubbershot ammo, designed to disable targets without causing serious damage."
- icon_state = "10mmbox-rubbershot"
- ammo_type = /obj/item/ammo_casing/c10mm/rubber
-
-/obj/item/ammo_box/c10mm/ap
- name = "ammo box (10mm armor-piercing)"
- desc = "A box of 10mm armor-piercing ammo, designed to penetrate through armor at the cost of total damage."
- icon_state = "10mmbox-ap"
- ammo_type = /obj/item/ammo_casing/c10mm/ap
-
-/obj/item/ammo_box/c10mm/hp
- name = "ammo box (10mm hollow point)"
- desc = "A box of 10mm hollow point ammo, designed to cause massive tissue damage at the cost of armor penetration."
- icon_state = "10mmbox-hp"
- ammo_type = /obj/item/ammo_casing/c10mm/hp
-
-/obj/item/ammo_box/c10mm/fire
- name = "ammo box (10mm incendiary)"
- desc = "A box of 10mm incendiary ammo, designed to ignite targets at the cost of initial damage."
- icon_state = "10mmbox-incendiary"
- ammo_type = /obj/item/ammo_casing/c10mm/inc
-
-/obj/item/ammo_box/c45
- name = "ammo box (.45)"
- desc = "A box of standard .45 ammo."
- icon_state = "45box"
- ammo_type = /obj/item/ammo_casing/c45
- max_ammo = 50
-
-/obj/item/ammo_box/c45/surplus
- name = "ammo box (.45 surplus)"
- desc = "A box of low-quality .45 ammo."
- icon_state = "45box-surplus"
- ammo_type = /obj/item/ammo_casing/c45/surplus
-
-/obj/item/ammo_box/c45/rubbershot
- name = "ammo box (.45 rubbershot)"
- desc = "A box of .45 rubbershot ammo, designed to disable targets without causing serious damage."
- icon_state = "45box-rubbershot"
- ammo_type = /obj/item/ammo_casing/c45/rubber
-
-/obj/item/ammo_box/c45/ap
- name = "ammo box (.45 armor-piercing)"
- desc = "A box of .45 armor-piercing ammo, designed to penetrate through armor at the cost of total damage."
- icon_state = "45box-ap"
- ammo_type = /obj/item/ammo_casing/c45/ap
-
-/obj/item/ammo_box/c45/hp
- name = "ammo box (.45 hollow point)"
- desc = "A box of .45 hollow point ammo, designed to cause massive tissue damage at the cost of armor penetration."
- icon_state = "45box-hp"
- ammo_type = /obj/item/ammo_casing/c45/hp
-
-/obj/item/ammo_box/c45/fire
- name = "ammo box (.45 incendiary)"
- desc = "A box of .45 incendiary ammo, designed to ignite targets at the cost of initial damage."
- icon_state = "45box-incendiary"
- ammo_type = /obj/item/ammo_casing/c45/inc
-
-/obj/item/ammo_box/c556mmHITP
- name = "ammo box (5.56mm HITP caseless)"
- desc = "A box of 5.56mm HITP caseless ammo, a SolGov standard."
- icon_state = "556mmHITPbox"
- ammo_type = /obj/item/ammo_casing/caseless/c556mm
- max_ammo = 50
-
-/obj/item/ammo_box/c556mmHITP/surplus
- name = "ammo box (5.56mm HITP caseless surplus)"
- desc = "A box of low-quality 5.56mm HITP caseless ammo."
- icon_state = "556mmHITPbox-surplus"
- ammo_type = /obj/item/ammo_casing/caseless/c556mm/surplus
-
-/obj/item/ammo_box/c556mmHITP/rubbershot
- name = "ammo box (5.56mm HITP caseless rubbershot)"
- desc = "A box of 5.56mm HITP caseless rubbershot ammo, designed to disable targets without causing serious damage."
- icon_state = "556mmHITPbox-rubbershot"
- ammo_type = /obj/item/ammo_casing/caseless/c556mm/rubbershot
-
-/obj/item/ammo_box/c556mmHITP/ap
- name = "ammo box (5.56mm HITP caseless armor-piercing)"
- desc = "A box of 5.56mm HITP caseless armor-piercing ammo, designed to penetrate through armor at the cost of total damage."
- icon_state = "556mmHITPbox-ap"
- ammo_type = /obj/item/ammo_casing/caseless/c556mm/ap
-
-/obj/item/ammo_box/c556mmHITP/hp
- name = "ammo box (5.56mm HITP caseless hollow point)"
- desc = "A box of 5.56mm HITP caseless hollow point ammo, designed to cause massive tissue damage at the cost of armor penetration."
- icon_state = "556mmHITPbox-hp"
- ammo_type = /obj/item/ammo_casing/caseless/c556mm/hp
-
-/obj/item/ammo_box/a40mm
- name = "ammo box (40mm grenades)"
- icon_state = "40mm"
- ammo_type = /obj/item/ammo_casing/a40mm
- max_ammo = 4
- multiple_sprites = AMMO_BOX_PER_BULLET
- w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/ammo_box/a762_40
- name = "ammo box (7.62x40mm CLIP)"
- icon_state = "a762_40box_big"
- ammo_type = /obj/item/ammo_casing/a762_40
- max_ammo = 120
- w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/ammo_box/a762_40/inteq
- icon_state = "a762_40box_big_inteq"
-
-/obj/item/ammo_box/a556_42
- name = "ammo box (5.56x42mm CLIP)"
- icon_state = "a556_42box_big"
- ammo_type = /obj/item/ammo_casing/a556_42
- max_ammo = 120
- w_class = WEIGHT_CLASS_NORMAL
-
-//[СELADON-REMOVE] - CELADON_WEAPONS - хватит это терпеть! Теперь эти патроны только в модпаке - mod_celadon\weapons\code\modules\projectiles\boxes_magazines\ammo_boxes.dm
-/*
-/obj/item/ammo_box/a308
- name = "ammo box (.308)"
- icon_state = "a308box"
- ammo_type = /obj/item/ammo_casing/a308
- max_ammo = 30
-*/
-//[/СELADON-REMOVE]
-
-//[СELADON-REMOVE] - CELADON_WEAPONS - хватит это терпеть! Теперь эти патроны только в модпаке - полностью удален из билда
-/*
-/obj/item/ammo_box/a308/hunterspride //just an alternative graphic for srm ships - зачем отдельные , у них что патроны из дерева или что ?
- icon_state = "a308box-HP"
-*/
-//[/СELADON-REMOVE]
-
-/obj/item/ammo_box/foambox
- name = "ammo box (Foam Darts)"
- icon = 'icons/obj/guns/toy.dmi'
- icon_state = "foambox"
- ammo_type = /obj/item/ammo_casing/caseless/foam_dart
- max_ammo = 40
- custom_materials = list(/datum/material/iron = 500)
-
-/obj/item/ammo_box/foambox/riot
- 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/a44roum_speedloader
- name = "speed loader (.44)"
- desc = "Designed to quickly reload revolvers."
- icon_state = "speedloader_38-6"
- base_icon_state = "speedloader_38"
- ammo_type = /obj/item/ammo_casing/a44roum
- caliber = ".44 Roumain"
- max_ammo = 6
- multiple_sprites = AMMO_BOX_PER_BULLET
- custom_materials = list(/datum/material/iron = 15000)
- w_class = WEIGHT_CLASS_TINY
- instant_load = TRUE
-
-/obj/item/ammo_box/a44roum_speedloader/empty
- start_empty = TRUE
-
-/obj/item/ammo_box/c57x39mm_box
- name = "ammo box (5.7x39mm)"
- desc = "A box of standard 5.7x39mm ammo."
- icon_state = "57x39mmbox"
- ammo_type = /obj/item/ammo_casing/c57x39mm
- max_ammo = 50
-
-
-/obj/item/ammo_box/c46x30mm_box
- name = "ammo box (4.6x30mm)"
- desc = "A box of standard 4.6x30mm ammo."
- icon_state = "46x30mmbox"
- ammo_type = /obj/item/ammo_casing/c46x30mm
- max_ammo = 50
-
-/obj/item/ammo_box/c8x50mm_box
- name = "ammo box (8x50mm)"
- desc = "A box of standard 8x50mm ammo."
- icon_state = "8x50mmbox"
- ammo_type = /obj/item/ammo_casing/a8_50r
- max_ammo = 25
-
-/obj/item/ammo_box/ferropelletbox
- name = "ammo box (ferromagnetic pellets)"
- desc = "A box of ferromagnetic pellets."
- icon_state = "ferropelletsbox"
- ammo_type = /obj/item/ammo_casing/caseless/gauss
- max_ammo = 50
-
-/obj/item/ammo_box/ferroslugbox
- name = "ammo box (ferromagnetic slugs)"
- desc = "A box of standard ferromagnetic slugs."
- icon_state = "ferroslugsbox"
- ammo_type = /obj/item/ammo_casing/caseless/gauss/slug
- max_ammo = 20
-
-/obj/item/ammo_box/ferrolancebox
- name = "ammo box (ferromagnetic lances)"
- desc = "A box of standard ferromagnetic lances."
- icon_state = "ferrolancesbox"
- ammo_type = /obj/item/ammo_casing/caseless/gauss/lance
- max_ammo = 50
-
-/obj/item/ammo_box/c8x50mmhp_box
- name = "ammo box (8x50mm)"
- desc = "A box of hollow point 8x50mm ammo, designed to cause massive damage at the cost of armor penetration."
- icon_state = "8x50mmbox-hp"
- ammo_type = /obj/item/ammo_casing/a8_50rhp
- max_ammo = 20
-
-/obj/item/ammo_box/a300_box
- name = "ammo box (.300 Magnum)"
- desc = "A box of standard .300 Magnum ammo."
- icon_state = "300box"
- ammo_type = /obj/item/ammo_casing/a300
- max_ammo = 20
-
-/obj/item/ammo_box/a65clip_box
- name = "ammo box (6.5x57mm CLIP)"
- desc = "A box of standard 6.5x57mm CLIP ammo."
- icon_state = "65box"
- ammo_type = /obj/item/ammo_casing/a65clip
- max_ammo = 20
-
-/obj/item/ammo_box/a65clip_box/syndicate
- icon_state = "65box_sa"
-
-/obj/item/ammo_box/a44roum
- name = "ammo box (.44 roumain)"
- desc = "A box of standard .44 roumain ammo."
- icon_state = "a44roum"
- ammo_type = /obj/item/ammo_casing/a44roum
- max_ammo = 50
-
-/obj/item/ammo_box/a44roum/rubber
- name = "ammo box (.44 roumain rubber)"
- desc = "A box of .44 roumain rubbershot ammo, designed to disable targets without causing serious damage."
- icon_state = "a44roum-rubber"
- ammo_type = /obj/item/ammo_casing/a44roum/rubber
- max_ammo = 50
-
-/obj/item/ammo_box/a44roum/hp
- name = "ammo box (.44 roumain hollow point)"
- desc = "A box of .44 roumain hollow point ammo, designed to cause massive damage at the cost of armor penetration."
- icon_state = "a44roum-hp"
- ammo_type = /obj/item/ammo_casing/a44roum/hp
- max_ammo = 50
-
-/obj/item/ammo_box/c299
- name = "ammo box (.299 Eoehoma caseless)"
- desc = "A box of .299 Eoehoma caseless, for use with the E-40 hybrid assault rifle."
- icon_state = "299box"
- ammo_type = /obj/item/ammo_casing/caseless/c299
- max_ammo = 120
- w_class = WEIGHT_CLASS_NORMAL // This is a lot of ammo
diff --git a/code/modules/projectiles/boxes_magazines/ammo_loaders.dm b/code/modules/projectiles/boxes_magazines/ammo_loaders.dm
new file mode 100644
index 000000000000..70d9480493c6
--- /dev/null
+++ b/code/modules/projectiles/boxes_magazines/ammo_loaders.dm
@@ -0,0 +1,176 @@
+// .357 Speed Loaders
+
+/obj/item/ammo_box/a357
+ name = "speed loader (.357)"
+ desc = "A 6-round speed loader for quickly reloading .357 revolvers. These rounds do good damage with average performance against armor."
+ icon_state = "speedloader_357-6"
+ base_icon_state = "speedloader_357"
+ ammo_type = /obj/item/ammo_casing/a357
+ caliber = ".357"
+ max_ammo = 6
+ multiple_sprites = AMMO_BOX_PER_BULLET
+ item_flags = NO_MAT_REDEMPTION
+ w_class = WEIGHT_CLASS_TINY
+ instant_load = TRUE
+
+/obj/item/ammo_box/a357/empty
+ start_empty = TRUE
+
+/obj/item/ammo_box/a357/match
+ name = "speed loader (.357 match)"
+ desc = "A 6-round speed loader for quickly reloading .357 revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets."
+ ammo_type = /obj/item/ammo_casing/a357/match
+
+/obj/item/ammo_box/a357/hp
+ name = "speed loader (.357 hollow point)"
+ desc = "A 6-round speed loader for quickly reloading .357 revolvers. These hollow point rounds do incredible damage against soft targets, but are nearly ineffective against armored ones."
+ ammo_type = /obj/item/ammo_casing/a357/hp
+
+// .38 special Speed Loaders
+
+/obj/item/ammo_box/c38
+ name = "speed loader (.38 special)"
+ desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These rounds do okay damage, but struggle against armor."
+ icon_state = "speedloader_38-6"
+ base_icon_state = "speedloader_38"
+ ammo_type = /obj/item/ammo_casing/c38
+ caliber = ".38"
+ max_ammo = 6
+ multiple_sprites = AMMO_BOX_PER_BULLET
+ custom_materials = list(/datum/material/iron = 15000)
+ w_class = WEIGHT_CLASS_TINY
+ instant_load = TRUE
+
+/obj/item/ammo_box/c38/trac
+ name = "speed loader (.38 TRAC)"
+ desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These TRAC rounds do pitiful damage, but embed a tracking device in targets hit."
+ ammo_type = /obj/item/ammo_casing/c38/trac
+
+/obj/item/ammo_box/c38/match
+ name = "speed loader (.38 match)"
+ desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets."
+ ammo_type = /obj/item/ammo_casing/c38/match
+
+/obj/item/ammo_box/c38/match/bouncy
+ name = "speed loader (.38 rubber)"
+ desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These rounds are incredibly bouncy and MOSTLY nonlethal, making them great to show off trickshots with."
+ ammo_type = /obj/item/ammo_casing/c38/match/bouncy
+
+/obj/item/ammo_box/c38/dumdum
+ name = "speed loader (.38 dum-dum)"
+ desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These dum-dum bullets shatter on impact and embed in the target's innards. However, they're nearly ineffective against armor and do okay damage."
+ ammo_type = /obj/item/ammo_casing/c38/dumdum
+
+/obj/item/ammo_box/c38/hotshot
+ name = "speed loader (.38 hot shot)"
+ desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These hot shot bullets contain an incendiary payload that set targets alight."
+ ammo_type = /obj/item/ammo_casing/c38/hotshot
+
+/obj/item/ammo_box/c38/iceblox
+ name = "speed loader (.38 iceblox)"
+ desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These iceblox bullets contain a cryogenic payload that chills targets."
+ ammo_type = /obj/item/ammo_casing/c38/iceblox
+
+/obj/item/ammo_box/c38/empty
+ start_empty = TRUE
+
+// 8x58mm Stripper Clip
+
+/obj/item/ammo_box/a858
+ name = "stripper clip (8x58mm)"
+ desc = "A 5-round stripper clip for the SSG-669C rifle. These rounds do good damage with significant armor penetration."
+ icon_state = "enbloc_858"
+ ammo_type = /obj/item/ammo_casing/caseless/a858
+ max_ammo = 5
+ multiple_sprites = AMMO_BOX_PER_BULLET
+ instant_load = TRUE
+
+/obj/item/ammo_box/a858/empty
+ start_empty = TRUE
+
+// .308 Stripper Clip
+
+/obj/item/ammo_box/vickland_a308
+ name = "stripper clip (.308)"
+ desc = "A 5-round stripper clip for the Vickland Battle Rifle. The Vickland itself has a 10 round capacity, so keep in mind two of these are needed to fully reload it. These rounds do good damage with significant armor penetration."
+ icon_state = "stripper_308-5"
+ base_icon_state = "stripper_308"
+ ammo_type = /obj/item/ammo_casing/a308
+ max_ammo = 5
+ multiple_sprites = AMMO_BOX_PER_BULLET
+ w_class = WEIGHT_CLASS_TINY
+ instant_load = TRUE
+
+/obj/item/ammo_box/vickland_a308/empty
+ start_empty = TRUE
+
+// .300 Magnum Stripper Clip
+
+/obj/item/ammo_box/a300
+ name = "stripper clip (.300 Magnum)"
+ desc = "A 5-round stripper clip for the Scout Rifle. These rounds do great damage with significant armor penetration."
+ icon_state = "300m"
+ ammo_type = /obj/item/ammo_casing/a300
+ max_ammo = 5
+ multiple_sprites = AMMO_BOX_PER_BULLET
+ w_class = WEIGHT_CLASS_TINY
+ instant_load = TRUE
+
+/obj/item/ammo_box/a300/empty
+ start_empty = TRUE
+
+// .300 Blackout Stripper Clip
+
+/obj/item/ammo_box/a762_stripper
+ name = "stripper clip (7.62)"
+ desc = "A 5-round stripper clip for makeshift bolt-action rifles. These rounds do good damage with good armor penetration."
+ icon_state = "stripper_308-5"
+ base_icon_state = "stripper_308"
+ ammo_type = /obj/item/ammo_casing/a762_40
+ caliber = "7.62x40mm"
+ max_ammo = 5
+ multiple_sprites = AMMO_BOX_PER_BULLET
+ w_class = WEIGHT_CLASS_TINY
+ instant_load = TRUE
+
+/obj/item/ammo_box/a762_stripper/empty
+ start_empty = TRUE
+
+// Ferromagnetic Pellet Speed Loader
+
+/obj/item/ammo_box/amagpellet_claris
+ name = "\improper Claris speed loader (ferromagnetic pellet)"
+ desc = "A 22-round speed loader for quickly reloading the Claris rifle. Ferromagnetic pellets do okay damage with significant armor penetration."
+ icon_state = "claris-sl-1"
+ base_icon_state = "claris-sl"
+ ammo_type = /obj/item/ammo_casing/caseless/gauss
+ max_ammo = 22
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
+ item_flags = NO_MAT_REDEMPTION
+ instant_load = TRUE
+
+/obj/item/ammo_box/a40mm
+ name = "ammo box (40mm grenades)"
+ icon_state = "40mm"
+ ammo_type = /obj/item/ammo_casing/a40mm
+ max_ammo = 4
+ multiple_sprites = AMMO_BOX_PER_BULLET
+ w_class = WEIGHT_CLASS_NORMAL
+
+// .44 Roumain speedloader
+
+/obj/item/ammo_box/a44roum_speedloader
+ name = "speed loader (.44)"
+ desc = "Designed to quickly reload revolvers."
+ icon_state = "speedloader_38-6"
+ base_icon_state = "speedloader_38"
+ ammo_type = /obj/item/ammo_casing/a44roum
+ caliber = ".44 Roumain"
+ max_ammo = 6
+ multiple_sprites = AMMO_BOX_PER_BULLET
+ custom_materials = list(/datum/material/iron = 15000)
+ w_class = WEIGHT_CLASS_TINY
+ instant_load = TRUE
+
+/obj/item/ammo_box/a44roum_speedloader/empty
+ start_empty = TRUE
diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/_ammo_stack.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/_ammo_stack.dm
new file mode 100644
index 000000000000..f1e84780cb1e
--- /dev/null
+++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/_ammo_stack.dm
@@ -0,0 +1,82 @@
+/**
+ * The ammo stack object itself, making this a magazine was the easiest way to handle it
+ * Practically every casing type needs an associated ammo stack type, because that was the easiest
+ * way for me to handle it.
+ */
+/obj/item/ammo_box/magazine/ammo_stack
+ name = "ammo stack"
+ desc = "A pile of live rounds."
+ icon = 'icons/obj/ammunition/ammo_bullets.dmi'
+ icon_state = "pistol-brass"
+ base_icon_state = "pistol-brass"
+ item_flags = NO_PIXEL_RANDOM_DROP
+ multiple_sprites = AMMO_BOX_ONE_SPRITE
+ multiload = FALSE
+ start_empty = TRUE
+ max_ammo = 12
+
+/obj/item/ammo_box/magazine/ammo_stack/update_icon(updates)
+ icon = initial(icon)
+ cut_overlays()
+ return ..()
+
+/obj/item/ammo_box/magazine/ammo_stack/update_icon_state()
+ . = ..()
+ cut_overlays()
+ icon_state = ""
+ for(var/casing in stored_ammo)
+ var/image/bullet = image(initial(icon), src, "[base_icon_state]")
+ bullet.pixel_x = rand(-8, 8)
+ bullet.pixel_y = rand(-8, 8)
+ bullet.transform = bullet.transform.Turn(round(45 * rand(0, 32) / 2)) //this is the equation Eris uses on their bullet stacks
+ add_overlay(bullet)
+ return UPDATE_ICON_STATE | UPDATE_OVERLAYS
+
+/obj/item/ammo_box/magazine/ammo_stack/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+ . = ..()
+ var/loc_before_del = loc
+ while(LAZYLEN(stored_ammo))
+ var/obj/item/ammo = get_round(FALSE)
+ ammo.forceMove(loc_before_del)
+ ammo.throw_at(loc_before_del)
+ update_ammo_count()
+
+/obj/item/ammo_box/magazine/ammo_stack/update_ammo_count()
+ . = ..()
+ check_for_del()
+
+/obj/item/ammo_box/magazine/ammo_stack/proc/check_for_del()
+ . = FALSE
+ if((ammo_count() <= 0) && !QDELETED(src))
+ qdel(src)
+ return
+
+/obj/item/ammo_box/magazine/ammo_stack/attackby(obj/item/handful, mob/user, params, silent = FALSE, replace_spent = 0)
+ var/num_loaded = 0
+ if(!can_load(user))
+ return
+
+ if(istype(handful, /obj/item/ammo_box))
+ var/obj/item/ammo_box/ammo_box = handful
+ for(var/obj/item/ammo_casing/casing in ammo_box.stored_ammo)
+ var/did_load = give_round(casing, replace_spent)
+ if(did_load)
+ ammo_box.stored_ammo -= casing
+ num_loaded++
+ if(!did_load || !multiload)
+ break
+ if(num_loaded)
+ ammo_box.update_ammo_count()
+
+ if(istype(handful, /obj/item/ammo_casing))
+ var/obj/item/ammo_casing/casing = handful
+ if(give_round(casing, replace_spent))
+ user.transferItemToLoc(casing, src, TRUE)
+ num_loaded++
+ casing.update_appearance()
+
+ if(num_loaded)
+ if(!silent)
+ to_chat(user, span_notice("You load [num_loaded] shell\s into \the [src]!"))
+ playsound(src, 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE)
+ update_ammo_count()
diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/_premade_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/_premade_stacks.dm
new file mode 100644
index 000000000000..453a6bacb4d0
--- /dev/null
+++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/_premade_stacks.dm
@@ -0,0 +1,22 @@
+/obj/item/ammo_box/magazine/ammo_stack/prefilled
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/Initialize(mapload)
+ make_stack()
+ update_appearance()
+ . = ..()
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/proc/make_stack()
+ var/obj/item/ammo_casing/to_copy = ammo_type
+ src.top_off()
+ caliber = to_copy.caliber
+ base_icon_state = "[initial(to_copy.icon_state)][to_copy.bullet_skin ? "-[to_copy.bullet_skin]" : ""]"
+ name = "handful of [to_copy.name]s"
+
+/obj/item/storage/box/ammo //base type, don't use this!
+ name = "box of default ammo"
+ desc = "A box of ammunition. Not for consumption."
+ icon = 'icons/obj/ammunition/ammo_boxes.dmi'
+ icon_state = "9mmbox"
+ custom_materials = list(/datum/material/iron = 200)
+ illustration = null
+ foldable = null
diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_gauss_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_gauss_stacks.dm
new file mode 100644
index 000000000000..a64e075dfa84
--- /dev/null
+++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_gauss_stacks.dm
@@ -0,0 +1,38 @@
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/ferropellet
+ ammo_type = /obj/item/ammo_casing/caseless/gauss
+
+/obj/item/storage/box/ammo/ferropellet
+ name = "box of ferromagnetic pellets"
+ desc = "A box of ferromagnetic pellets for gauss firearms."
+ icon_state = "ferropelletsbox"
+
+/obj/item/storage/box/ammo/ferropellet/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/ferropellet = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/ferroslug
+ ammo_type = /obj/item/ammo_casing/caseless/gauss/slug
+
+/obj/item/storage/box/ammo/ferroslug
+ name = "box of ferromagnetic slugs"
+ desc = "A box of standard ferromagnetic slugs for gauss firearms."
+ icon_state = "ferroslugsbox"
+
+/obj/item/storage/box/ammo/ferroslug/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/ferroslug = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/ferrolance
+ ammo_type = /obj/item/ammo_casing/caseless/gauss/lance
+
+/obj/item/storage/box/ammo/ferrolance
+ name = "box of ferromagnetic lances"
+ desc = "A box of standard ferromagnetic lances for gauss firearms."
+ icon_state = "ferrolancesbox"
+
+/obj/item/storage/box/ammo/ferrolance/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/ferrolance = 4)
+ generate_items_inside(items_inside,src)
diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_lmg_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_lmg_stacks.dm
new file mode 100644
index 000000000000..4b50912e5e11
--- /dev/null
+++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_lmg_stacks.dm
@@ -0,0 +1,12 @@
+// 7.12x82mm (L6 SAW)
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/mm712x82
+ ammo_type = /obj/item/ammo_casing/mm712x82
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/mm712x82/ap
+ ammo_type = /obj/item/ammo_casing/mm712x82/ap
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/mm712x82/hp
+ ammo_type = /obj/item/ammo_casing/mm712x82/hp
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/mm712x82/match
+ ammo_type = /obj/item/ammo_casing/mm712x82/match
diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_misc_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_misc_stacks.dm
new file mode 100644
index 000000000000..871c25d84afd
--- /dev/null
+++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_misc_stacks.dm
@@ -0,0 +1,24 @@
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/foam_darts
+ ammo_type = /obj/item/ammo_casing/caseless/foam_dart
+
+/obj/item/storage/box/ammo/foam_darts
+ name = "box of foam darts"
+ icon = 'icons/obj/guns/toy.dmi'
+ icon_state = "foambox"
+
+/obj/item/storage/box/ammo/foam_darts/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/foam_darts = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/foam_darts/riot
+ ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+
+/obj/item/storage/box/ammo/foam_darts/riot
+ name = "box of foam darts"
+ icon_state = "foambox_riot"
+
+/obj/item/storage/box/ammo/foam_darts/riot/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/foam_darts/riot = 4)
+ generate_items_inside(items_inside,src)
diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm
new file mode 100644
index 000000000000..5a783652a7e3
--- /dev/null
+++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm
@@ -0,0 +1,483 @@
+// 10mm (Stechkin)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c10mm
+ ammo_type = /obj/item/ammo_casing/c10mm
+
+/obj/item/storage/box/ammo/c10mm
+ name = "box of 10mm ammo"
+ desc = "A box of standard 10mm ammo."
+ icon_state = "10mmbox"
+
+/obj/item/storage/box/ammo/c10mm/PopulateContents()
+ ..()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c10mm = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c10mm/surplus
+ ammo_type = /obj/item/ammo_casing/c10mm/surplus
+
+/obj/item/storage/box/ammo/c10mm_surplus
+ name = "box of surplus 10mm ammo"
+ desc = "A box of low-quality 10mm ammo."
+ icon_state = "10mmbox-surplus"
+
+/obj/item/storage/box/ammo/c10mm_surplus/PopulateContents()
+ ..()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c10mm = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c10mm/ap
+ ammo_type = /obj/item/ammo_casing/c10mm/ap
+
+/obj/item/storage/box/ammo/c10mm_ap
+ name = "box of AP 10mm ammo"
+ desc = "A box of 10mm armor-piercing ammo, designed to penetrate through armor at the cost of total damage."
+ icon_state = "10mmbox-ap"
+
+/obj/item/storage/box/ammo/c10mm_ap/PopulateContents()
+ ..()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c10mm/ap = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c10mm/hp
+ ammo_type = /obj/item/ammo_casing/c10mm/hp
+
+/obj/item/storage/box/ammo/c10mm_hp
+ name = "box of HP 10mm ammo"
+ desc = "A box of 10mm hollow point ammo, designed to cause massive tissue damage at the cost of armor penetration."
+ icon_state = "10mmbox-hp"
+
+/obj/item/storage/box/ammo/c10mm_hp/PopulateContents()
+ ..()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c10mm/hp = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c10mm/rubber
+ ammo_type = /obj/item/ammo_casing/c10mm/rubber
+
+/obj/item/storage/box/ammo/c10mm_rubber
+ name = "box of rubber 10mm ammo"
+ desc = "A box of 10mm rubbershot ammo, designed to disable targets without causing serious damage."
+ icon_state = "10mmbox-rubbershot"
+
+/obj/item/storage/box/ammo/c10mm_rubber/PopulateContents()
+ ..()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c10mm/rubber = 4)
+ generate_items_inside(items_inside,src)
+
+// 9MM (Commander + SABR)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm
+ ammo_type = /obj/item/ammo_casing/c9mm
+ max_ammo = 15
+
+/obj/item/storage/box/ammo/c9mm
+ name = "box of 9mm ammo"
+ desc = "A box of standard 9mm ammo."
+ icon_state = "9mmbox"
+
+/obj/item/storage/box/ammo/c9mm/PopulateContents()
+ ..()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/surplus
+ ammo_type = /obj/item/ammo_casing/c9mm/surplus
+
+/obj/item/storage/box/ammo/c9mm_surplus
+ name = "box of surplus 9mm ammo"
+ desc = "A box of low-quality 9mm ammo."
+ icon_state = "9mmbox-surplus"
+
+/obj/item/storage/box/ammo/c9mm_surplus/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/surplus = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/ap
+ ammo_type = /obj/item/ammo_casing/c9mm/ap
+
+/obj/item/storage/box/ammo/c9mm_ap
+ name = "box of AP 9mm ammo"
+ desc = "A box of 9mm armor-piercing ammo, designed to penetrate through armor at the cost of total damage."
+ icon_state = "9mmbox-ap"
+
+/obj/item/storage/box/ammo/c9mm_ap/PopulateContents()
+ ..()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/ap = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/hp
+ ammo_type = /obj/item/ammo_casing/c9mm/hp
+
+/obj/item/storage/box/ammo/c9mm_hp
+ name = "box of HP 9mm ammo"
+ desc = "A box of 9mm hollow point ammo, designed to cause massive tissue damage at the cost of armor penetration."
+ icon_state = "9mmbox-hp"
+
+/obj/item/storage/box/ammo/c9mm_hp/PopulateContents()
+ ..()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/hp = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/rubber
+ ammo_type = /obj/item/ammo_casing/c9mm/rubber
+
+/obj/item/storage/box/ammo/c9mm_rubber
+ name = "box of rubber 9mm ammo"
+ desc = "A box of 9mm rubbershot ammo, designed to disable targets without causing serious damage."
+ icon_state = "9mmbox-rubbershot"
+
+/obj/item/storage/box/ammo/c9mm_rubber/PopulateContents()
+ ..()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/rubber = 4)
+ generate_items_inside(items_inside,src)
+
+// .45 (Candor + C20R)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c45
+ ammo_type = /obj/item/ammo_casing/c45
+
+/obj/item/storage/box/ammo/c45
+ name = "box of .45 ammo"
+ desc = "A box of standard .45 ammo."
+ icon_state = "45box"
+
+/obj/item/storage/box/ammo/c45/PopulateContents()
+ ..()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c45 = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c45/surplus
+ ammo_type = /obj/item/ammo_casing/c45/surplus
+
+/obj/item/storage/box/ammo/c45_surplus
+ name = "box of surplus .45 ammo"
+ desc = "A box of low-quality .45 ammo."
+ icon_state = "45box-surplus"
+
+/obj/item/storage/box/ammo/c45_surplus/PopulateContents()
+ ..()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c45/surplus = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c45/ap
+ ammo_type = /obj/item/ammo_casing/c45/ap
+
+/obj/item/storage/box/ammo/c45_ap
+ name = "box of AP .45 ammo"
+ desc = "A box of .45 armor-piercing ammo, designed to penetrate through armor at the cost of total damage."
+ icon_state = "45box-ap"
+
+/obj/item/storage/box/ammo/c45_ap/PopulateContents()
+ ..()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c45/ap = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c45/hp
+ ammo_type = /obj/item/ammo_casing/c45/hp
+
+/obj/item/storage/box/ammo/c45_hp
+ name = "box of HP .45 ammo"
+ desc = "A box of .45 hollow point ammo, designed to cause massive tissue damage at the cost of armor penetration."
+ icon_state = "45box-hp"
+
+/obj/item/storage/box/ammo/c45_hp/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c45/hp = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c45/rubber
+ ammo_type = /obj/item/ammo_casing/c45/rubber
+
+/obj/item/storage/box/ammo/c45_rubber
+ name = "box of rubbershot .45 ammo"
+ desc = "A box of .45 rubbershot ammo, designed to disable targets without causing serious damage."
+ icon_state = "45box-rubbershot"
+
+/obj/item/storage/box/ammo/c45_rubber/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c45/rubber = 4)
+ generate_items_inside(items_inside,src)
+
+// .50 AE (Desert Eagle)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a50AE
+ ammo_type = /obj/item/ammo_casing/a50AE
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a50AE/hp
+ ammo_type = /obj/item/ammo_casing/a50AE/hp
+
+// .22 LR (Himehabu, Pounder)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr
+ ammo_type = /obj/item/ammo_casing/c22lr
+ max_ammo = 25
+
+/obj/item/storage/box/ammo/c22lr
+ name = "box of .22 LR ammo"
+ desc = "A box of standard .22 LR ammo."
+ icon_state = "22lrbox"
+
+/obj/item/storage/box/ammo/c22lr/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr/ap
+ ammo_type = /obj/item/ammo_casing/c22lr/ap
+ max_ammo = 25
+
+/obj/item/storage/box/ammo/c22lr/ap
+ name = "box of .22 LR AP ammo"
+ desc = "A box of standard .22 LR AP ammo, designed to penetrate through armor at the cost of total damage."
+ icon_state = "22lrbox"
+
+/obj/item/storage/box/ammo/c22lr/ap/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr/ap = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr/hp
+ ammo_type = /obj/item/ammo_casing/c22lr/hp
+ max_ammo = 25
+
+/obj/item/storage/box/ammo/c22lr/hp
+ name = "box of .22 LR HP ammo"
+ desc = "A box of standard .22 LR HP ammo, designed to cause massive tissue damage at the cost of armor penetration."
+ icon_state = "22lrbox"
+
+/obj/item/storage/box/ammo/c22lr/hp/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr/hp = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr/rubber
+ ammo_type = /obj/item/ammo_casing/c22lr/rubber
+ max_ammo = 25
+
+/obj/item/storage/box/ammo/c22lr/rubber
+ name = "box of .22 LR rubber ammo"
+ desc = "A box of standard .22 LR rubber ammo."
+ icon_state = "22lrbox"
+
+/obj/item/storage/box/ammo/c22lr/rubber/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr/rubber = 4)
+ generate_items_inside(items_inside,src)
+
+// .357
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a357
+ ammo_type = /obj/item/ammo_casing/a357
+
+/obj/item/storage/box/ammo/a357
+ name = "box of .357 ammo"
+ desc = "A box of standard .357 ammo."
+ icon_state = "357box"
+
+/obj/item/storage/box/ammo/a357/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a357 = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a357/match
+ ammo_type = /obj/item/ammo_casing/a357/match
+
+/obj/item/storage/box/ammo/a357_match
+ name = "box of match .357 ammo"
+ desc = "A box of match .357 ammo."
+ icon_state = "357box-match"
+
+/obj/item/storage/box/ammo/a357_match/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a357/match = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a357/hp
+ ammo_type = /obj/item/ammo_casing/a357/hp
+
+/obj/item/storage/box/ammo/a357_hp
+ name = "box of HP .357 ammo"
+ desc = "A box of hollow point .357 ammo."
+ icon_state = "357box-hp"
+
+/obj/item/storage/box/ammo/a357_hp/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a357/hp = 4)
+ generate_items_inside(items_inside,src)
+
+// .45-70 (Hunting Revolver, Beacon)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a4570
+ ammo_type = /obj/item/ammo_casing/a4570
+ max_ammo = 5
+
+/obj/item/storage/box/ammo/a4570
+ name = "box of .45-70 ammo"
+ desc = "A box of top grade .45-70 ammo. These rounds do significant damage with average performance against armor."
+ icon_state = "4570"
+
+/obj/item/storage/box/ammo/a4570/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a4570 = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a4570/match
+ ammo_type = /obj/item/ammo_casing/a4570/match
+
+/obj/item/storage/box/ammo/a4570_match
+ name = "box of HP match .45-70 ammo"
+ desc = "A 12-round ammo box for .45-70 revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets."
+ icon_state = "4570-match"
+
+/obj/item/storage/box/ammo/a4570_match/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a4570/match = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a4570/hp
+ ammo_type = /obj/item/ammo_casing/a4570/hp
+
+/obj/item/storage/box/ammo/a4570_hp
+ name = "box of HP .45-70 ammo"
+ desc = "A 12-round ammo box for .45-70 revolvers. These hollow point rounds do legendary damage against soft targets, but are nearly ineffective against armored ones."
+ icon_state = "4570-hp"
+
+/obj/item/storage/box/ammo/a4570_hp/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a4570/hp = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a4570/explosive
+ ammo_type = /obj/item/ammo_casing/a4570/explosive
+
+/obj/item/storage/box/ammo/a4570_explosive
+ name = "box of explosive .45-70 ammo"
+ desc = "A 12-round ammo box for .45-70 revolvers. These explosive rounds contain a small explosive charge that detonates on impact, creating large wounds and potentially removing limbs."
+ icon_state = "4570-explosive"
+
+/obj/item/storage/box/ammo/a4570_explosive/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a4570/explosive = 4)
+ generate_items_inside(items_inside,src)
+
+// .38 Special
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c38
+ ammo_type = /obj/item/ammo_casing/c38
+ max_ammo = 15
+
+/obj/item/storage/box/ammo/c38
+ name = "box of .38 ammo"
+ desc = "A box of standard .38 Special ammo."
+ icon_state = "38box"
+
+/obj/item/storage/box/ammo/c38/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c38 = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c38/surplus
+ ammo_type = /obj/item/ammo_casing/c38/surplus
+
+/obj/item/storage/box/ammo/c38_surplus
+ name = "box of surplus .38 ammo"
+ desc = "A box of low-quality .38 Special ammo."
+ icon_state = "38box-surplus"
+
+/obj/item/storage/box/ammo/c38_surplus/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c38/surplus = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c38/trac
+ ammo_type = /obj/item/ammo_casing/c38/trac
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c38/match
+ ammo_type = /obj/item/ammo_casing/c38/match
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c38/bouncy
+ ammo_type = /obj/item/ammo_casing/c38/match/bouncy
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c38/dumdum
+ ammo_type = /obj/item/ammo_casing/c38/dumdum
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c38/hotshot
+ ammo_type = /obj/item/ammo_casing/c38/hotshot
+
+/obj/item/storage/box/ammo/c38_hotshot
+ name = "box of .38 hearth ammo"
+ desc = "An unorthodox .38 Special cartridge infused with hearthflame. Catches the target on fire."
+ icon_state = "38hotshot"
+
+/obj/item/storage/box/ammo/c38_hotshot/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c38/hotshot = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c38/iceblox
+ ammo_type = /obj/item/ammo_casing/c38/iceblox
+
+/obj/item/storage/box/ammo/c38_iceblox
+ name = "box of .38 chilled ammo"
+ desc = "An unorthodox .38 Special cartridge infused with wine of ice. Chills the target, slowing them down."
+ icon_state = "38iceblox"
+
+/obj/item/storage/box/ammo/c38_iceblox/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c38/iceblox = 4)
+ generate_items_inside(items_inside,src)
+
+// 44 Roumain
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a44roum
+ ammo_type = /obj/item/ammo_casing/a44roum
+
+/obj/item/storage/box/ammo/a44roum
+ name = "box of .44 roumain ammo"
+ desc = "A box of standard .44 roumain ammo."
+ icon_state = "a44roum"
+
+/obj/item/storage/box/ammo/a44roum/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a44roum = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a44roum/rubber
+ ammo_type = /obj/item/ammo_casing/a44roum/rubber
+
+/obj/item/storage/box/ammo/a44roum_rubber
+ name = "box of rubber .44 roumain ammo"
+ desc = "A box of .44 roumain rubbershot ammo, designed to disable targets without causing serious damage."
+ icon_state = "a44roum-rubber"
+
+/obj/item/storage/box/ammo/a44roum_rubber/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a44roum/rubber = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a44roum/hp
+ ammo_type = /obj/item/ammo_casing/a44roum/hp
+
+/obj/item/storage/box/ammo/a44roum_hp
+ name = "box of HP .44 roumain ammo"
+ desc = "A box of .44 roumain hollowpoint ammo, designed to disable targets without causing serious damage."
+ icon_state = "a44roum-hp"
+
+/obj/item/storage/box/ammo/a44roum_hp/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a44roum/hp = 4)
+ generate_items_inside(items_inside,src)
diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_rifle_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_rifle_stacks.dm
new file mode 100644
index 000000000000..921bbd5c06a1
--- /dev/null
+++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_rifle_stacks.dm
@@ -0,0 +1,224 @@
+// 8x50mmR (Illestren Hunting Rifle)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r
+ ammo_type = /obj/item/ammo_casing/a8_50r
+ max_ammo = 10
+
+/obj/item/storage/box/ammo/a8_50r
+ name = "box of 8x50mm ammo"
+ desc = "A box of standard 8x50mm ammo."
+ icon_state = "8x50mmbox"
+
+/obj/item/storage/box/ammo/a8_50r/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r/hp
+ ammo_type = /obj/item/ammo_casing/a8_50r/hp
+
+/obj/item/storage/box/ammo/a8_50r/hp
+ name = "box of HP 8x50mm ammo"
+ desc = "A box of hollow point 8x50mm ammo, designed to cause massive damage at the cost of armor penetration."
+ icon_state = "8x50mmbox-hp"
+
+/obj/item/storage/box/ammo/a8_50r_hp/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r/hp = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r/match
+ ammo_type = /obj/item/ammo_casing/a8_50r/match
+ max_ammo = 10
+
+/obj/item/storage/box/ammo/a8_50r/match
+ name = "box of 8x50mm match ammo"
+ desc = "A box of standard 8x50mm ammo."
+ icon_state = "8x50mmbox"
+
+/obj/item/storage/box/ammo/a8_50r/match/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r/match = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r/trac
+ ammo_type = /obj/item/ammo_casing/a8_50r/trac
+ max_ammo = 10
+
+/obj/item/storage/box/ammo/a8_50r/trac
+ name = "box of 8x50mm trac ammo"
+ desc = "A box of 8x50mm trackers."
+ icon_state = "8x50mmbox"
+
+/obj/item/storage/box/ammo/a8_50r/trac/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a8_50r/trac = 3)
+ generate_items_inside(items_inside,src)
+
+// 5.56x42mm CLIP (CM82, Hydra variants)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_42
+ ammo_type = /obj/item/ammo_casing/a556_42
+ max_ammo = 15
+
+/obj/item/storage/box/ammo/a556_42
+ name = "box of 5.56x42mm CLIP ammo"
+ desc = "A box of standard 5.56x42mm CLIP ammo."
+ icon_state = "a556_42box_big"
+
+/obj/item/storage/box/ammo/a556_42/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_42 = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_42/hp
+ ammo_type = /obj/item/ammo_casing/a556_42/hp
+ max_ammo = 15
+
+/obj/item/storage/box/ammo/a556_42/hp
+ name = "box of 5.56x42mm CLIP HP ammo"
+ desc = "A box of standard 5.56x42mm CLIP HP ammo."
+ icon_state = "a556_42box_big"
+
+/obj/item/storage/box/ammo/a556_42/hp/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_42/hp = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_42/ap
+ ammo_type = /obj/item/ammo_casing/a556_42/ap
+ max_ammo = 15
+
+/obj/item/storage/box/ammo/a556_42/ap
+ name = "box of 5.56x42mm CLIP AP ammo"
+ desc = "A box of standard 5.56x42mm CLIP AP ammo."
+ icon_state = "a556_42box_big"
+
+/obj/item/storage/box/ammo/a556_42/ap/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a556_42/ap = 4)
+ generate_items_inside(items_inside,src)
+
+// 7.62x40mm CLIP (SKM Rifles)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40
+ ammo_type = /obj/item/ammo_casing/a762_40
+ max_ammo = 15
+
+/obj/item/storage/box/ammo/a762_40
+ name = "box of 7.62x40mm CLIP ammo"
+ desc = "A box of standard 7.62x40mm CLIP ammo."
+ icon_state = "a762_40box_big"
+
+/obj/item/storage/box/ammo/a762_40/inteq
+ icon_state = "a762_40box_big_inteq"
+
+/obj/item/storage/box/ammo/a762_40/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40 = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40/hp
+ ammo_type = /obj/item/ammo_casing/a762_40/hp
+ max_ammo = 15
+
+/obj/item/storage/box/ammo/a762_40/hp
+ name = "box of 7.62x40mm CLIP Hollow Point ammo"
+ desc = "A box of standard 7.62x40mm CLIP Hollow Point ammo."
+ icon_state = "a762_40box_big"
+
+/obj/item/storage/box/ammo/a762_40/hp/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40/hp = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40/ap
+ ammo_type = /obj/item/ammo_casing/a762_40/ap
+ max_ammo = 15
+
+/obj/item/storage/box/ammo/a762_40/ap
+ name = "box of 7.62x40mm CLIP Armour Piercing ammo"
+ desc = "A box of standard 7.62x40mm CLIP Armour Piercing ammo."
+ icon_state = "a762_40box_big"
+
+/obj/item/storage/box/ammo/a762_40/ap/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40/ap = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40/rubber
+ ammo_type = /obj/item/ammo_casing/a762_40/rubber
+ max_ammo = 15
+
+/obj/item/storage/box/ammo/a762_40/rubber
+ name = "box of 7.62x40mm CLIP rubber ammo"
+ desc = "A box of standard 7.62x40mm CLIP rubber ammo."
+ icon_state = "a762_40box_big"
+
+/obj/item/storage/box/ammo/a762_40/rubber/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a762_40/rubber = 4)
+ generate_items_inside(items_inside,src)
+
+//.308 (M514 EBR & CM-GAL-S)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a308
+ ammo_type = /obj/item/ammo_casing/a308
+ max_ammo = 10
+
+/obj/item/storage/box/ammo/a308
+ name = "box of .308 ammo"
+ desc = "A box of standard .308 ammo."
+ icon_state = "a308box"
+
+/obj/item/storage/box/ammo/a308/hunterspride
+ icon_state = "a308box-HP"
+
+/obj/item/storage/box/ammo/a308/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a308 = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/hp
+ ammo_type = /obj/item/ammo_casing/a308/hp
+ max_ammo = 10
+
+/obj/item/storage/box/ammo/a308/hp
+ name = "box of .308 HP ammo"
+ desc = "A box of standard .308 HP ammo."
+ icon_state = "a308box"
+
+/obj/item/storage/box/ammo/a308/hp/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/hp = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/ap
+ ammo_type = /obj/item/ammo_casing/a308/ap
+ max_ammo = 10
+
+/obj/item/storage/box/ammo/a308/ap
+ name = "box of .308 AP ammo"
+ desc = "A box of standard .308 AP ammo."
+ icon_state = "a308box"
+
+/obj/item/storage/box/ammo/a308/ap/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a308/ap = 4)
+ generate_items_inside(items_inside,src)
+
+//.299 Eoehoma Caseless (E-40)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c299
+ ammo_type = /obj/item/ammo_casing/caseless/c299
+ max_ammo = 15
+
+/obj/item/storage/box/ammo/c299
+ name = "box of .299 Eoehoma caseless ammo"
+ desc = "A box of .299 Eoehoma caseless, for use with the E-40 hybrid assault rifle."
+ icon_state = "299box"
+
+/obj/item/storage/box/ammo/c299/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c299 = 4)
+ generate_items_inside(items_inside,src)
diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm
new file mode 100644
index 000000000000..ddcf1f8b12e7
--- /dev/null
+++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm
@@ -0,0 +1,74 @@
+// Shotshells
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun
+ max_ammo = 8 //make sure these values are consistent across the board with stack_size variable on respective ammo_casing
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/buckshot
+ ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+
+/obj/item/storage/box/ammo/a12g_buckshot
+ name = "box of 12ga buckshot"
+ desc = "A box of 12-gauge buckshot shells, devastating at close range."
+ icon_state = "12gbox-buckshot"
+
+/obj/item/storage/box/ammo/a12g_buckshot/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/buckshot = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/slug
+ ammo_type = /obj/item/ammo_casing/shotgun
+
+/obj/item/storage/box/ammo/a12g_slug
+ name = "box of 12ga slugs"
+ desc = "A box of 12-gauge slugs, for improved accuracy and penetration."
+ icon_state = "12gbox-slug"
+
+/obj/item/storage/box/ammo/a12g_slug/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/slug = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/beanbag
+ ammo_type = /obj/item/ammo_casing/shotgun/beanbag
+
+/obj/item/storage/box/ammo/a12g_beanbag
+ name = "box of 12ga beanbags"
+ desc = "A box of 12-gauge beanbag shells, for incapacitating targets."
+ icon_state = "12gbox-beanbag"
+
+/obj/item/storage/box/ammo/a12g_beanbag/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/beanbag = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/rubber
+ ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
+
+/obj/item/storage/box/ammo/a12g_rubbershot
+ name = "box of 12ga rubbershot"
+ desc = "A box of 12-gauge rubbershot shells, designed for riot control."
+ icon_state = "12gbox-rubbershot"
+
+/obj/item/storage/box/ammo/a12g_rubbershot/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/rubber = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/blank
+ ammo_type = /obj/item/ammo_casing/shotgun/blank
+
+/obj/item/storage/box/ammo/a12g_blank
+ name = "box of 12ga blanks"
+ desc = "A box of 12-gauge blank shells, designed for training."
+ icon_state = "12gbox-slug" //needs icon
+
+/obj/item/storage/box/ammo/a12g_blank/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/blank = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/incendiary
+ ammo_type = /obj/item/ammo_casing/shotgun/incendiary
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/improvised
+ ammo_type = /obj/item/ammo_casing/shotgun/improvised
diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_smg_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_smg_stacks.dm
new file mode 100644
index 000000000000..e11ed44dceca
--- /dev/null
+++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_smg_stacks.dm
@@ -0,0 +1,167 @@
+// 4.6x30mm (WT-550 Automatic Rifle & SKM-24v)
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c46x30mm
+ ammo_type = /obj/item/ammo_casing/c46x30mm
+ max_ammo = 20
+
+/obj/item/storage/box/ammo/c46x30mm
+ name = "box of 4.6x30mm ammo"
+ desc = "A box of standard 4.6x30mm ammo."
+ icon_state = "46x30mmbox"
+
+/obj/item/storage/box/ammo/c46x30mm/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c46x30mm = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c46x30mm/ap
+ ammo_type = /obj/item/ammo_casing/c46x30mm/ap
+ max_ammo = 20
+
+/obj/item/storage/box/ammo/c46x30mm/ap
+ name = "box of 4.6x30mm AP ammo"
+ desc = "A box of standard 4.6x30mm AP ammo."
+ icon_state = "46x30mmbox"
+
+/obj/item/storage/box/ammo/c46x30mm/ap/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c46x30mm/ap = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c46x30mm/hp
+ ammo_type = /obj/item/ammo_casing/c46x30mm/hp
+ max_ammo = 20
+
+/obj/item/storage/box/ammo/c46x30mm/hp
+ name = "box of 4.6x30mm HP ammo"
+ desc = "A box of standard 4.6x30mm HP ammo."
+ icon_state = "46x30mmbox"
+
+/obj/item/storage/box/ammo/c46x30mm/hp/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c46x30mm/hp = 4)
+ generate_items_inside(items_inside,src)
+
+// 4.73x33mm caseless (Solar)
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c47x33mm
+ ammo_type = /obj/item/ammo_casing/caseless/c47x33mm
+
+// 5.56mm HITP caseless (Pistole C)
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm
+ ammo_type = /obj/item/ammo_casing/caseless/c556mm
+ max_ammo = 15
+
+/obj/item/storage/box/ammo/c556mm
+ name = "box of 5.56mm HITP caseless ammo"
+ desc = "A box of 5.56mm HITP caseless ammo, a SolGov standard."
+ icon_state = "556mmHITPbox"
+
+/obj/item/storage/box/ammo/c556mm/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/surplus
+ ammo_type = /obj/item/ammo_casing/caseless/c556mm/surplus
+
+/obj/item/storage/box/ammo/c556mm_surplus
+ name = "box of surplus 5.56mm HITP caseless ammo"
+ desc = "A box of low-quality 5.56mm HITP caseless ammo."
+ icon_state = "556mmHITPbox-surplus"
+
+/obj/item/storage/box/ammo/c556mm_surplus/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/surplus = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/ap
+ ammo_type = /obj/item/ammo_casing/caseless/c556mm/ap
+
+/obj/item/storage/box/ammo/c556mm_ap
+ name = "box of AP 5.56mm HITP caseless ammo"
+ desc = "A box of 5.56mm HITP caseless armor-piercing ammo, designed to penetrate through armor at the cost of total damage."
+ icon_state = "556mmHITPbox-ap"
+
+/obj/item/storage/box/ammo/c556mm_ap/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/ap = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/hp
+ ammo_type = /obj/item/ammo_casing/caseless/c556mm/hp
+
+/obj/item/storage/box/ammo/c556mm_hp
+ name = "box of HP 5.56mm HITP caseless ammo"
+ desc = "A box of 5.56mm HITP caseless hollow point ammo, designed to cause massive tissue damage at the cost of armor penetration."
+ icon_state = "556mmHITPbox-hp"
+
+/obj/item/storage/box/ammo/c556mm_hp/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/hp = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/rubbershot
+ ammo_type = /obj/item/ammo_casing/caseless/c556mm/rubbershot
+
+/obj/item/storage/box/ammo/c556mm_rubber
+ name = "box of rubber 5.56mm HITP caseless ammo"
+ desc = "A box of 5.56mm HITP caseless rubbershot ammo, designed to disable targets without causing serious damage."
+ icon_state = "556mmHITPbox-rubbershot"
+
+/obj/item/storage/box/ammo/c556mm_rubber/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c556mm/rubbershot = 4)
+ generate_items_inside(items_inside,src)
+
+// 5.7x39mm (Asp and Sidewinder)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39
+ ammo_type = /obj/item/ammo_casing/c57x39mm
+
+/obj/item/storage/box/ammo/c57x39
+ name = "box of 5.7x39mm ammo"
+ desc = "A box of standard 5.7x39mm ammo."
+ icon_state = "57x39mmbox"
+
+/obj/item/storage/box/ammo/c57x39/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39 = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39/hp
+ ammo_type = /obj/item/ammo_casing/c57x39mm/hp
+
+/obj/item/storage/box/ammo/c57x39/hp
+ name = "box of 5.7x39mm HP ammo"
+ desc = "A box of standard 5.7x39mm HP ammo."
+ icon_state = "57x39mmbox"
+
+/obj/item/storage/box/ammo/c57x39/hp/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39/hp = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39/ap
+ ammo_type = /obj/item/ammo_casing/c57x39mm/ap
+
+/obj/item/storage/box/ammo/c57x39/ap
+ name = "box of 5.7x39mm AP ammo"
+ desc = "A box of standard 5.7x39mm AP ammo."
+ icon_state = "57x39mmbox"
+
+/obj/item/storage/box/ammo/c57x39/ap/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39/ap = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39/rubber
+ ammo_type = /obj/item/ammo_casing/c57x39mm/rubber
+
+/obj/item/storage/box/ammo/c57x39/rubber
+ name = "box of 5.7x39mm rubber ammo"
+ desc = "A box of standard 5.7x39mm rubber ammo."
+ icon_state = "57x39mmbox"
+
+/obj/item/storage/box/ammo/c57x39/rubber/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c57x39/rubber = 4)
+ generate_items_inside(items_inside,src)
diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_sniper_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_sniper_stacks.dm
new file mode 100644
index 000000000000..5b9e3218b50f
--- /dev/null
+++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_sniper_stacks.dm
@@ -0,0 +1,84 @@
+// .50 BMG (Sniper)
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/p50
+ ammo_type = /obj/item/ammo_casing/p50
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/p50/soporific
+ ammo_type = /obj/item/ammo_casing/p50/soporific
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/p50/penetrator
+ ammo_type = /obj/item/ammo_casing/p50/penetrator
+
+// 8x58mm Caseless (SSG-669C)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a858
+ ammo_type = /obj/item/ammo_casing/caseless/a858
+ max_ammo = 5
+
+/obj/item/storage/box/ammo/a858
+ name = "box of .300 magnum ammo"
+ desc = "A box of standard .300 Magnum ammo."
+ icon_state = "300box"
+
+/obj/item/storage/box/ammo/a858/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a858 = 4)
+ generate_items_inside(items_inside,src)
+
+// .300 Magnum (Smile Rifle)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a300
+ ammo_type = /obj/item/ammo_casing/a300
+ max_ammo = 5
+
+/obj/item/storage/box/ammo/a300
+ name = "box of .300 magnum ammo"
+ desc = "A box of standard .300 Magnum ammo."
+ icon_state = "300box"
+
+/obj/item/storage/box/ammo/a300/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a300 = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a300/trac
+ ammo_type = /obj/item/ammo_casing/a300/trac
+ max_ammo = 5
+
+/obj/item/storage/box/ammo/a300/trac
+ name = "box of .300 trac ammo"
+ desc = "A box of standard .300 Magnum ammo."
+ icon_state = "300box"
+
+/obj/item/storage/box/ammo/a300/trac/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a300/trac = 2)
+ generate_items_inside(items_inside,src)
+
+//6.5x57mm CLIP
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a65clip
+ ammo_type = /obj/item/ammo_casing/a65clip
+ max_ammo = 5
+
+/obj/item/storage/box/ammo/a65clip
+ name = "box of 6.5x57mm CLIP ammo"
+ desc = "A box of standard 6.5x57mm CLIP ammo."
+ icon_state = "65box"
+
+/obj/item/storage/box/ammo/a65clip/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a65clip = 4)
+ generate_items_inside(items_inside,src)
+
+/obj/item/ammo_box/magazine/ammo_stack/prefilled/a65clip/trac
+ ammo_type = /obj/item/ammo_casing/a65clip/trac
+ max_ammo = 5
+
+/obj/item/storage/box/ammo/a65clip/trac
+ name = "box of 6.5x57mm CLIP tracker ammo"
+ desc = "A box of standard 6.5x57mm CLIP tracker ammo."
+
+/obj/item/storage/box/ammo/a65clip/trac/PopulateContents()
+ var/static/items_inside = list(
+ /obj/item/ammo_box/magazine/ammo_stack/prefilled/a65clip/trac = 2)
+ generate_items_inside(items_inside,src)
diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm
index 90d2c7e4546e..6566f05606eb 100644
--- a/code/modules/projectiles/boxes_magazines/external/pistol.dm
+++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm
@@ -10,10 +10,6 @@
/obj/item/ammo_box/magazine/m45/empty
start_empty = TRUE
-/obj/item/ammo_box/magazine/m45/inc
- name = "pistol magazine (.45 incendiary)"
- desc = "An 8-round single-stack magazine for the Candor pistol. These incendiary rounds deal mediocre damage, but leave flaming trails which set targets ablaze."
- ammo_type = /obj/item/ammo_casing/c45/inc
/obj/item/ammo_box/magazine/m45/hp
name = "pistol magazine (.45 HP)"
@@ -34,19 +30,6 @@
. = ..()
icon_state = "[base_icon_state]-[min(ammo_count(), 8)]"
-/obj/item/ammo_box/magazine/co9mm
- name = "commander pistol magazine (9mm)"
- desc = "A 10-round double-stack magazine for Commander pistols. These rounds do okay damage, but struggle against armor."
- icon_state = "commander_mag-10"
- base_icon_state = "commander_mag"
- ammo_type = /obj/item/ammo_casing/c9mm
- caliber = "9mm"
- max_ammo = 10
- multiple_sprites = AMMO_BOX_PER_BULLET
-
-/obj/item/ammo_box/magazine/co9mm/empty
- start_empty = TRUE
-
/obj/item/ammo_box/magazine/pistol556mm
name = "Pistole C magazine (5.56mm HITP caseless)"
desc = "A 12-round, double-stack magazine for the Pistole C pistol. These rounds do okay damage with average performance against armor."
@@ -70,11 +53,6 @@
icon_state = "[base_icon_state]-0"
-/obj/item/ammo_box/magazine/co9mm/inc
- name = "pistol magazine (9mm incendiary)"
- desc = "A 10-round double-stack magazine for standard-issue 9mm pistols. These incendiary rounds deal pitiful damage, but leave flaming trails which set targets ablaze."
- ammo_type = /obj/item/ammo_casing/c9mm/inc
-
/obj/item/ammo_box/magazine/co9mm/hp
name = "pistol magazine (9mm HP)"
desc= "A 10-round double-stack magazine for standard-issue 9mm pistols. These hollow point rounds do significant damage against soft targets, but are nearly ineffective against armored ones."
diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm
index ad15e7ecea2a..acb90eca4345 100644
--- a/code/modules/projectiles/boxes_magazines/external/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm
@@ -1,16 +1,3 @@
-/obj/item/ammo_box/magazine/m10mm_ringneck/rifle
- name = "rifle magazine (10mm)"
- desc = "A well-worn, 10-round magazine for the surplus rifle. These rounds do moderate damage, but struggle against armor."
- icon_state = "75-8"
- base_icon_state = "75"
- ammo_type = /obj/item/ammo_casing/c10mm
- caliber = "10mm"
- max_ammo = 10
-
-/obj/item/ammo_box/magazine/m10mm_ringneck/rifle/update_icon_state()
- . = ..()
- icon_state = "[base_icon_state]-[ammo_count() ? "8" : "0"]"
-
/obj/item/ammo_box/magazine/m556_42_hydra
name = "toploader magazine (5.56x42mm)"
desc = "An advanced, 30-round toploading magazine for the M-90gl Carbine. These rounds do moderate damage with good armor penetration."
@@ -35,7 +22,7 @@
. = ..()
icon_state = "[base_icon_state]-[round(ammo_count(),5)]"
-/obj/item/ammo_box/magazine/skm_545_39
+/obj/item/ammo_box/magazine/skm_46_30
name = "subcaliber assault rifle magazine (4.6x30mm)"
desc = "A slightly-curved, 30-round magazine for the SKM-24v. These rounds do okay damage with average performance against armor"
ammo_type = /obj/item/ammo_casing/c46x30mm
@@ -45,6 +32,9 @@
icon_state = "skmcarbine_mag-1"
multiple_sprites = AMMO_BOX_FULL_EMPTY
+/obj/item/ammo_box/magazine/skm_46_30/recycled
+ ammo_type = /obj/item/ammo_casing/c46x30mm/recycled
+
/obj/item/ammo_box/magazine/skm_762_40
name = "assault rifle magazine (7.62x40mm CLIP)"
desc = "A slightly curved, 20-round magazine for the 7.62x40mm CLIP variants of the SKM assault rifle family. These rounds do good damage with good armor penetration."
diff --git a/code/modules/projectiles/boxes_magazines/external/shotgun.dm b/code/modules/projectiles/boxes_magazines/external/shotgun.dm
index 9803b0feb084..c5c0fd9b7c1f 100644
--- a/code/modules/projectiles/boxes_magazines/external/shotgun.dm
+++ b/code/modules/projectiles/boxes_magazines/external/shotgun.dm
@@ -7,3 +7,9 @@
caliber = "12ga"
max_ammo = 8
multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/cm15_12g/incendiary
+ name = "CM-15 magazine (12g incendiary)"
+ desc = "An almost straight, 8-round magazine designed for the CM-15 shotgun. This one was loaded with incendiary slugs. Be careful!"
+ ammo_type = /obj/item/ammo_casing/shotgun/incendiary
+ caliber = "12ga incendiary"
diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm
index fdd4ab2d2b45..a8613e4e4903 100644
--- a/code/modules/projectiles/boxes_magazines/external/smg.dm
+++ b/code/modules/projectiles/boxes_magazines/external/smg.dm
@@ -21,13 +21,6 @@
base_icon_state = "46x30mmtA"
ammo_type = /obj/item/ammo_casing/c46x30mm/ap
-/obj/item/ammo_box/magazine/wt550m9/inc
- name = "wt550 magazine (4.6x30mm incendiary)"
- desc = "A compact, 30-round top-loading magazine for the WT-550 Automatic Rifle. These incendiary rounds deal pitiful damage, but leave flaming trails which set targets ablaze."
- icon_state = "46x30mmtI-30"
- base_icon_state = "46x30mmtI"
- ammo_type = /obj/item/ammo_casing/c46x30mm/inc
-
/obj/item/ammo_box/magazine/smgm9mm
name = "SMG magazine (9mm)"
desc = "A 30-round magazine for 9mm submachine guns. These rounds do okay damage, but struggle against armor."
@@ -46,11 +39,6 @@
desc = "A 30-round magazine for 9mm submachine guns. These armor-piercing rounds are okay at piercing protective equipment, but lose some stopping power."
ammo_type = /obj/item/ammo_casing/c9mm/ap
-/obj/item/ammo_box/magazine/smgm9mm/inc
- name = "SMG Magazine (9mm incendiary)"
- desc = "A 30-round magazine for 9mm submachine guns. These incendiary rounds deal pitiful damage, but leave flaming trails which set targets ablaze."
- ammo_type = /obj/item/ammo_casing/c9mm/inc
-
/obj/item/ammo_box/magazine/smgm9mm/rubber
name = "SMG Magazine (9mm rubber)"
desc = "A 30-round magazine for 9mm submachine guns. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
diff --git a/code/modules/projectiles/boxes_magazines/generic_ammo_box.dm b/code/modules/projectiles/boxes_magazines/generic_ammo_box.dm
deleted file mode 100644
index 2c88824623e2..000000000000
--- a/code/modules/projectiles/boxes_magazines/generic_ammo_box.dm
+++ /dev/null
@@ -1,53 +0,0 @@
-/obj/item/ammo_box/generic
- name = "generic ammo box"
- desc = "A generic, unbranded box of ammo. It doesn't have great capacity, but it can hold a variety of different calibers."
- max_ammo = 20
- start_empty = TRUE
- icon_state = "generic-ammo"
- /// Does the box currently have an ammo type set?
- var/ammo_set = FALSE
- /// Name of the currently set ammo type
- var/ammo_name
-
-/obj/item/ammo_box/generic/update_ammo_count()
- . = ..()
- if(LAZYLEN(stored_ammo) == 0)
- ammo_set = FALSE
- ammo_type = /obj/item/ammo_casing
-
-/obj/item/ammo_box/generic/proc/update_max_ammo(obj/item/ammo_casing/ammo)
- if(ammo.bullet_per_box)
- max_ammo = round(ammo.bullet_per_box)
- else
- max_ammo = 10
-
- return
-
-/obj/item/ammo_box/generic/attackby(obj/item/attacking_obj, mob/user, params, silent, replace_spent)
- . = ..()
-
- if(!ammo_set && istype(attacking_obj, /obj/item/ammo_casing))
- var/obj/item/ammo_casing/ammo_load = attacking_obj.type
- ammo_type = ammo_load
- ammo_set = TRUE
- ammo_name = attacking_obj.name
- update_max_ammo(attacking_obj)
- to_chat(user, span_notice("You set the box to hold [attacking_obj]!"))
-
- if(istype(attacking_obj, /obj/item/pen))
- if(!user.is_literate())
- to_chat(user, span_notice("You scribble illegibly on the cover of [src]!"))
- return
- var/inputvalue = stripped_input(user, "What would you like to label the box?", "Box Labelling", "", MAX_NAME_LEN)
-
- if(!inputvalue)
- return
-
- if(user.canUseTopic(src, BE_CLOSE))
- name = "[initial(src.name)][(inputvalue ? " - '[inputvalue]'" : null)]"
-
-/obj/item/ammo_box/generic/examine(mob/user)
- . = ..()
- . += span_notice("[ammo_set ? "It's set to hold [ammo_name]\s. The box can hold up to [max_ammo] rounds." : "It doesn't have an ammo type set. Use a bullet on the box to set it."]")
- . += span_notice("You can use a pen on it to rename the box.")
-
diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
index 7485c591809d..f797d5b4ee55 100644
--- a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
@@ -12,16 +12,6 @@
/obj/item/ammo_box/magazine/internal/shot/lethal
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
-/obj/item/ammo_box/magazine/internal/shot/com
- name = "combat shotgun internal magazine"
- ammo_type = /obj/item/ammo_casing/shotgun/buckshot
- max_ammo = 6
-
-/obj/item/ammo_box/magazine/internal/shot/com/compact
- name = "compact combat shotgun internal magazine"
- ammo_type = /obj/item/ammo_casing/shotgun/buckshot
- max_ammo = 4
-
/obj/item/ammo_box/magazine/internal/shot/dual
name = "double-barrel shotgun internal magazine"
max_ammo = 2
@@ -71,16 +61,6 @@
max_ammo = 1
multiload = FALSE
-/obj/item/ammo_box/magazine/internal/shot/com/compact/compact
- name = "compact compact combat shotgun internal magazine"
- ammo_type = /obj/item/ammo_casing/shotgun/buckshot
- max_ammo = 3
-
-/obj/item/ammo_box/magazine/internal/shot/com/compact/compact/compact
- name = "compact compact compact combat shotgun internal magazine"
- ammo_type = /obj/item/ammo_casing/shotgun/buckshot
- max_ammo = 2
-
/obj/item/ammo_box/magazine/internal/shot/sex
name = "six-barrel shotgun internal magazine"
max_ammo = 6
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index f848018a6115..a81259680248 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -56,7 +56,11 @@
//BALLISTIC
///Compatible magazines with the gun
- var/mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck //Removes the need for max_ammo and caliber info
+ var/default_ammo_type
+ ///Allowed base types of magazines with the gun
+ var/allowed_ammo_types
+ ///Incompatible magazines with the gun
+ var/blacklisted_ammo_types
///Whether the gun alarms when empty or not.
var/empty_alarm = FALSE
///Do we eject the magazine upon runing out of ammo?
@@ -99,7 +103,6 @@
//ENERGY
//What type of power cell this uses
var/obj/item/stock_parts/cell/gun/cell
- var/cell_type = /obj/item/stock_parts/cell/gun
//Can it be charged in a recharger?
var/can_charge = TRUE
var/selfcharge = FALSE
@@ -107,8 +110,6 @@
var/charge_delay = 4
//whether the gun's cell drains the cyborg user's cell to recharge
var/use_cyborg_cell = FALSE
- ///Used for large and small cells
- var/mag_size = MAG_SIZE_MEDIUM
//Time it takes to unscrew the cell
var/unscrewing_time = 2 SECONDS
@@ -262,8 +263,6 @@
*/
///The types of attachments allowed, a list of types. SUBTYPES OF AN ALLOWED TYPE ARE ALSO ALLOWED
var/list/valid_attachments = list()
- ///Reference to our attachment holder to prevent subtypes having to call GetComponent
- var/datum/component/attachment_holder/attachment_holder
///Number of attachments that can fit on a given slot
var/list/slot_available = ATTACHMENT_DEFAULT_SLOT_AVAILABLE
///Offsets for the slots on this gun. should be indexed by SLOT and then by X/Y
@@ -290,6 +289,8 @@
var/safety = FALSE
///The wording of safety. Useful for guns that have a non-standard safety system, like a revolver
var/safety_wording = "safety"
+ ///multiplier for this gun's misfire chances. Closer to 0 is better.
+ var/safety_multiplier = 1
/*
* Spawn Info (Stuff that becomes useless onces the gun is spawned, mostly here for mappers)
@@ -297,13 +298,9 @@
///Attachments spawned on initialization. Should also be in valid attachments or it SHOULD(once i add that) fail
var/list/default_attachments = list()
-//BALLISTIC
- ///Whether the gun will spawn loaded with a magazine
- var/spawnwithmagazine = TRUE
-
//ENERGY
//set to true so the gun is given an empty cell
- var/dead_cell = FALSE
+ var/spawn_no_ammo = FALSE
// Need to sort
///trigger guard on the weapon. Used for hulk mutations and ashies. I honestly dont know how usefult his is, id avoid touching it
@@ -327,7 +324,7 @@
///This prevents gun from firing until the coodown is done, affected by lag
var/current_cooldown = 0
-/obj/item/gun/Initialize()
+/obj/item/gun/Initialize(mapload, spawn_empty)
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
@@ -339,13 +336,13 @@
/obj/item/gun/ComponentInitialize()
. = ..()
- attachment_holder = AddComponent(/datum/component/attachment_holder, slot_available, valid_attachments, slot_offsets, default_attachments)
+ AddComponent(/datum/component/attachment_holder, slot_available, valid_attachments, slot_offsets, default_attachments)
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)
+ INVOKE_ASYNC(src, PROC_REF(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)
@@ -384,6 +381,8 @@
QDEL_NULL(azoom)
if(muzzle_flash)
QDEL_NULL(muzzle_flash)
+ if(magazine)
+ QDEL_NULL(magazine)
return ..()
/obj/item/gun/handle_atom_del(atom/A)
@@ -651,7 +650,11 @@
if(wielded_fully)
simulate_recoil(user, recoil, actual_angle)
else if(!wielded_fully)
- simulate_recoil(user, recoil_unwielded, actual_angle)
+ var/recoil_temp = recoil_unwielded
+ var/obj/item/shield/riot/shield = user.get_inactive_held_item()
+ if(istype(shield))
+ recoil_temp += shield.recoil_bonus
+ simulate_recoil(user, recoil_temp, actual_angle)
if(suppressed)
playsound(user, suppressed_sound, suppressed_volume, vary_fire_sound, ignore_walls = FALSE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_distance = 0)
@@ -963,7 +966,7 @@
// for guns firing on their own without a user
/obj/item/gun/proc/discharge(cause, seek_chance = 10)
var/target
- if(!safety)
+ if(!safety && has_safety)
// someone is very unlucky and about to be shot
if(prob(seek_chance))
for(var/mob/living/target_mob in range(6, get_turf(src)))
@@ -991,16 +994,17 @@
if(ishuman(src))
human_holder = src
for(var/obj/item/gun/at_risk in get_all_contents())
- var/chance_to_fire = GUN_NO_SAFETY_MALFUNCTION_CHANCE_MEDIUM
+ var/chance_to_fire = round(GUN_NO_SAFETY_MALFUNCTION_CHANCE_MEDIUM * at_risk.safety_multiplier)
if(human_holder)
// gun is less likely to go off in a holster
if(at_risk == human_holder.s_store)
- chance_to_fire = GUN_NO_SAFETY_MALFUNCTION_CHANCE_LOW
+ chance_to_fire = round(GUN_NO_SAFETY_MALFUNCTION_CHANCE_LOW * at_risk.safety_multiplier)
if(at_risk.safety == FALSE && prob(chance_to_fire))
- if(at_risk.process_fire(src,src,FALSE, null, pick(BODY_ZONE_L_LEG,BODY_ZONE_R_LEG)) == TRUE)
+ var/bodyzone = pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG,BODY_ZONE_R_LEG)
+ if(at_risk.process_fire(src,src,FALSE, null, bodyzone) == TRUE)
log_combat(src,src,"misfired",at_risk,"caused by [cause]")
- visible_message(span_danger("\The [at_risk.name]'s trigger gets caught as [src] falls, suddenly going off into [src]'s leg without its safties on!"), span_danger("\The [at_risk.name]'s trigger gets caught on something as you fall, suddenly going off into your leg without its safeties on!"))
- emote("scream")
+ visible_message(span_danger("\The [at_risk.name]'s trigger gets caught as [src] falls, suddenly going off into [src]'s [bodyzone]!"), span_danger("\The [at_risk.name]'s trigger gets caught on something as you fall, suddenly going off into your [bodyzone]!"))
+ human_holder.force_scream()
//I need to refactor this into an attachment
/datum/action/toggle_scope_zoom
@@ -1008,18 +1012,21 @@
check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_HANDS_BLOCKED|AB_CHECK_IMMOBILE|AB_CHECK_LYING
icon_icon = 'icons/mob/actions/actions_items.dmi'
button_icon_state = "sniper_zoom"
- var/obj/item/gun/gun = null
/datum/action/toggle_scope_zoom/Trigger()
+ if(!istype(target, /obj/item/gun) || !..())
+ return
+
+ var/obj/item/gun/gun = target
gun.zoom(owner, owner.dir)
-/datum/action/toggle_scope_zoom/IsAvailable()
- . = ..()
- if(!. && gun)
- gun.zoom(owner, owner.dir, FALSE)
+/datum/action/toggle_scope_zoom/Remove(mob/user)
+ if(!istype(target, /obj/item/gun))
+ return ..()
+
+ var/obj/item/gun/gun = target
+ gun.zoom(user, user.dir, FALSE)
-/datum/action/toggle_scope_zoom/Remove(mob/living/L)
- gun.zoom(L, L.dir, FALSE)
..()
/obj/item/gun/proc/rotate(atom/thing, old_dir, new_dir)
@@ -1056,8 +1063,7 @@
return
if(zoomable)
- azoom = new()
- azoom.gun = src
+ azoom = new(src)
/obj/item/gun/proc/build_firemodes()
if(FIREMODE_FULLAUTO in gun_firemodes)
@@ -1117,7 +1123,8 @@
GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
/obj/item/gun/energy/plasmacutter,
- /obj/item/melee/transforming/energy,
+ /obj/item/melee/energy,
+ /obj/item/gear_handle/anglegrinder,
)))
///Handles all the logic of sawing off guns,
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index f64586871ccf..a16f35612692 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -1,6 +1,11 @@
-#define EMPTY_GUN_HELPER(gun_type) \
+#define NO_MAG_GUN_HELPER(gun_type) \
/obj/item/gun/ballistic/##gun_type/no_mag { \
- spawnwithmagazine = FALSE; \
+ default_ammo_type = FALSE; \
+ }
+
+#define EMPTY_GUN_HELPER(gun_type) \
+ /obj/item/gun/ballistic/##gun_type/empty { \
+ spawn_no_ammo = TRUE; \
}
///Subtype for any kind of ballistic gun
@@ -9,7 +14,6 @@
desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason."
name = "projectile gun"
w_class = WEIGHT_CLASS_NORMAL
-
has_safety = TRUE
safety = TRUE
@@ -19,7 +23,8 @@
/obj/item/attachment/silencer,
/obj/item/attachment/laser_sight,
/obj/item/attachment/rail_light,
- /obj/item/attachment/bayonet
+ /obj/item/attachment/bayonet,
+ /obj/item/attachment/sling
)
slot_available = list(
ATTACHMENT_SLOT_MUZZLE = 1,
@@ -36,18 +41,29 @@
)
)
-/obj/item/gun/ballistic/Initialize()
+/obj/item/gun/ballistic/Initialize(mapload, spawn_empty)
. = ..()
- if (!spawnwithmagazine && !ispath(mag_type, /obj/item/ammo_box/magazine/internal))
+
+ allowed_ammo_types = typecacheof(allowed_ammo_types) - blacklisted_ammo_types
+
+ if(spawn_empty)
+ if(internal_magazine)
+ spawn_no_ammo = TRUE
+ else
+ default_ammo_type = FALSE
+
+ if (!default_ammo_type && !internal_magazine)
bolt_locked = TRUE
update_appearance()
return
- if (!magazine)
- magazine = new mag_type(src)
- if (!spawnwithmagazine)
- get_ammo_list (drop_all = TRUE)
- chamber_round()
+ if (ispath(default_ammo_type))
+ magazine = new default_ammo_type(src)
+ if (spawn_no_ammo)
+ get_ammo_list(drop_all = TRUE)
+ else
+ chamber_round()
update_appearance()
+
/obj/item/gun/ballistic/update_icon_state()
if(current_skin)
icon_state = "[unique_reskin[current_skin]][sawn_off ? "_sawn" : ""]"
@@ -146,7 +162,7 @@
///Handles all the logic needed for magazine insertion
/obj/item/gun/ballistic/proc/insert_magazine(mob/user, obj/item/ammo_box/magazine/inserted_mag, display_message = TRUE)
- if(!istype(inserted_mag, mag_type))
+ if(!(inserted_mag.type in allowed_ammo_types))
to_chat(user, "\The [inserted_mag] doesn't seem to fit into \the [src]...")
return FALSE
if(user.transferItemToLoc(inserted_mag, src))
@@ -203,12 +219,14 @@
/obj/item/gun/ballistic/attackby(obj/item/A, mob/user, params)
. = ..()
- if (.)
+
+ if(.)
return
+
if(sealed_magazine)
- to_chat(user, span_warning("The magazine on [src] is sealed and cannot be reloaded!"))
+ to_chat(user, span_warning("The [magazine_wording] on [src] is sealed and cannot be reloaded!"))
return
- if (!internal_magazine && istype(A, /obj/item/ammo_box/magazine))
+ if(!internal_magazine && istype(A, /obj/item/ammo_box/magazine))
var/obj/item/ammo_box/magazine/AM = A
if (!magazine)
insert_magazine(user, AM)
@@ -218,7 +236,8 @@
else
to_chat(user, "There's already a [magazine_wording] in \the [src].")
return
- if (istype(A, /obj/item/ammo_casing) || istype(A, /obj/item/ammo_box))
+
+ if(istype(A, /obj/item/ammo_casing) || istype(A, /obj/item/ammo_box))
if (bolt_type == BOLT_TYPE_NO_BOLT || internal_magazine)
if (chambered && !chambered.BB)
chambered.on_eject(shooter = user)
@@ -235,6 +254,7 @@
if (can_be_sawn_off)
if (try_sawoff(user, A))
return
+
return FALSE
///Prefire empty checks for the bolt drop
@@ -270,30 +290,35 @@
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/gun/ballistic/attack_hand(mob/user)
- if(!internal_magazine && loc == user && user.is_holding(src) && magazine)
- eject_magazine(user)
- return
+ if(user.is_holding(src) && loc == user)
+ if(sealed_magazine)
+ to_chat(user, span_warning("The [magazine_wording] on [src] is sealed and cannot be accessed!"))
+ return
+ if(bolt_type == BOLT_TYPE_NO_BOLT && (chambered || internal_magazine))
+ chambered = null
+ var/num_unloaded = 0
+ for(var/obj/item/ammo_casing/CB in get_ammo_list(FALSE, TRUE))
+ CB.forceMove(drop_location())
+
+ var/angle_of_movement =(rand(-3000, 3000) / 100) + dir2angle(turn(user.dir, 180))
+ CB.AddComponent(/datum/component/movable_physics, _horizontal_velocity = rand(350, 450) / 100, _vertical_velocity = rand(400, 450) / 100, _horizontal_friction = rand(20, 24) / 100, _z_gravity = PHYSICS_GRAV_STANDARD, _z_floor = 0, _angle_of_movement = angle_of_movement, _bounce_sound = CB.bounce_sfx_override)
+
+ num_unloaded++
+ SSblackbox.record_feedback("tally", "station_mess_created", 1, CB.name)
+ if (num_unloaded)
+ to_chat(user, span_notice("You unload [num_unloaded] [cartridge_wording]\s from [src]."))
+ playsound(user, eject_sound, eject_sound_volume, eject_sound_vary)
+ update_appearance()
+ else
+ to_chat(user, span_warning("[src] is empty!"))
+ return
+ if(!internal_magazine && magazine)
+ eject_magazine(user)
+ return
+ return ..()
return ..()
/obj/item/gun/ballistic/unique_action(mob/living/user)
- if(bolt_type == BOLT_TYPE_NO_BOLT)
- chambered = null
- var/num_unloaded = 0
- for(var/obj/item/ammo_casing/CB in get_ammo_list(FALSE, TRUE))
- CB.forceMove(drop_location())
-
- var/angle_of_movement =(rand(-3000, 3000) / 100) + dir2angle(turn(user.dir, 180))
- CB.AddComponent(/datum/component/movable_physics, _horizontal_velocity = rand(350, 450) / 100, _vertical_velocity = rand(400, 450) / 100, _horizontal_friction = rand(20, 24) / 100, _z_gravity = PHYSICS_GRAV_STANDARD, _z_floor = 0, _angle_of_movement = angle_of_movement, _bounce_sound = CB.bounce_sfx_override)
-
- 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()
- else
- to_chat(user, "[src] is empty!")
- return
if((bolt_type == BOLT_TYPE_LOCKING || bolt_type == BOLT_TYPE_CLIP) && bolt_locked)
drop_bolt(user)
return
@@ -318,7 +343,8 @@
. += "It does not seem to have a round chambered."
if (bolt_locked)
. += "The [bolt_wording] is locked back and needs to be released before firing."
- . += "You can [bolt_wording] [src] by pressing the unique action key. By default, this is space"
+ if(bolt_type != BOLT_TYPE_NO_BOLT)
+ . += "You can [bolt_wording] [src] by pressing the unique action key. By default, this is space"
///Gets the number of bullets in the gun
/obj/item/gun/ballistic/proc/get_ammo(countchambered = TRUE)
@@ -336,7 +362,8 @@
rounds.Add(chambered)
if(drop_all)
chambered = null
- rounds.Add(magazine.ammo_list(drop_all))
+ if(magazine)
+ rounds.Add(magazine.ammo_list(drop_all))
return rounds
/obj/item/gun/ballistic/blow_up(mob/user)
diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm
index 42cb637a557f..a7f6e43a9b1f 100644
--- a/code/modules/projectiles/guns/ballistic/assault.dm
+++ b/code/modules/projectiles/guns/ballistic/assault.dm
@@ -1,10 +1,11 @@
/obj/item/gun/ballistic/automatic/assault
show_magazine_on_sprite = TRUE
+ w_class = WEIGHT_CLASS_BULKY
gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
default_firemode = FIREMODE_SEMIAUTO
wield_delay = 0.8 SECONDS
- wield_slowdown = 0.6
+ wield_slowdown = RIFLE_SLOWDOWN
fire_delay = 0.2 SECONDS
@@ -40,10 +41,12 @@
show_magazine_on_sprite = TRUE
unique_mag_sprites_for_variants = TRUE
weapon_weight = WEAPON_MEDIUM
- w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
manufacturer = MANUFACTURER_IMPORT
- mag_type = /obj/item/ammo_box/magazine/skm_762_40
+ default_ammo_type = /obj/item/ammo_box/magazine/skm_762_40
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/skm_762_40,
+ )
spread = 1
wield_delay = 0.7 SECONDS
@@ -51,7 +54,7 @@
fire_delay = 0.2 SECONDS
/obj/item/gun/ballistic/automatic/assault/skm/no_mag
- spawnwithmagazine = FALSE
+ default_ammo_type = FALSE
/obj/item/gun/ballistic/automatic/assault/skm/pirate
name = "\improper Chopper"
@@ -74,31 +77,6 @@
item_state = "skm_inteq"
manufacturer = MANUFACTURER_INTEQ
-/obj/item/gun/ballistic/automatic/assault/p16
- name = "\improper P-16"
- desc = "An assault rifle pattern from Sol, existing before the Night of Fire. A favorite of professional mercenaries and well-heeled pirates. Chambered in 5.56mm."
- icon = 'icons/obj/guns/48x32guns.dmi'
- fire_sound = 'sound/weapons/gun/rifle/m16.ogg'
- icon_state = "p16"
- item_state = "p16"
- show_magazine_on_sprite = TRUE
- 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
-
- fire_delay = 0.18 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/no_mag
- spawnwithmagazine = FALSE
-
/obj/item/gun/ballistic/automatic/assault/cm82
name = "\improper CM-16"
desc = "The standard-issue rifle of CLIP and an extensively modified reproduction of the P-16. Chambered in 5.56mm."
@@ -131,9 +109,11 @@
fire_select_icon_state_prefix = "swisschesse_"
- w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
- mag_type = /obj/item/ammo_box/magazine/swiss
+ default_ammo_type = /obj/item/ammo_box/magazine/swiss
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/swiss,
+ )
manufacturer = MANUFACTURER_SOLARARMORIES
spread = 8
spread_unwielded = 15
@@ -150,11 +130,14 @@
mob_overlay_icon = 'icons/obj/guns/manufacturer/eoehoma/onmob.dmi'
icon_state = "e40"
item_state = "e40"
- mag_type = /obj/item/ammo_box/magazine/e40
+ default_ammo_type = /obj/item/ammo_box/magazine/e40
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/e40,
+ )
var/obj/item/gun/energy/laser/e40_laser_secondary/secondary
fire_select_icon_state_prefix = "e40_"
- fire_delay = 0.18 SECONDS
+ fire_delay = 0.1 SECONDS
recoil_unwielded = 3
gun_firenames = list(FIREMODE_FULLAUTO = "full auto ballistic", FIREMODE_OTHER = "full auto laser")
@@ -162,7 +145,6 @@
default_firemode = FIREMODE_OTHER
weapon_weight = WEAPON_MEDIUM
- w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
show_magazine_on_sprite = TRUE
@@ -196,6 +178,11 @@
/obj/item/gun/ballistic/automatic/assault/e40/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread)
var/current_firemode = gun_firemodes[firemode_index]
if(current_firemode != FIREMODE_OTHER)
+// [CELADON-REMOVE] - CELADON BALANCE - удаляет пару строк кода от системы люков
+// if(!secondary.latch_closed && prob(65))
+// to_chat(user, span_warning("[src]'s cell falls out!"))
+// secondary.eject_cell()
+// [/CELADON-REMOVE]
return ..()
return secondary.process_fire(target, user, message, params, zone_override, bonus_spread)
@@ -214,21 +201,48 @@
/obj/item/gun/ballistic/automatic/assault/e40/attackby(obj/item/attack_obj, mob/user, params)
if(istype(attack_obj, /obj/item/stock_parts/cell/gun))
return secondary.attackby(attack_obj, user, params)
- if(istype(attack_obj, /obj/item/screwdriver))
- return secondary.screwdriver_act(user, attack_obj,)
return ..()
-
-/obj/item/gun/ballistic/automatic/assault/e40/can_shoot()
- var/current_firemode = gun_firemodes[firemode_index]
- if(current_firemode != FIREMODE_OTHER)
- return ..()
- return secondary.can_shoot()
+// [CELADON-REMOVE] - CELADON BALANCE - опять кусок кода связанный с системой люков оффов, бла бла
+// /obj/item/gun/ballistic/automatic/assault/e40/attack_hand(mob/user)
+// var/current_firemode = gun_firemodes[firemode_index]
+// if(current_firemode == FIREMODE_OTHER && loc == user && user.is_holding(src) && secondary.cell && !secondary.latch_closed)
+// secondary.eject_cell(user)
+// return
+// if(current_firemode == FIREMODE_OTHER && loc == user && user.is_holding(src) && secondary.cell && secondary.latch_closed)
+// to_chat(user, span_warning("The cell retainment clip is latched!"))
+// return
+// return ..()
+//
+// /obj/item/gun/ballistic/automatic/assault/e40/AltClick(mob/living/user)
+// var/current_firemode = gun_firemodes[firemode_index]
+// if(current_firemode == FIREMODE_OTHER)
+// if(secondary.latch_closed)
+// to_chat(user, span_notice("You start to unlatch the [src]'s power cell retainment clip..."))
+// if(do_after(user, secondary.latch_toggle_delay, src, IGNORE_USER_LOC_CHANGE))
+// to_chat(user, span_notice("You unlatch [src]'s power cell retainment clip " + "OPEN" + "."))
+// playsound(src, 'sound/items/taperecorder/taperecorder_play.ogg', 50, FALSE)
+// secondary.tac_reloads = TRUE
+// secondary.latch_closed = FALSE
+// update_appearance()
+// return
+// else
+// to_chat(user, span_warning("You start to latch the [src]'s power cell retainment clip..."))
+// if (do_after(user, secondary.latch_toggle_delay, src, IGNORE_USER_LOC_CHANGE))
+// to_chat(user, span_notice("You latch [src]'s power cell retainment clip " + "CLOSED" + "."))
+// playsound(src, 'sound/items/taperecorder/taperecorder_close.ogg', 50, FALSE)
+// secondary.tac_reloads = FALSE
+// secondary.latch_closed = TRUE
+// update_appearance()
+// return
+// else
+// return ..()
+// [/CELADON-REMOVE]
/obj/item/gun/ballistic/automatic/assault/e40/on_wield(obj/item/source, mob/user)
wielded = TRUE
secondary.wielded = TRUE
- INVOKE_ASYNC(src, .proc.do_wield, user)
+ INVOKE_ASYNC(src, PROC_REF(do_wield), user)
/obj/item/gun/ballistic/automatic/assault/e40/do_wield(mob/user)
. = ..()
@@ -264,7 +278,22 @@
. += "[icon_state]_charge[ratio]"
if(secondary.cell)
. += "[icon_state]_cell"
-
+// [CELADON-REMOVE] - CELADON BALANCE - удаляем систему оффов с люками
+// if(ismob(loc))
+// var/mutable_appearance/latch_overlay
+// latch_overlay = mutable_appearance('icons/obj/guns/cell_latch.dmi')
+// if(secondary.latch_closed)
+// if(secondary.cell)
+// latch_overlay.icon_state = "latch-on-full"
+// else
+// latch_overlay.icon_state = "latch-on-empty"
+// else
+// if(secondary.cell)
+// latch_overlay.icon_state = "latch-off-full"
+// else
+// latch_overlay.icon_state = "latch-off-empty"
+// . += latch_overlay
+// [/CELADON-REMOVE]
/obj/item/gun/ballistic/automatic/assault/e40/toggle_safety(mob/user, silent=FALSE)
. = ..()
@@ -280,6 +309,19 @@
SEND_SIGNAL(src, COMSIG_GUN_SET_AUTOFIRE_SPEED, fire_delay)
SEND_SIGNAL(src, COMSIG_UPDATE_AMMO_HUD)
+// [CELADON-REMOVE] - CELADON BALANCE - удаляет часть системы оффовских люков для Е40
+// /obj/item/gun/ballistic/automatic/assault/e40/examine(mob/user)
+// . = ..()
+// if(!secondary.internal_magazine)
+// . += "The cell retainment latch is [secondary.latch_closed ? "CLOSED" : "OPEN"]. Alt-Click to toggle the latch."
+// var/obj/item/ammo_casing/energy/shot = secondary.ammo_type[select]
+// if(secondary.cell)
+// . += "\The [name]'s cell has [secondary.cell.percent()]% charge remaining."
+// . += "\The [name] has [round(secondary.cell.charge/shot.e_cost)] shots remaining on [shot.select_name] mode."
+// else
+// . += span_notice("\The [name] doesn't seem to have a cell!")
+// [/CELADON-REMOVE]
+
//laser
/obj/item/gun/energy/laser/e40_laser_secondary
@@ -291,36 +333,7 @@
fire_delay = 0.2 SECONDS
gun_firemodes = list(FIREMODE_FULLAUTO)
default_firemode = FIREMODE_FULLAUTO
-
+// [CELADON-REMOVE] - CELADON BALANCE - часть кода системы люков оффов
+// latch_toggle_delay = 1.2 SECONDS
+// [/CELADON-REMOVE]
spread_unwielded = 20
-
-//techinically a battle rifle, i'm putting it here for organisation sake
-
-/obj/item/gun/ballistic/automatic/marksman/vickland //weapon designed by Apogee-dev
- name = "\improper Vickland"
- desc = "The pride of the Saint-Roumain Militia, the Vickland is a rare semi-automatic battle rifle produced by Hunter's Pride exclusively for SRM use. It is unusual in its class for its internal rotary magazine, which must be reloaded using stripper clips. Chambered in .308."
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
-
- fire_sound = 'sound/weapons/gun/rifle/vickland.ogg'
- icon_state = "vickland"
- item_state = "vickland"
- weapon_weight = WEAPON_MEDIUM
- w_class = WEIGHT_CLASS_BULKY
- internal_magazine = TRUE
- mag_type = /obj/item/ammo_box/magazine/internal/vickland
- fire_sound = 'sound/weapons/gun/rifle/vickland.ogg'
-
- manufacturer = MANUFACTURER_HUNTERSPRIDE
- zoomable = FALSE //no scope on it
-
- rack_sound = 'sound/weapons/gun/rifle/ar_cock.ogg'
-
- fire_delay = 0.4 SECONDS
-
- spread_unwielded = 25
- recoil = 0
- recoil_unwielded = 4
- wield_slowdown = 0.75
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index 6b1e30296d57..fd893e432f30 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -1,6 +1,6 @@
/obj/item/gun/ballistic/automatic
- w_class = WEIGHT_CLASS_NORMAL
+ w_class = WEIGHT_CLASS_BULKY
gun_firemodes = list(FIREMODE_SEMIAUTO)
default_firemode = FIREMODE_SEMIAUTO
@@ -19,42 +19,17 @@
spread_unwielded = 13
recoil = 0
recoil_unwielded = 4
- wield_slowdown = 0.35
-
-// Old Semi-Auto Rifle //
-
-/obj/item/gun/ballistic/automatic/surplus //TODO: NEEDS TO BE REPLACED WITH PISTOL CARBINES OR LOWCAL SEMI-AUTO RIFLES
- name = "surplus rifle"
- desc = "One of countless cheap, obsolete rifles found throughout the Frontier. Its lack of lethality renders it mostly a deterrent. Chambered in 10mm."
- icon_state = "surplus"
- item_state = "moistnugget"
- weapon_weight = WEAPON_HEAVY
- mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck/rifle
- fire_delay = 0.5 SECONDS
- burst_size = 1
- w_class = WEIGHT_CLASS_HUGE
- slot_flags = ITEM_SLOT_BACK
- show_magazine_on_sprite = TRUE
-
-// Laser rifle (rechargeable magazine) //
-
-/obj/item/gun/ballistic/automatic/laser //TODO: REMOVE
- name = "laser rifle"
- desc = "Though sometimes mocked for the relatively weak firepower of their energy weapons, the logistic miracle of rechargeable ammunition has given Nanotrasen a decisive edge over many a foe."
- icon_state = "oldrifle"
- item_state = "arg"
- mag_type = /obj/item/ammo_box/magazine/recharge
- fire_delay = 0.2 SECONDS
- burst_size = 0
- fire_sound = 'sound/weapons/laser.ogg'
- casing_ejector = FALSE
+ wield_slowdown = PDW_SLOWDOWN
/obj/item/gun/ballistic/automatic/zip_pistol
name = "makeshift pistol"
desc = "A makeshift zip gun cobbled together from various scrap bits and chambered in 9mm. It's a miracle it even works."
icon_state = "ZipPistol"
item_state = "ZipPistol"
- mag_type = /obj/item/ammo_box/magazine/zip_ammo_9mm
+ default_ammo_type = /obj/item/ammo_box/magazine/zip_ammo_9mm
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/zip_ammo_9mm,
+ )
actions_types = list()
show_magazine_on_sprite = TRUE
weapon_weight = WEAPON_LIGHT
diff --git a/code/modules/projectiles/guns/ballistic/gauss.dm b/code/modules/projectiles/guns/ballistic/gauss.dm
index 3fdc2e55dadd..0b4319d5be8a 100644
--- a/code/modules/projectiles/guns/ballistic/gauss.dm
+++ b/code/modules/projectiles/guns/ballistic/gauss.dm
@@ -8,7 +8,10 @@
icon_state = "gauss"
item_state = "arg"
slot_flags = 0
- mag_type = /obj/item/ammo_box/magazine/gauss
+ default_ammo_type = /obj/item/ammo_box/magazine/gauss
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/gauss,
+ )
fire_sound = 'sound/weapons/gun/gauss/magrifle.ogg'
load_sound = 'sound/weapons/gun/gauss/rifle_reload.ogg'
burst_size = 1
@@ -26,98 +29,6 @@
spread_unwielded = 25
recoil = 0
recoil_unwielded = 4
- wield_slowdown = 0.75
+ wield_slowdown = HEAVY_RIFLE_SLOWDOWN
wield_delay = 1 SECONDS
fire_select_icon_state_prefix = "pellet_"
-
-/obj/item/gun/ballistic/automatic/powered/gauss/modelh
- name = "Model H"
- desc = "A standard-issue pistol exported from the Solarian Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor."
- mag_type = /obj/item/ammo_box/magazine/modelh
- icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
- icon_state = "model-h"
- item_state = "model-h"
- fire_sound = 'sound/weapons/gun/gauss/modelh.ogg'
- load_sound = 'sound/weapons/gun/gauss/pistol_reload.ogg'
- cell_type = /obj/item/stock_parts/cell/gun/solgov
- slot_flags = ITEM_SLOT_BELT
- w_class = WEIGHT_CLASS_SMALL
- fire_delay = 0.6 SECONDS //pistol, but heavy caliber.
- show_magazine_on_sprite = FALSE
- empty_indicator = FALSE
- manufacturer = MANUFACTURER_SOLARARMORIES
- recoil = 2
- recoil_unwielded = 4
- spread = 6
- spread_unwielded = 12
- fire_select_icon_state_prefix = "slug_"
-
-/obj/item/gun/ballistic/automatic/powered/gauss/modelh/no_mag
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/automatic/powered/gauss/modelh/suns
- desc = "A standard-issue pistol exported from the Solarian Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor. It is painted in the colors of SUNS."
- mag_type = /obj/item/ammo_box/magazine/modelh
- icon_state = "model-h_suns"
- item_state = "model-h_suns"
-
-/obj/item/gun/ballistic/automatic/powered/gauss/claris
- name = "Claris"
- desc = "An antiquated Solarian rifle. Chambered in ferromagnetic pellets, just as the founding Solarians intended."
- mag_type = /obj/item/ammo_box/magazine/internal/claris
- icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
- icon_state = "claris"
- item_state = "claris"
- fire_sound = 'sound/weapons/gun/gauss/claris.ogg'
- load_sound = 'sound/weapons/gun/gauss/sniper_reload.ogg'
- cell_type = /obj/item/stock_parts/cell/gun/solgov
- fire_delay = 0.4 SECONDS
- bolt_type = BOLT_TYPE_NO_BOLT
- internal_magazine = TRUE
- show_magazine_on_sprite = FALSE
- empty_indicator = FALSE
- manufacturer = MANUFACTURER_SOLARARMORIES
- fire_select_icon_state_prefix = "pellet_"
-
-/obj/item/gun/ballistic/automatic/powered/gauss/claris/suns
- desc = "An antiquated Solarian rifle. Chambered in ferromagnetic pellets, just as the founding Solarians intended. Evidently, SUNS' founders echo the sentiment, as it appears to be painted in their colors."
- icon_state = "claris_suns"
- item_state = "claris_suns"
-
-/obj/item/gun/ballistic/automatic/powered/gauss/gar
- name = "Solar 'GAR' Carbine"
- desc = "A Solarian carbine, unusually modern for its producers. Launches ferromagnetic lances at alarming speeds."
- mag_type = /obj/item/ammo_box/magazine/gar
- icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
- icon_state = "gar"
- item_state = "gar"
- fire_sound = 'sound/weapons/gun/gauss/gar.ogg'
- load_sound = 'sound/weapons/gun/gauss/rifle_reload.ogg'
- cell_type = /obj/item/stock_parts/cell/gun/solgov
- burst_size = 1
-
- fire_delay = 0.2 SECONDS
-
- actions_types = list()
- empty_indicator = FALSE
- manufacturer = MANUFACTURER_SOLARARMORIES
-
- gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
- default_firemode = FIREMODE_SEMIAUTO
-
- wield_delay = 0.7 SECONDS
- fire_select_icon_state_prefix = "lance_"
-
-/obj/item/gun/ballistic/automatic/powered/gauss/gar/suns
- desc = "A Solarian carbine, unusually modern for its producers. It's just modern enough for SUNS, however, who have painted the weapon in their colors. Launches ferromagnetic lances at alarming speeds."
- icon_state = "gar_suns"
- item_state = "gar_suns"
diff --git a/code/modules/projectiles/guns/ballistic/hmg.dm b/code/modules/projectiles/guns/ballistic/hmg.dm
index 780b24dc80fb..1c318164ee76 100644
--- a/code/modules/projectiles/guns/ballistic/hmg.dm
+++ b/code/modules/projectiles/guns/ballistic/hmg.dm
@@ -12,11 +12,12 @@
gun_firemodes = list(FIREMODE_FULLAUTO)
default_firemode = FIREMODE_FULLAUTO
+ wield_slowdown = HMG_SLOWDOWN
+
spread = 4
spread_unwielded = 80
recoil = 1
recoil_unwielded = 4
- wield_slowdown = 3
gunslinger_recoil_bonus = 2
gunslinger_spread_bonus = 20
@@ -64,6 +65,22 @@
else
retract_bipod(user=user)
+/obj/item/gun/ballistic/automatic/hmg/calculate_recoil(mob/user, recoil_bonus = 0)
+ var/total_recoil = recoil_bonus
+
+ if(bipod_deployed)
+ total_recoil += deploy_recoil_bonus
+
+ return ..(user, total_recoil)
+
+/obj/item/gun/ballistic/automatic/hmg/calculate_spread(mob/user, bonus_spread)
+ var/total_spread = bonus_spread
+
+ if(bipod_deployed)
+ total_spread += deploy_spread_bonus
+
+ return ..(user, total_spread)
+
/obj/item/gun/ballistic/automatic/hmg/proc/deploy_bipod(mob/user)
//we check if we can actually deploy the thing
var/can_deploy = TRUE
@@ -139,7 +156,10 @@
icon_state = "solar"
fire_sound = 'sound/weapons/gun/l6/shot.ogg'
- mag_type = /obj/item/ammo_box/magazine/rifle47x33mm
+ default_ammo_type = /obj/item/ammo_box/magazine/rifle47x33mm
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/rifle47x33mm,
+ )
spread = 7
fire_delay = 0.1 SECONDS
@@ -178,7 +198,10 @@
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
manufacturer = MANUFACTURER_IMPORT
- mag_type = /obj/item/ammo_box/magazine/skm_762_40
+ default_ammo_type = /obj/item/ammo_box/magazine/skm_762_40
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/skm_762_40,
+ )
fire_delay = 0.13 SECONDS
@@ -188,7 +211,7 @@
recoil = 1 //identical to other LMGS
recoil_unwielded = 4 //same as skm
- wield_slowdown = 1 //not as severe as other lmgs, but worse than the normal skm
+ wield_slowdown = SAW_SLOWDOWN //not as severe as other lmgs, but worse than the normal skm
wield_delay = 0.85 SECONDS //faster than normal lmgs, slower than stock skm
has_bipod = TRUE
@@ -198,17 +221,7 @@
AddElement(/datum/element/update_icon_updates_onmob)
/obj/item/gun/ballistic/automatic/hmg/skm_lmg/extended //spawns with the proper extended magazine, for erts
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/automatic/hmg/skm_lmg/extended/Initialize()
- . = ..()
- magazine = new /obj/item/ammo_box/magazine/skm_762_40/extended(src)
- chamber_round()
+ default_ammo_type = /obj/item/ammo_box/magazine/skm_762_40/extended
/obj/item/gun/ballistic/automatic/hmg/skm_lmg/drum_mag //spawns with a drum, maybe not for erts but admin enhanced ERTS? when things really go to shit
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/automatic/hmg/skm_lmg/drum_mag/Initialize()
- . = ..()
- magazine = new /obj/item/ammo_box/magazine/skm_762_40/drum(src)
- chamber_round()
+ default_ammo_type = /obj/item/ammo_box/magazine/skm_762_40/drum
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index 2044fae60ee2..3e33689fef7b 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -4,7 +4,10 @@
/obj/item/gun/ballistic/revolver/grenadelauncher//this is only used for underbarrel grenade launchers at the moment, but admins can still spawn it if they feel like being assholes
desc = "A break-action, single-shot grenade launcher. A compact way to deliver a big boom."
name = "grenade launcher"
- mag_type = /obj/item/ammo_box/magazine/internal/grenadelauncher
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/grenadelauncher
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/grenadelauncher,
+ )
fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg'
w_class = WEIGHT_CLASS_NORMAL
bolt_type = BOLT_TYPE_NO_BOLT
@@ -24,7 +27,10 @@
name = "multi grenade launcher"
icon = 'icons/mecha/mecha_equipment.dmi'
icon_state = "mecha_grenadelnchr"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/grenademulti
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/cylinder/grenademulti
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/cylinder/grenademulti,
+ )
/obj/item/gun/ballistic/revolver/grenadelauncher/cyborg/attack_self()
return
@@ -34,7 +40,10 @@
desc = "A prototype pistol designed to fire self-propelled rockets."
icon_state = "gyropistol"
fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg'
- mag_type = /obj/item/ammo_box/magazine/m75
+ default_ammo_type = /obj/item/ammo_box/magazine/m75
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m75,
+ )
burst_size = 1
fire_delay = 0.4 SECONDS
actions_types = list()
@@ -49,7 +58,14 @@ GLOBAL_LIST_INIT(rpg_scrawlings, list(
"A drawing of the Rilena character 'T4L1' smoking a boof",
"\"Eat it corpo!\"",
"A Sarathi woman in a suggestive pose",
- "\"Arm this!\""
+ "A masculine Sarathi shouldering a launcher",
+ "A Vox woman with a sledgehammer over their shoulder",
+ "A man in a floral patterned shirt and nothing else, drawn leaning against the rocket's tube",
+ "A crudely-drawn picture of a Gorlex Marauder exploding",
+ "A scratched-out link to some kind of website",
+ ".:|:;",
+ "\"SPEAR TO THE SHOAL, FOR A FREE FRONTIER!\"",
+ "\"Arm this!\"",
))
@@ -59,7 +75,10 @@ GLOBAL_LIST_INIT(rpg_scrawlings, list(
icon_state = "rocketlauncher"
item_state = "rocketlauncher"
- mag_type = /obj/item/ammo_box/magazine/internal/rocketlauncher
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/rocketlauncher
+ allowed_ammo_types = list(
+ /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'
gun_firemodes = list(FIREMODE_SEMIAUTO)
diff --git a/code/modules/projectiles/guns/ballistic/marksman.dm b/code/modules/projectiles/guns/ballistic/marksman.dm
index 9d63e66bcab7..71458e24f1d2 100644
--- a/code/modules/projectiles/guns/ballistic/marksman.dm
+++ b/code/modules/projectiles/guns/ballistic/marksman.dm
@@ -1,8 +1,7 @@
-
/obj/item/gun/ballistic/automatic/marksman
show_magazine_on_sprite = TRUE
burst_size = 1
zoomable = TRUE //this var as true without setting anything else produces a 2x zoom
- wield_slowdown = 2
+ wield_slowdown = DMR_SLOWDOWN
wield_delay = 1 SECONDS
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index e81b57d43f37..dd483aa4965e 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -1,5 +1,6 @@
/obj/item/gun/ballistic/automatic/pistol
bolt_type = BOLT_TYPE_LOCKING
+ w_class = WEIGHT_CLASS_NORMAL
vary_fire_sound = FALSE
fire_sound_volume = 90
@@ -15,49 +16,10 @@
fire_delay = 0.2 SECONDS
spread = 5
spread_unwielded = 7
- wield_slowdown = 0.15
+ wield_slowdown = PISTOL_SLOWDOWN
muzzleflash_iconstate = "muzzle_flash_light"
-/obj/item/gun/ballistic/automatic/pistol/candor
- name = "\improper Candor"
- desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of Hunter's Pride. Chambered in .45."
- icon_state = "candor"
- item_state = "hp_generic"
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
-
- mag_type = /obj/item/ammo_box/magazine/m45
- fire_sound = 'sound/weapons/gun/pistol/candor.ogg'
- rack_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg'
- lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
- bolt_drop_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg'
- manufacturer = MANUFACTURER_HUNTERSPRIDE
- load_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
- load_empty_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
- eject_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
- eject_empty_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
-
-EMPTY_GUN_HELPER(automatic/pistol/candor)
-
-/obj/item/gun/ballistic/automatic/pistol/candor/factory //also give this to the srm, their candors should probably look factory fresh from how well taken care of they are
- desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of 'Hunter's Pride Arms and Ammunition'. This example has been kept in especially good shape, and may as well be fresh out of the workshop. Chambered in .45."
- item_state = "hp_generic_fresh"
-
-EMPTY_GUN_HELPER(automatic/pistol/candor/factory)
-
-/obj/item/gun/ballistic/automatic/pistol/candor/factory/update_overlays()
- . = ..()
- . += "[initial(icon_state)]_factory"
-
-/obj/item/gun/ballistic/automatic/pistol/candor/phenex
- name = "\improper HP Phenex"
- desc = "A uniquely modified version of the Candor, famously created by Hunter's Pride. Named after the daemonic Phoenix of legend that the Ashen Huntsman had once slain, this hell-kissed weapon is more visually intimidating than its original counterpart, but mechanically acts the same. Chambered in .45."
- icon_state = "phenex"
- item_state = "hp_phenex"
-
/obj/item/gun/ballistic/automatic/pistol/deagle
name = "\improper Desert Eagle"
desc = "An oversized handgun chambered in .50 AE. A true hand cannon."
@@ -67,7 +29,10 @@ EMPTY_GUN_HELPER(automatic/pistol/candor/factory)
mob_overlay_icon = 'icons/obj/guns/manufacturer/frontier_import/onmob.dmi'
icon_state = "deagle"
force = 14
- mag_type = /obj/item/ammo_box/magazine/m50
+ default_ammo_type = /obj/item/ammo_box/magazine/m50
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m50,
+ )
mag_display = TRUE
show_magazine_on_sprite = TRUE
fire_sound = 'sound/weapons/gun/pistol/deagle.ogg'
@@ -97,43 +62,6 @@ EMPTY_GUN_HELPER(automatic/pistol/candor/factory)
icon_state = "deaglecamo"
item_state = "deagleg"
-/obj/item/gun/ballistic/automatic/pistol/commander
- name = "\improper Commander"
- desc = "A classic handgun in a tasteful black and stainless steel color scheme. An enamel Nanotrasen logo is set into the grips. Chambered in 9mm."
- icon_state = "commander"
- icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
-
- w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/co9mm
- manufacturer = MANUFACTURER_NANOTRASEN
- fire_sound = 'sound/weapons/gun/pistol/rattlesnake.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'
-
- rack_sound = 'sound/weapons/gun/pistol/rack_small.ogg'
- lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
- bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'
-
-EMPTY_GUN_HELPER(automatic/pistol/commander)
-
-/obj/item/gun/ballistic/automatic/pistol/commander/inteq
- name = "\improper Commissioner"
- desc = "A handgun seized from Nanotrasen armories by deserting troopers and modified to IRMG's standards. A yellow IRMG shield is set into the grips. Chambered in 9mm."
- icon = 'icons/obj/guns/manufacturer/inteq/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/inteq/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/inteq/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/inteq/onmob.dmi'
- icon_state = "commander-inteq"
- item_state = "commander-inteq"
- manufacturer = MANUFACTURER_INTEQ
-
-EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
-
/obj/item/gun/ballistic/automatic/pistol/commissar
name = "\improper Commissar"
desc = "A Nanotrasen-issue handgun, modified with a voice box to further enhance its effectiveness in troop discipline."
@@ -144,7 +72,10 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/co9mm
+ default_ammo_type = /obj/item/ammo_box/magazine/co9mm
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/co9mm,
+ )
var/funnysounds = TRUE
var/cooldown = 0
load_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
@@ -197,33 +128,6 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
if(funnysounds)
. += "Alt-click to use \the [src] vox hailer."
-/obj/item/gun/ballistic/automatic/pistol/solgov
- name = "\improper Pistole C"
- desc = "A favorite of the Terran Regency that is despised by the Solarian bureaucracy. Shifted out of military service centuries ago, though still popular among civilians. Chambered in 5.56mm caseless."
- icon_state = "pistole-c"
- icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
-
- weapon_weight = WEAPON_LIGHT
- mag_type = /obj/item/ammo_box/magazine/pistol556mm
- fire_sound = 'sound/weapons/gun/pistol/pistolec.ogg'
- manufacturer = MANUFACTURER_SOLARARMORIES
- 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'
-
- rack_sound = 'sound/weapons/gun/pistol/rack_small.ogg'
- lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
- bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'
-
- fire_select_icon_state_prefix = "caseless_"
-
-/obj/item/gun/ballistic/automatic/pistol/solgov/old
- icon_state = "pistole-c-old"
-
/obj/item/gun/ballistic/automatic/pistol/disposable
name = "disposable gun"
desc = "An exceedingly flimsy plastic gun that is extremely cheap to produce. You get what you pay for."
@@ -231,7 +135,10 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
icon_state = "disposable" //credit to discord user 20nypercent for the sprite
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/disposable
+ default_ammo_type = /obj/item/ammo_box/magazine/disposable
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/disposable,
+ )
custom_materials = list(/datum/material/plastic=2000)
manufacturer = MANUFACTURER_NONE
has_safety = FALSE //thing barely costs anything, why would it have a safety?
@@ -256,7 +163,10 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
- mag_type = /obj/item/ammo_box/magazine/internal/derr38
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/derr38
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/derr38,
+ )
fire_sound = 'sound/weapons/gun/revolver/shot.ogg'
load_sound = 'sound/weapons/gun/revolver/load_bullet.ogg'
eject_sound = 'sound/weapons/gun/revolver/empty.ogg'
@@ -291,15 +201,19 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
icon_state = "derringer_syndie"
- mag_type = /obj/item/ammo_box/magazine/internal/derr357
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/derr357
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/derr357,
+ )
fire_sound_volume = 50 //Tactical stealth firing
/obj/item/gun/ballistic/derringer/gold
name = "\improper Golden Derringer"
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/derringer/no_mag
- spawnwithmagazine = FALSE
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/derr357
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/derr357,
+ )
+EMPTY_GUN_HELPER(ballistic/derringer)
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index e0e389ce7f4a..36fece5f8c31 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -10,7 +10,10 @@
name = "i demand"
desc = "You feel as if you should make a 'adminhelp' if you see one of these, along with a 'github' report. You don't really understand what this means though."
icon_state = "revolver"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/cylinder
+ allowed_ammo_types = list(
+ /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'
@@ -36,7 +39,7 @@
bolt_wording = "hammer"
dry_fire_sound = 'sound/weapons/gun/general/bolt_drop.ogg'
dry_fire_text = "snap"
- wield_slowdown = 0.3
+ wield_slowdown = REVOLVER_SLOWDOWN
gun_firemodes = list(FIREMODE_SEMIAUTO)
default_firemode = FIREMODE_SEMIAUTO
@@ -455,91 +458,8 @@
playsound(src, 'sound/items/handling/ammobox_pickup.ogg', 20, FALSE)
return
-/obj/item/gun/ballistic/revolver/detective
- name = "\improper HP Detective Special"
- desc = "A small law enforcement firearm. Originally commissioned by Nanotrasen for their Private Investigation division, it has become extremely popular among independent civilians as a cheap, compact sidearm. Uses .38 Special rounds."
- fire_sound = 'sound/weapons/gun/revolver/shot_light.ogg'
- icon_state = "detective"
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
-
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
- obj_flags = UNIQUE_RENAME
- semi_auto = TRUE //double action
- safety_wording = "safety"
- unique_reskin = list("Default" = "detective",
- "Stainless Steel" = "detective_stainless",
- "Gold Trim" = "detective_gold",
- "Leopard Spots" = "detective_leopard",
- "The Peacemaker" = "detective_peacemaker",
- "Black Panther" = "detective_panther"
- )
- w_class = WEIGHT_CLASS_SMALL
- manufacturer = MANUFACTURER_HUNTERSPRIDE
-
- recoil = 0 //weaker than normal revolver, no recoil
- fire_delay = 0.2 SECONDS
-
-EMPTY_GUN_HELPER(revolver/detective)
-
-/obj/item/gun/ballistic/revolver/detective/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/ammo_hud/revolver) //note that the hud at the moment only supports 6 round revolvers, 7 or 5 isn't supported rn
-//...why...?
-/obj/item/gun/ballistic/revolver/detective/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, burst_firing = FALSE, spread_override = 0, iteration = 0)
- if(magazine.caliber != initial(magazine.caliber))
- if(prob(100 - (magazine.ammo_count() * 5))) //minimum probability of 70, maximum of 95
- playsound(user, fire_sound, fire_sound_volume, vary_fire_sound)
- to_chat(user, "[src] blows up in your face!")
- user.take_bodypart_damage(0,20)
- explosion(src, 0, 0, 1, 1)
- user.dropItemToGround(src)
- return 0
- ..()
-
-/obj/item/gun/ballistic/revolver/detective/screwdriver_act(mob/living/user, obj/item/I)
- if(..())
- return TRUE
- if(magazine.caliber == "38")
- to_chat(user, "You begin to reinforce the barrel of [src]...")
- if(magazine.ammo_count())
- afterattack(user, user) //you know the drill
- user.visible_message("[src] goes off!", "[src] goes off in your face!")
- return TRUE
- if(I.use_tool(src, user, 30))
- if(magazine.ammo_count())
- to_chat(user, "You can't modify it!")
- return TRUE
- magazine.caliber = ".357"
- fire_sound = 'sound/weapons/gun/revolver/shot.ogg'
- desc = "The barrel and chamber assembly seems to have been modified."
- to_chat(user, "You reinforce the barrel of [src]. Now it will fire .357 rounds.")
- else
- to_chat(user, "You begin to revert the modifications to [src]...")
- if(magazine.ammo_count())
- afterattack(user, user) //and again
- user.visible_message("[src] goes off!", "[src] goes off in your face!")
- return TRUE
- if(I.use_tool(src, user, 30))
- if(magazine.ammo_count())
- to_chat(user, "You can't modify it!")
- return
- magazine.caliber = ".38"
- fire_sound = 'sound/weapons/gun/revolver/shot.ogg'
- desc = initial(desc)
- to_chat(user, "You remove the modifications on [src]. Now it will fire .38 rounds.")
- return TRUE
-
-/obj/item/gun/ballistic/revolver/detective/no_mag
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/revolver/viper/no_mag
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/revolver/no_mag
- spawnwithmagazine = FALSE
+EMPTY_GUN_HELPER(revolver)
+EMPTY_GUN_HELPER(revolver/viper)
/obj/item/gun/ballistic/revolver/mateba
name = "\improper Unica 6 auto-revolver"
@@ -562,106 +482,3 @@ EMPTY_GUN_HELPER(revolver/detective)
fire_sound = 'sound/weapons/resonator_blast.ogg'
recoil = 8
manufacturer = MANUFACTURER_NONE
-
-/obj/item/gun/ballistic/revolver/montagne
- name = "\improper HP Montagne"
- desc = "An ornate break-open revolver issued to high-ranking members of the Saint-Roumain Militia. Chambered in .44."
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
-
- icon_state = "montagne"
- manufacturer = MANUFACTURER_HUNTERSPRIDE
- spread_unwielded = 15
- recoil = 0
-
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44/montagne
-
-/obj/item/gun/ballistic/revolver/montagne/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/ammo_hud/revolver)
-
-/obj/item/gun/ballistic/revolver/montagne/no_mag
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/revolver/ashhand
- name = "HP Ashhand"
- desc = "A massive, long-barreled revolver often used by the Saint-Roumain Militia as protection against big game. Can only be reloaded one cartridge at a time due to its reinforced frame. Uses .45-70 ammo."
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
-
- icon_state = "ashhand"
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev4570
- fire_sound = 'sound/weapons/gun/revolver/shot_hunting.ogg'
- manufacturer = MANUFACTURER_HUNTERSPRIDE
- gate_loaded = TRUE
- fire_delay = 0.6 SECONDS
- wield_slowdown = 0.5
- spread_unwielded = 20
- spread = 6
- recoil = 2
- recoil_unwielded = 4
-
-/obj/item/gun/ballistic/revolver/ashhand/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/ammo_hud/revolver)
-
-/obj/item/gun/ballistic/revolver/firebrand
- name = "\improper HP Firebrand"
- desc = "An archaic precursor to revolver-type firearms, this gun was rendered completely obsolete millennia ago. While fast to fire, it is extremely inaccurate. Uses .357 ammo."
- icon_state = "pepperbox"
- item_state = "hp_generic_fresh"
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
-
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/pepperbox
- spread = 20
- manufacturer = MANUFACTURER_HUNTERSPRIDE
- spread_unwielded = 50
- fire_delay = 0 SECONDS
- gate_offset = 4
- semi_auto = TRUE
- safety_wording = "safety"
-
-/obj/item/gun/ballistic/revolver/firebrand/no_mag
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/revolver/shadow
- name = "\improper HP Shadow"
- desc = "A mid-size revolver. Despite the antiquated design, it is cheap, reliable, and stylish, making it a favorite among fast-drawing spacers and the officers of various militaries, as well as small-time police units. Chambered in .44."
- fire_sound = 'sound/weapons/gun/revolver/cattleman.ogg'
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
- icon_state = "shadow"
- item_state = "hp_generic"
-
- mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44
- manufacturer = MANUFACTURER_HUNTERSPRIDE
- obj_flags = UNIQUE_RENAME
- gate_loaded = TRUE
- unique_reskin = list("Shadow" = "shadow",
- "Army" = "shadow_army",
- "General" = "shadow_general",
- "Frontier Scout" = "shadow_frontier",
- "Nanotrasen Special" = "shadow_nanotrasen",
- "Hired Gun" = "shadow_hiredgun",
- "Buntline" = "shadow_buntline",
- "Cavalry Special" = "shadow_cavalry"
- )
-
- recoil = 0 //weaker than normal revolver, no recoil
- spread_unwielded = 10
-
-/obj/item/gun/ballistic/revolver/shadow/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/ammo_hud/revolver)
-
-/obj/item/gun/ballistic/revolver/shadow/no_mag
- spawnwithmagazine = FALSE
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index a61413057606..b60ab788ba80 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -5,10 +5,12 @@
mob_overlay_icon = 'icons/mob/clothing/back.dmi'
icon_state = "hunting"
item_state = "hunting"
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/boltaction
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/boltaction,
+ )
bolt_wording = "bolt"
w_class = WEIGHT_CLASS_BULKY
- weapon_weight = WEAPON_HEAVY
slot_flags = ITEM_SLOT_BACK
bolt_type = BOLT_TYPE_STANDARD
semi_auto = FALSE
@@ -29,7 +31,7 @@
spread_unwielded = 48
recoil = -3
recoil_unwielded = 4
- wield_slowdown = 1
+ wield_slowdown = RIFLE_SLOWDOWN
wield_delay = 1.2 SECONDS
/obj/item/gun/ballistic/rifle/update_overlays()
@@ -51,7 +53,7 @@
/obj/item/gun/ballistic/rifle/eject_magazine(mob/user, display_message = TRUE, obj/item/ammo_box/magazine/tac_load = null)
if (!bolt_locked && empty_autoeject)
- to_chat(user, "The bolt is closed!")
+ to_chat(user, span_notice("The bolt is closed!"))
return
return ..()
@@ -62,7 +64,7 @@
/obj/item/gun/ballistic/rifle/attackby(obj/item/A, mob/user, params)
if (!bolt_locked)
- to_chat(user, "The bolt is closed!")
+ to_chat(user, span_notice("The bolt is closed!"))
return
return ..()
@@ -70,113 +72,6 @@
. = ..()
. += "The bolt is [bolt_locked ? "open" : "closed"]."
-/obj/item/gun/ballistic/rifle/illestren
- name = "\improper HP Illestren"
- desc = "A sturdy and conventional bolt-action rifle. One of Hunter's Pride's most successful firearms, the Illestren is popular among colonists, pirates, snipers, and countless others. Chambered in 8x50mmR."
- icon_state = "illestren"
- item_state = "illestren"
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
-
- sawn_desc = "An Illestren rifle sawn down to a ridiculously small size. There was probably a reason it wasn't made this short to begin with, but it still packs a punch."
- eject_sound = 'sound/weapons/gun/rifle/vickland_unload.ogg'
- eject_empty_sound = 'sound/weapons/gun/rifle/vickland_unload.ogg'
-
- internal_magazine = FALSE
- mag_type = /obj/item/ammo_box/magazine/illestren_a850r
- empty_autoeject = TRUE
- eject_sound_vary = FALSE
- can_be_sawn_off = TRUE
- manufacturer = MANUFACTURER_HUNTERSPRIDE
-
-/obj/item/gun/ballistic/rifle/illestren/empty //i had to name it empty instead of no_mag because else it wouldnt work with guncases. sorry!
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/rifle/illestren/sawoff(forced = FALSE)
- . = ..()
- if(.)
- spread = 24
- spread_unwielded = 30
- item_state = "illestren_sawn"
- mob_overlay_state = item_state
- weapon_weight = WEAPON_MEDIUM //you can fire it onehanded, makes it worse than worse than useless onehanded, but you can
-
-/obj/item/gun/ballistic/rifle/illestren/blow_up(mob/user)
- . = FALSE
- if(chambered && chambered.BB)
- process_fire(user, user, FALSE)
- . = TRUE
-
-/obj/item/gun/ballistic/rifle/illestren/factory
- desc = "A sturdy and conventional bolt-action rifle. One of Hunter's Pride's most successful firearms, this example has been kept in excellent shape and may as well be fresh out of the workshop. Chambered in 8x50mmR."
- icon_state = "illestren_factory"
- item_state = "illestren_factory"
-
-/obj/item/gun/ballistic/rifle/illestren/sawoff(forced = FALSE)
- . = ..()
- if(.)
- item_state = "illestren_factory_sawn"
- mob_overlay_state = item_state
-
-/obj/item/gun/ballistic/rifle/illestren/sawn
- desc = "An Illestren rifle sawn down to a ridiculously small size. There was probably a reason it wasn't made this short to begin with, but it still packs a punch."
- sawn_off = TRUE
-
-/obj/item/gun/ballistic/rifle/solgov
- name = "SSG-669C"
- desc = "A bolt-action sniper rifle used by Solarian troops. Beloved for its rotary design and accuracy. Chambered in 8x58mm Caseless."
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction/solgov
- icon_state = "ssg669c"
- item_state = "ssg669c"
- icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
-
- fire_sound = 'sound/weapons/gun/rifle/ssg669c.ogg'
- can_be_sawn_off = FALSE
-
- zoomable = TRUE
- zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
- zoom_out_amt = 5
-
- manufacturer = MANUFACTURER_SOLARARMORIES
- spread = -5
- spread_unwielded = 20
- recoil = 0
- recoil_unwielded = 4
- wield_slowdown = 1
- wield_delay = 1.3 SECONDS
-
-/obj/item/gun/ballistic/rifle/scout
- name = "HP Scout"
- desc = "A powerful bolt-action rifle usually given to mercenary hunters of the Saint-Roumain Militia, equally suited for taking down big game or two-legged game. Chambered in .300 Magnum."
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
- icon_state = "scout"
- item_state = "scout"
-
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction/smile
- fire_sound = 'sound/weapons/gun/rifle/scout.ogg'
-
- rack_sound = 'sound/weapons/gun/rifle/scout_bolt_out.ogg'
- bolt_drop_sound = 'sound/weapons/gun/rifle/scout_bolt_in.ogg'
-
- can_be_sawn_off = FALSE
-
- zoomable = TRUE
- zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
- zoom_out_amt = 5
-
- manufacturer = MANUFACTURER_HUNTERSPRIDE
-
-/obj/item/gun/ballistic/rifle/scout/no_mag
- spawnwithmagazine = FALSE
-
/obj/item/gun/ballistic/rifle/polymer
name = "polymer survivor rifle"
desc = "A bolt-action rifle made of scrap, desperation, and luck. Likely to shatter at any moment. Chambered in 7.62x40mm."
@@ -185,6 +80,9 @@
item_state = "crackhead_rifle"
weapon_weight = WEAPON_HEAVY
w_class = WEIGHT_CLASS_BULKY
- mag_type = /obj/item/ammo_box/magazine/internal/boltaction/polymer
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/boltaction/polymer
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/boltaction/polymer,
+ )
can_be_sawn_off = FALSE
manufacturer = MANUFACTURER_NONE
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index ab85fb9a01c4..551856a088b1 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -11,7 +11,10 @@
force = 10
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
- mag_type = /obj/item/ammo_box/magazine/internal/shot
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot,
+ )
semi_auto = FALSE
internal_magazine = TRUE
casing_ejector = FALSE
@@ -27,7 +30,7 @@
default_firemode = FIREMODE_SEMIAUTO
fire_select_icon_state_prefix = "sg_"
- wield_slowdown = 0.45
+ wield_slowdown = SHOTGUN_SLOWDOWN
wield_delay = 0.8 SECONDS
spread = 4
@@ -48,85 +51,6 @@
return TRUE
return FALSE
-// BRIMSTONE SHOTGUN //
-
-/obj/item/gun/ballistic/shotgun/brimstone
- name = "HP Brimstone"
- desc = "A simple and sturdy pump-action shotgun sporting a 5-round capacity, manufactured by Hunter's Pride. Found widely throughout the Frontier in the hands of hunters, pirates, police, and countless others. Chambered in 12g."
- sawn_desc = "A stockless and shortened pump-action shotgun. The worsened recoil and accuracy make it a poor sidearm anywhere beyond punching distance."
- fire_sound = 'sound/weapons/gun/shotgun/brimstone.ogg'
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
-
- icon_state = "brimstone"
- item_state = "brimstone"
-
- gun_firemodes = list(FIREMODE_FULLAUTO)
- default_firemode = FIREMODE_FULLAUTO
-
- mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal
- manufacturer = MANUFACTURER_HUNTERSPRIDE
- fire_delay = 0.05 SECONDS //slamfire
- rack_delay = 0.2 SECONDS
-
- can_be_sawn_off = TRUE
-
-
-/obj/item/gun/ballistic/shotgun/brimstone/sawoff(forced = FALSE)
- . = ..()
- if(.)
- weapon_weight = WEAPON_MEDIUM
- wield_slowdown = 0.25
- wield_delay = 0.3 SECONDS //OP? maybe
-
- spread = 18
- spread_unwielded = 25
- recoil = 5 //your punishment for sawing off an short shotgun
- recoil_unwielded = 8
- item_state = "illestren_factory_sawn" // i couldnt care about making another sprite, looks close enough
- mob_overlay_state = item_state
-
-/obj/item/gun/ballistic/shotgun/brimstone/no_mag
- spawnwithmagazine = FALSE
-// HELLFIRE SHOTGUN //
-
-/obj/item/gun/ballistic/shotgun/hellfire
- name = "HP Hellfire"
- desc = "A hefty pump-action riot shotgun with a seven-round tube, manufactured by Hunter's Pride. Especially popular among the Frontier's police forces. Chambered in 12g."
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
- icon_state = "hellfire"
- item_state = "hellfire"
-
- 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 = 0.1 SECONDS
-
-/obj/item/gun/ballistic/shotgun/hellfire/sawoff(forced = FALSE)
- . = ..()
- if(.)
- var/obj/item/ammo_box/magazine/internal/tube = magazine
- tube.max_ammo = 5 //this makes the gun so much worse
-
- 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
- item_state = "dshotgun_sawn" // ditto
- mob_overlay_state = item_state
-
-/obj/item/gun/ballistic/shotgun/hellfire/no_mag
- spawnwithmagazine = FALSE
// Automatic Shotguns//
/obj/item/gun/ballistic/shotgun/automatic
spread = 4
@@ -137,24 +61,7 @@
manufacturer = MANUFACTURER_NANOTRASEN
semi_auto = TRUE
-//im not sure what to do with the combat shotgun, as it's functionally the same as the semi auto shotguns except it automattically racks instead of being semi-auto
-
-/obj/item/gun/ballistic/shotgun/automatic/combat
- name = "combat shotgun"
- desc = "A semi-automatic shotgun with tactical furniture and six-shell capacity underneath."
- icon_state = "cshotgun"
- item_state = "shotgun_combat"
- fire_delay = 0.5 SECONDS
- mag_type = /obj/item/ammo_box/magazine/internal/shot/com
- w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/gun/ballistic/shotgun/automatic/combat/compact
- name = "compact combat shotgun"
- desc = "A compact version of the semi-automatic combat shotgun. For close encounters."
- icon_state = "cshotgunc"
- mag_type = /obj/item/ammo_box/magazine/internal/shot/com/compact
- w_class = WEIGHT_CLASS_NORMAL
- weapon_weight = WEAPON_MEDIUM
+ gunslinger_recoil_bonus = 1
//Dual Feed Shotgun
@@ -169,7 +76,10 @@
icon_state = "cycler"
- mag_type = /obj/item/ammo_box/magazine/internal/shot/tube
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/tube
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/tube,
+ )
w_class = WEIGHT_CLASS_HUGE
var/toggled = FALSE
var/obj/item/ammo_box/magazine/internal/shot/alternate_magazine
@@ -182,7 +92,7 @@
/obj/item/gun/ballistic/shotgun/automatic/dual_tube/Initialize()
. = ..()
if (!alternate_magazine)
- alternate_magazine = new mag_type(src)
+ alternate_magazine = new default_ammo_type(src)
/obj/item/gun/ballistic/shotgun/automatic/dual_tube/attack_self(mob/living/user)
if(!chambered && magazine.contents.len)
@@ -211,160 +121,15 @@
desc = "A variation of the Bulldog, seized from Syndicate armories by deserting troopers then modified to IRMG's standards."
icon_state = "bulldog_inteq"
item_state = "bulldog_inteq"
- mag_type = /obj/item/ammo_box/magazine/m12g_bulldog
+ default_ammo_type = /obj/item/ammo_box/magazine/m12g_bulldog
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m12g_bulldog,
+ )
manufacturer = MANUFACTURER_INTEQ
-EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
-
-
-/////////////////////////////
-// DOUBLE BARRELED SHOTGUN //
-/////////////////////////////
+NO_MAG_GUN_HELPER(shotgun/automatic/bulldog/inteq)
-/obj/item/gun/ballistic/shotgun/doublebarrel
- name = "double-barreled shotgun"
- desc = "A classic break action shotgun, hand-made in a Hunter's Pride workshop. Both barrels can be fired in quick succession or even simultaneously. Guns like this have been popular with hunters, sporters, and criminals for millennia. Chambered in 12g."
- sawn_desc = "A break action shotgun cut down to the size of a sidearm. While the recoil is even harsher, it offers a lot of power in a very small package. Chambered in 12g."
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
-
- base_icon_state = "dshotgun"
-
- icon_state = "dshotgun"
- item_state = "dshotgun"
-
- rack_sound = 'sound/weapons/gun/shotgun/dbshotgun_break.ogg'
- bolt_drop_sound = 'sound/weapons/gun/shotgun/dbshotgun_close.ogg'
-
- w_class = WEIGHT_CLASS_BULKY
- weapon_weight = WEAPON_MEDIUM
- force = 10
- flags_1 = CONDUCT_1
- slot_flags = ITEM_SLOT_BACK
- mag_type = /obj/item/ammo_box/magazine/internal/shot/dual
-
- obj_flags = UNIQUE_RENAME
- unique_reskin = list("Default" = "dshotgun",
- "Stainless Steel" = "dshotgun_white",
- "Stained Green" = "dshotgun_green"
- )
- semi_auto = TRUE
- can_be_sawn_off = TRUE
- bolt_type = BOLT_TYPE_NO_BOLT
- pb_knockback = 3 // it's a super shotgun!
- manufacturer = MANUFACTURER_HUNTERSPRIDE
- bolt_wording = "barrel"
-
- burst_delay = 0.05 SECONDS
- burst_size = 2
- gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_BURST)
- default_firemode = FIREMODE_SEMIAUTO
-
-/obj/item/gun/ballistic/shotgun/doublebarrel/unique_action(mob/living/user)
- if (bolt_locked == FALSE)
- to_chat(user, "You snap open the [bolt_wording] of \the [src].")
- playsound(src, rack_sound, rack_sound_volume, rack_sound_vary)
- chambered = null
- var/num_unloaded = 0
- for(var/obj/item/ammo_casing/casing_bullet in get_ammo_list(FALSE, TRUE))
- casing_bullet.forceMove(drop_location())
- var/angle_of_movement =(rand(-3000, 3000) / 100) + dir2angle(turn(user.dir, 180))
- casing_bullet.AddComponent(/datum/component/movable_physics, _horizontal_velocity = rand(450, 550) / 100, _vertical_velocity = rand(400, 450) / 100, _horizontal_friction = rand(20, 24) / 100, _z_gravity = PHYSICS_GRAV_STANDARD, _z_floor = 0, _angle_of_movement = angle_of_movement, _bounce_sound = casing_bullet.bounce_sfx_override)
-
- num_unloaded++
- SSblackbox.record_feedback("tally", "station_mess_created", 1, casing_bullet.name)
- if (num_unloaded)
- playsound(user, eject_sound, eject_sound_volume, eject_sound_vary)
- update_appearance()
- bolt_locked = TRUE
- update_appearance()
- return
- drop_bolt(user)
-
-/obj/item/gun/ballistic/shotgun/doublebarrel/drop_bolt(mob/user = null)
- playsound(src, bolt_drop_sound, bolt_drop_sound_volume, FALSE)
- if (user)
- to_chat(user, "You snap the [bolt_wording] of \the [src] closed.")
- chamber_round()
- bolt_locked = FALSE
- update_appearance()
-
-/obj/item/gun/ballistic/shotgun/doublebarrel/can_shoot()
- if (bolt_locked)
- return FALSE
- return ..()
-
-/obj/item/gun/ballistic/shotgun/doublebarrel/attackby(obj/item/A, mob/user, params)
- if (!bolt_locked)
- to_chat(user, "The [bolt_wording] is shut closed!")
- return
- return ..()
-
-/obj/item/gun/ballistic/shotgun/doublebarrel/update_icon_state()
- . = ..()
- if(current_skin)
- icon_state = "[unique_reskin[current_skin]][sawn_off ? "_sawn" : ""][bolt_locked ? "_open" : ""]"
- else
- icon_state = "[base_icon_state || initial(icon_state)][sawn_off ? "_sawn" : ""][bolt_locked ? "_open" : ""]"
-
-
-/obj/item/gun/ballistic/shotgun/doublebarrel/AltClick(mob/user)
- . = ..()
- if(unique_reskin && !current_skin && user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY) && (!bolt_locked))
- reskin_obj(user)
-
-/obj/item/gun/ballistic/shotgun/doublebarrel/sawoff(forced = FALSE)
- . = ..()
- 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
- item_state = "dshotgun_sawn"
- mob_overlay_state = item_state
-
-/obj/item/gun/ballistic/shotgun/doublebarrel/no_mag
- spawnwithmagazine = FALSE
-
-// sawn off beforehand
-/obj/item/gun/ballistic/shotgun/doublebarrel/presawn
- name = "sawn-off double-barreled shotgun"
- desc = "A break action shotgun cut down to the size of a sidearm. While the recoil is even harsher, it offers a lot of power in a very small package. Chambered in 12g."
- sawn_off = TRUE
- weapon_weight = WEAPON_MEDIUM
- w_class = WEIGHT_CLASS_NORMAL
- slot_flags = ITEM_SLOT_BELT
-
- wield_slowdown = 0.25
- wield_delay = 0.3 SECONDS //OP? maybe
-
- spread = 8
- spread_unwielded = 15
- recoil = 3 //or not
- recoil_unwielded = 5
- item_state = "dshotgun_sawn"
- mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/lethal
-
-/obj/item/gun/ballistic/shotgun/doublebarrel/roumain
- name = "HP antique double-barreled shotgun"
- desc = "A special-edition shotgun hand-made by Hunter's Pride with a high-quality walnut stock inlaid with brass scrollwork. Shotguns like this are very rare outside of the Saint-Roumain Militia's ranks. Otherwise functionally identical to a common double-barreled shotgun. Chambered in 12g."
- sawn_desc = "A special-edition Hunter's Pride shotgun, cut down to the size of a sidearm by some barbarian. The brass inlay on the stock and engravings on the barrel have been obliterated in the process, destroying any value beyond its use as a crude sidearm."
- base_icon_state = "dshotgun_srm"
- icon_state = "dshotgun_srm"
- item_state = "dshotgun_srm"
- unique_reskin = null
-
-/obj/item/gun/ballistic/shotgun/doublebarrel/roumain/sawoff(forced = FALSE)
- . = ..()
- if(.)
- item_state = "dshotgun_srm_sawn"
// IMPROVISED SHOTGUN //
@@ -372,8 +137,8 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
name = "improvised shotgun"
desc = "A length of pipe and miscellaneous bits of scrap fashioned into a rudimentary single-shot shotgun."
icon = 'icons/obj/guns/projectile.dmi'
- lefthand_file = GUN_LEFTHAND_ICON
- righthand_file = GUN_RIGHTHAND_ICON
+ lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi'
mob_overlay_icon = null
base_icon_state = "ishotgun"
@@ -382,7 +147,10 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
w_class = WEIGHT_CLASS_BULKY
force = 10
slot_flags = null
- mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/improvised
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/improvised,
+ )
sawn_desc = "I'm just here for the gasoline."
unique_reskin = null
var/slung = FALSE
@@ -426,53 +194,6 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/sawn
sawn_off = TRUE
-/obj/item/gun/ballistic/shotgun/automatic/combat/compact/compact
- name = "compact compact combat shotgun"
- desc = "A compact version of the compact version of the semi automatic combat shotgun. For when you want a gun the same size as your brain."
- icon_state = "cshotguncc"
- mag_type = /obj/item/ammo_box/magazine/internal/shot/com/compact/compact
- w_class = WEIGHT_CLASS_SMALL
- sawn_desc = "You know, this isn't funny anymore."
- can_be_sawn_off = TRUE
-
-/obj/item/gun/ballistic/shotgun/automatic/combat/compact/compact/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
- if(prob(0 + (magazine.ammo_count() * 20))) //minimum probability of 20, maximum of 60
- playsound(user, fire_sound, fire_sound_volume, vary_fire_sound)
- to_chat(user, "[src] blows up in your face!")
- if(prob(25))
- user.take_bodypart_damage(0,75)
- explosion(src, 0, 0, 1, 1)
- user.dropItemToGround(src)
- else
- user.take_bodypart_damage(0,50)
- user.dropItemToGround(src)
- return 0
- ..()
-
-/obj/item/gun/ballistic/shotgun/automatic/combat/compact/compact/compact
- name = "compact compact compact combat shotgun"
- desc = "A compact version of the compact version of the compact version of the semi automatic combat shotgun. It's a miracle it works..."
- icon_state = "cshotgunccc"
- mag_type = /obj/item/ammo_box/magazine/internal/shot/com/compact/compact/compact
- w_class = WEIGHT_CLASS_TINY
- sawn_desc = "Sigh. This is a trigger attached to a bullet."
- can_be_sawn_off = TRUE
-
-/obj/item/gun/ballistic/shotgun/automatic/combat/compact/compact/compact/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
- if(prob(50)) //It's going to blow up.
- playsound(user, fire_sound, fire_sound_volume, vary_fire_sound)
- if(prob(50))
- to_chat(user, "Fu-")
- user.take_bodypart_damage(100)
- explosion(src, 0, 0, 1, 1)
- user.dropItemToGround(src)
- else
- to_chat(user, "[src] blows up in your face! What a surprise.")
- user.take_bodypart_damage(100)
- user.dropItemToGround(src)
- return 0
- ..()
-
//god fucking bless brazil
/obj/item/gun/ballistic/shotgun/doublebarrel/brazil
name = "six-barreled \"TRABUCO\" shotgun"
@@ -482,11 +203,16 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
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'
+ inhand_x_dimension = 64
+ inhand_y_dimension = 64
item_state = "shotgun_qb"
w_class = WEIGHT_CLASS_BULKY
force = 15 //blunt edge and really heavy
attack_verb = list("bludgeoned", "smashed")
- mag_type = /obj/item/ammo_box/magazine/internal/shot/sex
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/sex
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/sex,
+ )
burst_size = 6
burst_delay = 0.04 SECONDS //?? very weird number
pb_knockback = 12
@@ -529,281 +255,7 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog/inteq)
recoil_unwielded = 200
recoil_backtime_multiplier = 1
fire_sound_volume = 100
- mag_type = /obj/item/ammo_box/magazine/internal/shot/hundred
-
-//Lever-Action Rifles
-/obj/item/gun/ballistic/shotgun/flamingarrow
- name = "HP Flaming Arrow"
- desc = "A sturdy and lightweight lever-action rifle with hand-stamped Hunter's Pride marks on the receiver. A popular choice among Frontier homesteaders for hunting small game and rudimentary self-defense. Chambered in .38."
- sawn_desc = "A lever-action rifle that has been sawed down and modified for extra portability. While surprisingly effective as a sidearm, the more important benefit is how much cooler it looks."
- base_icon_state = "flamingarrow"
- icon_state = "flamingarrow"
- item_state = "flamingarrow"
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
- inhand_x_dimension = 32
- inhand_y_dimension = 32
- mag_type = /obj/item/ammo_box/magazine/internal/shot/winchester
- fire_sound = 'sound/weapons/gun/rifle/flamingarrow.ogg'
- rack_sound = 'sound/weapons/gun/rifle/skm_cocked.ogg'
- bolt_wording = "lever"
- cartridge_wording = "bullet"
- can_be_sawn_off = TRUE
-
- wield_slowdown = 0.5
- wield_delay = 0.65 SECONDS
-
- spread = -5
- spread_unwielded = 7
-
- recoil = 0
- recoil_unwielded = 2
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/no_mag
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/update_icon_state()
- . = ..()
- if(current_skin)
- icon_state = "[unique_reskin[current_skin]][sawn_off ? "_sawn" : ""]"
- else
- icon_state = "[base_icon_state || initial(icon_state)][sawn_off ? "_sawn" : ""]"
-
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/rack(mob/user = null)
- . = ..()
- if(!wielded)
- SpinAnimation(7,1)
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
- var/fan = FALSE
- if(HAS_TRAIT(user, TRAIT_GUNSLINGER) && !semi_auto && wielded_fully && loc == user && !safety)
- fan = TRUE
- fire_delay = 0.35 SECONDS
- . = ..()
- fire_delay = src::fire_delay
- if(fan)
- rack()
- to_chat(user, "You quickly rack the [bolt_wording] of \the [src]!")
- balloon_alert_to_viewers("quickly racks!")
- fire_delay = 0 SECONDS
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/sawoff(forced = FALSE)
- . = ..()
- if(.)
- var/obj/item/ammo_box/magazine/internal/tube = magazine
- tube.max_ammo = 7
-
- item_state = "flamingarrow_sawn"
- mob_overlay_state = item_state
- weapon_weight = WEAPON_MEDIUM
-
- wield_slowdown = 0.25
- wield_delay = 0.2 SECONDS //THE COWBOY RIFLE
-
- spread = 4
- spread_unwielded = 12
-
- recoil = 0
- recoil_unwielded = 3
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/factory
- desc = "A sturdy and lightweight lever-action rifle with hand-stamped Hunter's Pride marks on the receiver. This example has been kept in excellent shape and may as well be fresh out of the workshop. Chambered in .38."
- icon_state = "flamingarrow_factory"
- base_icon_state = "flamingarrow_factory"
- item_state = "flamingarrow_factory"
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/factory/sawoff(forced = FALSE)
- . = ..()
- if(.)
- item_state = "flamingarrow_factory_sawn"
- mob_overlay_state = item_state
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/bolt
- name = "HP Flaming Bolt"
- desc = "A sturdy, excellently-made lever-action rifle. This one appears to be a genuine antique, kept in incredibly good condition despite its advanced age. Chambered in .38."
- base_icon_state = "flamingbolt"
- icon_state = "flamingbolt"
- item_state = "flamingbolt"
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/bolt/sawoff(forced = FALSE)
- . = ..()
- if(.)
- item_state = "flamingbolt_sawn"
- mob_overlay_state = item_state
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/absolution
- name = "HP Absolution"
- base_icon_state = "absolution"
- icon_state = "absolution"
- item_state = "absolution"
- fire_sound = 'sound/weapons/gun/revolver/shot.ogg'
- desc = "A large lever-action rifle with hand-stamped Hunter's Pride marks on the receiver and an 8 round ammunition capacity. More powerful than the Flaming Arrow, the Absolution is a popular pick for hunting larger fauna like bears and goliaths, especially when a bolt action's slower rate of fire would be a liability. Chambered in .357."
- sawn_desc = "A large lever-action rifle, sawn down for portability. It looks much cooler, but you should probably be using a revolver..."
- mag_type = /obj/item/ammo_box/magazine/internal/shot/winchester/absolution
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/absolution/sawoff(forced = FALSE)
- . = ..()
- if(.)
- var/obj/item/ammo_box/magazine/internal/tube = magazine
- tube.max_ammo = 8
-
- item_state = "illestren_sawn"
- mob_overlay_state = item_state
- weapon_weight = WEAPON_MEDIUM
-
- wield_slowdown = 0.25
- wield_delay = 0.2 SECONDS
-
- spread = 4
- spread_unwielded = 12
-
- recoil = 0
- recoil_unwielded = 3
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/absolution/no_mag
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/conflagration
- name = "HP Conflagration"
- base_icon_state = "conflagration"
- icon_state = "conflagration"
- item_state = "conflagration"
- fire_sound = 'sound/weapons/gun/shotgun/shot.ogg'
- desc = "A lightweight lever-action shotgun with a 5 round ammunition capacity. The lever action allows it to be cycled quickly and acurrately. In theory, you could ever operate it one-handed. Chambered in 12g."
- sawn_desc = "A lever action shotgun that's been sawed down for portability. The recoil makes it mostly useless outside of point-blank range, but it hits hard for its size and, more importantly, can be flipped around stylishly."
- mag_type = /obj/item/ammo_box/magazine/internal/shot/winchester/conflagration
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/conflagration/sawoff(forced = FALSE)
- . = ..()
- if(.)
- var/obj/item/ammo_box/magazine/internal/tube = magazine
- tube.max_ammo = 5
-
- item_state = "beacon_factory_sawn"
- mob_overlay_state = item_state
- weapon_weight = WEAPON_MEDIUM
-
- wield_slowdown = 0.25
- wield_delay = 0.2 SECONDS
-
- spread = 4
- spread_unwielded = 12
-
- recoil = 0
- recoil_unwielded = 3
-
-/obj/item/gun/ballistic/shotgun/flamingarrow/conflagration/no_mag
- spawnwithmagazine = FALSE
-
-//Elephant Gun
-/obj/item/gun/ballistic/shotgun/doublebarrel/twobore
- name = "HP Huntsman"
- desc = "A comically huge double-barreled rifle replete with brass inlays depicting flames and naturalistic scenes, clearly meant for the nastiest monsters the Frontier has to offer. If you want an intact trophy, don't aim for the head. Chambered in two-bore."
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
- inhand_x_dimension = 32
- inhand_y_dimension = 32
- base_icon_state = "huntsman"
- icon_state = "huntsman"
- item_state = "huntsman"
- unique_reskin = null
- attack_verb = list("bludgeoned", "smashed")
- mag_type = /obj/item/ammo_box/magazine/internal/shot/twobore
- w_class = WEIGHT_CLASS_BULKY
- force = 20 //heavy ass elephant gun, why wouldnt it be
- recoil = 4
- pb_knockback = 12
- fire_sound = 'sound/weapons/gun/shotgun/quadfire.ogg'
- rack_sound = 'sound/weapons/gun/shotgun/quadrack.ogg'
- load_sound = 'sound/weapons/gun/shotgun/quadinsert.ogg'
-
- can_be_sawn_off = FALSE
- fire_sound_volume = 80
- rack_sound_volume = 50
- manufacturer = MANUFACTURER_HUNTERSPRIDE
-
- gun_firemodes = list(FIREMODE_SEMIAUTO) //no dual burst for you
- default_firemode = FIREMODE_SEMIAUTO
-
-//Break-Action Rifle
-/obj/item/gun/ballistic/shotgun/doublebarrel/beacon
- name = "HP Beacon"
- desc = "A single-shot break-action rifle made by Hunter's Pride and sold to civilian hunters. Boasts excellent accuracy and stopping power. Uses .45-70 ammo."
- sawn_desc= "A single-shot break-action pistol chambered in .45-70. A bit difficult to aim."
- base_icon_state = "beacon"
- icon_state = "beacon"
- item_state = "beacon"
- unique_reskin = null
- inhand_x_dimension = 32
- inhand_y_dimension = 32
- mag_type = /obj/item/ammo_box/magazine/internal/shot/beacon
- fire_sound = 'sound/weapons/gun/revolver/shot_hunting.ogg'
- w_class = WEIGHT_CLASS_BULKY
- weapon_weight = WEAPON_MEDIUM
- force = 10
- obj_flags = UNIQUE_RENAME
- semi_auto = TRUE
- can_be_sawn_off = TRUE
- pb_knockback = 3
- wield_slowdown = 0.7
- spread_unwielded = 15
- spread = 0
- recoil = 0
- recoil_unwielded = 5
-
- gun_firemodes = list(FIREMODE_SEMIAUTO)
- default_firemode = FIREMODE_SEMIAUTO
-
-/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/sawoff(forced = FALSE)
- . = ..()
- if(.)
- item_state = "beacon_sawn"
- mob_overlay_state = item_state
- wield_slowdown = 0.5
- wield_delay = 0.5 SECONDS
-
- spread_unwielded = 20 //mostly the hunting revolver stats
- spread = 6
- recoil = 2
- recoil_unwielded = 4
-
-/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/no_mag
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/factory
- desc = "A single-shot break-action rifle made by Hunter's Pride and sold to civilian hunters. This example has been kept in excellent shape and may as well be fresh out of the workshop. Uses .45-70 ammo."
- sawn_desc= "A single-shot break-action pistol chambered in .45-70. A bit difficult to aim."
- base_icon_state = "beacon_factory"
- icon_state = "beacon_factory"
- item_state = "beacon_factory"
-
-/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/factory/sawoff(forced = FALSE)
- . = ..()
- if(.)
- item_state = "beacon_factory_sawn"
- mob_overlay_state = item_state
-
-//pre sawn off beacon
-/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/presawn
- name = "sawn-off HP Beacon"
- sawn_desc= "A single-shot break-action pistol chambered in .45-70. A bit difficult to aim."
- sawn_off = TRUE
- w_class = WEIGHT_CLASS_NORMAL
- slot_flags = ITEM_SLOT_BELT
-
- weapon_weight = WEAPON_MEDIUM
-
- item_state = "beacon_sawn"
- mob_overlay_state = "beacon_sawn"
- wield_slowdown = 0.5
- wield_delay = 0.5 SECONDS
-
- spread_unwielded = 20 //mostly the hunting revolver stats
- spread = 6
- recoil = 2
- recoil_unwielded = 4
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/hundred
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/hundred,
+ )
diff --git a/code/modules/projectiles/guns/ballistic/smg.dm b/code/modules/projectiles/guns/ballistic/smg.dm
index 6f52daaf2292..620c53583205 100644
--- a/code/modules/projectiles/guns/ballistic/smg.dm
+++ b/code/modules/projectiles/guns/ballistic/smg.dm
@@ -7,7 +7,7 @@
spread = 6
spread_unwielded = 10
- wield_slowdown = 0.35
+ wield_slowdown = SMG_SLOWDOWN
recoil_unwielded = 4
w_class = WEIGHT_CLASS_BULKY
@@ -33,7 +33,10 @@
mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
icon_state = "wt550"
item_state = "arg"
- mag_type = /obj/item/ammo_box/magazine/wt550m9
+ default_ammo_type = /obj/item/ammo_box/magazine/wt550m9
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/wt550m9,
+ )
actions_types = list()
show_magazine_on_sprite = TRUE
show_magazine_on_sprite_ammo = TRUE
@@ -42,7 +45,7 @@
fire_sound = 'sound/weapons/gun/smg/smg_heavy.ogg'
/obj/item/gun/ballistic/automatic/smg/wt550/no_mag
- spawnwithmagazine = FALSE
+ default_ammo_type = FALSE
/obj/item/gun/ballistic/automatic/smg/vector
name = "\improper Vector carbine"
@@ -53,44 +56,15 @@
mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
icon_state = "vector"
item_state = "vector"
- mag_type = /obj/item/ammo_box/magazine/smgm9mm //you guys remember when the autorifle was chambered in 9mm
+ default_ammo_type = /obj/item/ammo_box/magazine/smgm9mm
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/smgm9mm,
+ ) //you guys remember when the autorifle was chambered in 9mm
bolt_type = BOLT_TYPE_LOCKING
show_magazine_on_sprite = TRUE
weapon_weight = WEAPON_LIGHT
fire_sound = 'sound/weapons/gun/smg/vector_fire.ogg'
-
-/obj/item/gun/ballistic/automatic/smg/firestorm //weapon designed by Apogee-dev
- name = "HP Firestorm"
- desc = "An unconventional submachinegun, rarely issued to Saint-Roumain Militia mercenary hunters for outstanding situations where normal hunting weapons fall short. Chambered in .45."
- icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
- lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
- righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
- mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
-
- icon_state = "firestorm"
- item_state = "firestorm"
- mag_type = /obj/item/ammo_box/magazine/c45_firestorm_mag
- unique_mag_sprites_for_variants = TRUE
- burst_size = 1
- actions_types = list()
- fire_delay = 0.13 SECONDS
- bolt_type = BOLT_TYPE_OPEN
- rack_sound = 'sound/weapons/gun/smg/uzi_cocked.ogg'
- fire_sound = 'sound/weapons/gun/smg/firestorm.ogg'
-
-
- manufacturer = MANUFACTURER_HUNTERSPRIDE
- wield_slowdown = 0.4
-
-/obj/item/gun/ballistic/automatic/smg/firestorm/pan //spawns with pan magazine, can take sticks instead of just drums, not sure where this would be used, maybe erts?
- spawnwithmagazine = FALSE
-
-/obj/item/gun/ballistic/automatic/smg/firestorm/pan/Initialize()
- . = ..()
- magazine = new /obj/item/ammo_box/magazine/c45_firestorm_mag/pan(src)
- chamber_round()
-
/obj/item/gun/ballistic/automatic/smg/skm_carbine
name = "\improper SKM-24v"
desc = "The SKM-24v was a carbine modification of the SKM-24 during the Frontiersmen War. This, however, is just a shoddy imitation of that carbine, effectively an SKM-24 with a sawed down barrel and a folding wire stock. Can be fired with the stock folded, though accuracy suffers. Chambered in 4.6x30mm."
@@ -110,7 +84,10 @@
weapon_weight = WEAPON_MEDIUM
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/skm_545_39
+ default_ammo_type = /obj/item/ammo_box/magazine/skm_46_30
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/skm_46_30,
+ )
recoil = 2
recoil_unwielded = 6
@@ -119,7 +96,7 @@
spread_unwielded = 14
wield_delay = 0.6 SECONDS
- wield_slowdown = 0.35
+ wield_slowdown = SMG_SLOWDOWN
valid_attachments = list(
/obj/item/attachment/silencer,
@@ -161,7 +138,10 @@
icon_state = "skm_inteqsmg"
item_state = "skm_inteqsmg"
- mag_type = /obj/item/ammo_box/magazine/smgm10mm
+ default_ammo_type = /obj/item/ammo_box/magazine/smgm10mm
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/smgm10mm,
+ )
manufacturer = MANUFACTURER_INTEQ
fire_sound = 'sound/weapons/gun/smg/vector_fire.ogg'
@@ -188,14 +168,41 @@
)
default_attachments = list(/obj/item/attachment/foldable_stock/inteq)
-/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/saber
name = "\improper Nanotrasen Saber SMG"
desc = "A prototype full-auto 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors and a folding stock."
icon = 'icons/obj/guns/projectile.dmi'
- default_attachments = list(/obj/item/attachment/foldable_stock)
icon_state = "saber"
item_state = "gun"
- mag_type = /obj/item/ammo_box/magazine/smgm9mm
+
+ default_ammo_type = /obj/item/ammo_box/magazine/smgm9mm
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/smgm9mm,
+ )
+
+ fire_sound = 'sound/weapons/gun/smg/vector_fire.ogg'
+
+ 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'
+
+ spread = 7
+ spread_unwielded = 10
+
+ recoil = 0
+ recoil_unwielded = 4
+
+ wield_delay = 0.4 SECONDS
+
+ valid_attachments = list(
+ /obj/item/attachment/silencer,
+ /obj/item/attachment/laser_sight,
+ /obj/item/attachment/rail_light,
+ /obj/item/attachment/bayonet,
+ /obj/item/attachment/foldable_stock
+ )
+ default_attachments = list(/obj/item/attachment/foldable_stock)
bolt_type = BOLT_TYPE_LOCKING
show_magazine_on_sprite = TRUE
manufacturer = MANUFACTURER_NANOTRASEN_OLD
diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm
index 43a9415671d6..016cbe94f4c5 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -9,7 +9,10 @@
icon_state = "toysmg"
item_state = "toysmg"
- mag_type = /obj/item/ammo_box/magazine/toy/smg
+ default_ammo_type = /obj/item/ammo_box/magazine/toy/smg
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/toy/smg,
+ )
fire_sound = 'sound/items/syringeproj.ogg'
force = 0
throwforce = 0
@@ -29,7 +32,10 @@
item_state = "toypistol"
bolt_type = BOLT_TYPE_LOCKING
w_class = WEIGHT_CLASS_SMALL
- mag_type = /obj/item/ammo_box/magazine/toy/pistol
+ default_ammo_type = /obj/item/ammo_box/magazine/toy/pistol
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/toy/pistol,
+ )
fire_sound = 'sound/items/syringeproj.ogg'
burst_size = 1
fire_delay = 0.2 SECONDS
@@ -38,7 +44,7 @@
recoil_unwielded = -10
/obj/item/gun/ballistic/automatic/toy/pistol/riot
- mag_type = /obj/item/ammo_box/magazine/toy/pistol/riot
+ default_ammo_type = /obj/item/ammo_box/magazine/toy/pistol/riot
/obj/item/gun/ballistic/automatic/toy/pistol/riot/Initialize()
magazine = new /obj/item/ammo_box/magazine/toy/pistol/riot(src)
@@ -58,7 +64,10 @@
force = 0
throwforce = 0
- mag_type = /obj/item/ammo_box/magazine/internal/shot/toy
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/toy
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/toy,
+ )
fire_sound = 'sound/items/syringeproj.ogg'
item_flags = NONE
casing_ejector = FALSE
@@ -76,7 +85,10 @@
desc = "A weapon favored by many overactive children. Ages 8 and up."
icon_state = "foamcrossbow"
item_state = "crossbow"
- mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/toy/crossbow,
+ )
fire_sound = 'sound/items/syringeproj.ogg'
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index fe697c66f083..5b57ad51fbf6 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -3,6 +3,7 @@
desc = "A basic energy-based gun."
icon = 'icons/obj/guns/energy.dmi'
icon_state = "laser"
+ item_state = "spur"
muzzleflash_iconstate = "muzzle_flash_laser"
muzzle_flash_color = COLOR_SOFT_RED
@@ -18,13 +19,25 @@
fire_select_icon_state_prefix = "laser_"
+ default_ammo_type = /obj/item/stock_parts/cell/gun
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/gun,
+ /obj/item/stock_parts/cell/gun/upgraded,
+ /obj/item/stock_parts/cell/gun/empty,
+ /obj/item/stock_parts/cell/gun/upgraded/empty,
+ )
+
tac_reloads = FALSE
tactical_reload_delay = 1.2 SECONDS
-
+// [CELADON_REMOVE] - CELADON BALANCE - часть ненужной системы оффов
+// var/latch_closed = TRUE
+// var/latch_toggle_delay = 1.0 SECONDS
+// [/CELADON_REMOVE]
valid_attachments = list(
/obj/item/attachment/laser_sight,
/obj/item/attachment/rail_light,
- /obj/item/attachment/bayonet
+ /obj/item/attachment/bayonet,
+ /obj/item/attachment/sling
)
slot_available = list(
ATTACHMENT_SLOT_RAIL = 1
@@ -49,14 +62,16 @@
/obj/item/gun/energy/get_cell()
return cell
-/obj/item/gun/energy/Initialize()
+/obj/item/gun/energy/Initialize(mapload, spawn_empty)
. = ..()
- if(cell_type)
- cell = new cell_type(src)
- else
- cell = new(src)
- if(dead_cell)
- cell.use(cell.maxcharge)
+ if(spawn_empty)
+ if(internal_magazine)
+ spawn_no_ammo = TRUE
+ else
+ default_ammo_type = FALSE
+
+ if(default_ammo_type)
+ cell = new default_ammo_type(src, spawn_no_ammo)
update_ammo_types()
recharge_newshot(TRUE)
if(selfcharge)
@@ -103,7 +118,7 @@
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/gun/energy/attack_hand(mob/user)
- if(!internal_cell && loc == user && user.is_holding(src) && cell && tac_reloads)
+ if(!internal_magazine && loc == user && user.is_holding(src) && cell && tac_reloads)
eject_cell(user)
return
return ..()
@@ -114,10 +129,13 @@
update_appearance()
/obj/item/gun/energy/attackby(obj/item/A, mob/user, params)
- if (!internal_cell && istype(A, /obj/item/stock_parts/cell/gun))
+ if (!internal_magazine && (A.type in (allowed_ammo_types - blacklisted_ammo_types)))
var/obj/item/stock_parts/cell/gun/C = A
if (!cell)
+// [CELADON-EDIT] - CELADON BALANCE - продолжаем убирать систему люков оффов
+// return insert_cell(user, C) CELADON-EDIT -> ORIGINAL
insert_cell(user, C)
+// [/CELADON-EDIT]
else
if (tac_reloads)
eject_cell(user, C)
@@ -125,12 +143,19 @@
return ..()
/obj/item/gun/energy/proc/insert_cell(mob/user, obj/item/stock_parts/cell/gun/C)
- if(mag_size == MAG_SIZE_SMALL && !istype(C, /obj/item/stock_parts/cell/gun/mini))
- to_chat(user, span_warning("\The [C] doesn't seem to fit into \the [src]..."))
- return FALSE
- if(mag_size == MAG_SIZE_LARGE && !istype(C, /obj/item/stock_parts/cell/gun/large))
- to_chat(user, span_warning("\The [C] doesn't seem to fit into \the [src]..."))
- return FALSE
+// [CELADON-EDIT] - CELADON BALANCE - возвращает старый код для перезарядки батареек, убирает новый код люков
+// if(!latch_closed)
+// if(user.transferItemToLoc(C, src))
+// cell = C
+// to_chat(user, span_notice("You load the [C] into \the [src]."))
+// playsound(src, load_sound, load_sound_volume, load_sound_vary)
+// update_appearance()
+// return TRUE
+// else
+// to_chat(user, span_warning("You cannot seem to get \the [src] out of your hands!"))
+// return FALSE
+// else
+// to_chat(user, span_warning("The [src]'s cell retainment clip is latched!")) // CELADON-EDIT -> ORIGINAL
if(user.transferItemToLoc(C, src))
cell = C
to_chat(user, span_notice("You load the [C] into \the [src]."))
@@ -140,6 +165,7 @@
else
to_chat(user, span_warning("You cannot seem to get \the [src] out of your hands!"))
return FALSE
+// [/CELADON-EDIT]
/obj/item/gun/energy/proc/eject_cell(mob/user, obj/item/stock_parts/cell/gun/tac_load = null)
playsound(src, load_sound, load_sound_volume, load_sound_vary)
@@ -170,8 +196,37 @@
// to_chat(user, span_notice("You remove the power cell."))
// eject_cell(user)
// return ..()
-// [/CELADON-REMOVE]
-
+// [/CELADON-REMOVE] // ЕСЛИ БУДЕТ РАНТАЙМИТЬ, СНЕСТИ СНИЗУ
+
+// [CELADON-REMOVE] - CELADON BALANCE - часть новой бесполезной системы люков от оффов
+// //special is_type_in_list method to counteract problem with current method
+// /obj/item/gun/energy/proc/is_attachment_in_contents_list()
+// for(var/content_item in contents)
+// if(istype(content_item, /obj/item/attachment/))
+// return TRUE
+// return FALSE
+//
+// /obj/item/gun/energy/AltClick(mob/living/user)
+// if(!internal_magazine && latch_closed)
+// to_chat(user, span_notice("You start to unlatch the [src]'s power cell retainment clip..."))
+// if(do_after(user, latch_toggle_delay, src, IGNORE_USER_LOC_CHANGE))
+// to_chat(user, span_notice("You unlatch the [src]'s power cell retainment clip " + "OPEN" + "."))
+// playsound(src, 'sound/items/taperecorder/taperecorder_play.ogg', 50, FALSE)
+// tac_reloads = TRUE
+// latch_closed = FALSE
+// update_appearance()
+// else if(!internal_magazine && !latch_closed)
+// if(!cell && is_attachment_in_contents_list())
+// return ..() //should bring up the attachment menu if attachments are added. If none are added, it just does leaves the latch open
+// to_chat(user, span_warning("You start to latch the [src]'s power cell retainment clip..."))
+// if (do_after(user, latch_toggle_delay, src, IGNORE_USER_LOC_CHANGE))
+// to_chat(user, span_notice("You latch the [src]'s power cell retainment clip " + "CLOSED" + "."))
+// playsound(src, 'sound/items/taperecorder/taperecorder_close.ogg', 50, FALSE)
+// tac_reloads = FALSE
+// latch_closed = TRUE
+// update_appearance()
+// return
+// [/CELADON_REMOVE]
/obj/item/gun/energy/can_shoot(visuals)
if(safety && !visuals)
return FALSE
@@ -210,7 +265,17 @@
/obj/item/gun/energy/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
if(!chambered && can_shoot())
process_chamber() // If the gun was drained and then recharged, load a new shot.
+// [CELADON-REMOVE] - CELADON BALANCE - очередная часть системы оффов
+// ..() //process the gunshot as normal
+// if(!latch_closed && prob(65)) //make the cell slide out if it's fired while the retainment clip is unlatched, with a 65% probability
+// to_chat(user, span_warning("The [src]'s cell falls out!"))
+// eject_cell()
+// [/CELADON-REMOVE]
+
+// [CELADON-EDIT]
+// return // CELADON-EDIT -> ORIGINAL
return ..()
+// [/CELADON-EDIT]
/obj/item/gun/energy/proc/select_fire(mob/living/user)
select++
@@ -249,6 +314,22 @@
var/overlay_icon_state = "[icon_state]_charge"
var/obj/item/ammo_casing/energy/shot = ammo_type[modifystate ? select : 1]
var/ratio = get_charge_ratio()
+// [CELADON-REMOVE] - CELADON-BALANCE - очередная система люков оффов
+// if(ismob(loc) && !internal_magazine)
+// var/mutable_appearance/latch_overlay
+// latch_overlay = mutable_appearance('icons/obj/guns/cell_latch.dmi')
+// if(latch_closed)
+// if(cell)
+// latch_overlay.icon_state = "latch-on-full"
+// else
+// latch_overlay.icon_state = "latch-on-empty"
+// else
+// if(cell)
+// latch_overlay.icon_state = "latch-off-full"
+// else
+// latch_overlay.icon_state = "latch-off-empty"
+// . += latch_overlay
+// [/CELADON-REMOVE]
if(cell)
. += "[icon_state]_cell"
if(ratio == 0)
@@ -319,6 +400,10 @@
/obj/item/gun/energy/examine(mob/user)
. = ..()
+// [CELADON-REMOVE] - CELADON BALANCE - часть плохой системы оффов
+// if(!internal_magazine)
+// . += "The cell retainment latch is [latch_closed ? "CLOSED" : "OPEN"]. Alt-Click to toggle the latch."
+// [CELADON-REMOVE]
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
if(ammo_type.len > 1)
. += "You can switch firemodes by pressing the unique action key. By default, this is space"
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index 90bfa9a8ead1..14b0b4639d19 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -11,10 +11,12 @@
modifystate = TRUE
ammo_x_offset = 2
dual_wield_spread = 60
+ wield_slowdown = LASER_RIFLE_SLOWDOWN
manufacturer = MANUFACTURER_SHARPLITE_NEW
+ w_class = WEIGHT_CLASS_NORMAL
/obj/item/gun/energy/e_gun/empty_cell
- dead_cell = TRUE
+ spawn_no_ammo = TRUE
/obj/item/gun/energy/e_gun/mini
name = "miniature energy gun"
@@ -22,19 +24,21 @@
icon_state = "mini"
item_state = "gun"
w_class = WEIGHT_CLASS_SMALL
- cell_type = /obj/item/stock_parts/cell/gun/mini
- mag_size = MAG_SIZE_SMALL
+ default_ammo_type = /obj/item/stock_parts/cell/gun/mini
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/gun/mini,
+ )
throwforce = 11 //This is funny, trust me.
ammo_x_offset = 2
charge_sections = 3
wield_delay = 0.2 SECONDS
- wield_slowdown = 0.15
+ wield_slowdown = LASER_PISTOL_SLOWDOWN
spread = 2
spread_unwielded = 5
/obj/item/gun/energy/e_gun/mini/empty_cell
- dead_cell = TRUE
+ spawn_no_ammo = TRUE
/obj/item/gun/energy/e_gun/hades
name = "SL AL-655 'Hades' energy rifle"
@@ -43,7 +47,7 @@
ammo_x_offset = 2
charge_sections = 5
ammo_type = list(/obj/item/ammo_casing/energy/laser/assault, /obj/item/ammo_casing/energy/disabler)
- cell_type = /obj/item/stock_parts/cell/gun/upgraded
+ default_ammo_type = /obj/item/stock_parts/cell/gun/upgraded
weapon_weight = WEAPON_MEDIUM
w_class = WEIGHT_CLASS_BULKY
@@ -55,7 +59,7 @@
fire_delay = 0.2 SECONDS
wield_delay = 0.7 SECONDS
- wield_slowdown = 0.6
+ wield_slowdown = HEAVY_LASER_RIFLE_SLOWDOWN
spread_unwielded = 20
/obj/item/gun/energy/e_gun/old
@@ -69,7 +73,7 @@
/obj/item/gun/energy/e_gun/hos
name = "\improper X-01 MultiPhase Energy Gun"
desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
- cell_type = /obj/item/stock_parts/cell/gun/upgraded
+ default_ammo_type = /obj/item/stock_parts/cell/gun/upgraded
icon_state = "hoslaser"
force = 10
ammo_type = list(/obj/item/ammo_casing/energy/disabler/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/ion/hos, /obj/item/ammo_casing/energy/electrode/hos)
@@ -108,16 +112,21 @@
/obj/item/gun/energy/e_gun/turret
name = "hybrid turret gun"
- desc = "A heavy hybrid energy cannon with two settings: Stun and kill."
+ desc = "A heavy hybrid energy cannon with two settings: Stun and kill. ...It doesn't seem have a trigger, seems it can only be used as a turret."
icon_state = "turretlaser"
item_state = "turretlaser"
slot_flags = null
w_class = WEIGHT_CLASS_HUGE
+ default_ammo_type = null
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
weapon_weight = WEAPON_HEAVY
trigger_guard = TRIGGER_GUARD_NONE
ammo_x_offset = 2
+/obj/item/gun/energy/e_gun/turret/pre_fire(atom/target, mob/living/user, message, flag, params, zone_override, bonus_spread, dual_wielded_gun)
+ to_chat(user, span_notice("[src] is not designed to be fired by hand."))
+ return FALSE
+
/obj/item/gun/energy/e_gun/nuclear
name = "advanced energy gun"
desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell."
@@ -125,7 +134,7 @@
item_state = "nucgun"
charge_delay = 5
can_charge = FALSE
- internal_cell = TRUE
+ internal_magazine = TRUE
ammo_x_offset = 2
ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler)
selfcharge = 1
@@ -184,16 +193,18 @@
item_state = "gun"
ammo_x_offset = 2
charge_sections = 6
- mag_size = MAG_SIZE_SMALL
wield_delay = 0.2 SECONDS
- wield_slowdown = 0.15
+ wield_slowdown = LASER_PISTOL_SLOWDOWN
spread = 2
spread_unwielded = 5
ammo_type = list(/obj/item/ammo_casing/energy/disabler/hitscan, /obj/item/ammo_casing/energy/ion/cheap)
- cell_type = /obj/item/stock_parts/cell/gun/mini
+ default_ammo_type = /obj/item/stock_parts/cell/gun/mini
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/gun/mini,
+ )
/obj/item/gun/energy/e_gun/adv_stopping
name = "advanced stopping revolver"
@@ -215,6 +226,7 @@
weapon_weight = WEAPON_LIGHT
fire_delay = 0.13 SECONDS
+ wield_slowdown = LASER_SMG_SLOWDOWN
gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
default_firemode = FIREMODE_SEMIAUTO
@@ -229,8 +241,8 @@
icon_state = "iotshotgun"
item_state = "shotgun_combat"
shaded_charge = TRUE
- w_class = WEIGHT_CLASS_BULKY
ammo_type = list(/obj/item/ammo_casing/energy/disabler/scatter/ultima, /obj/item/ammo_casing/energy/laser/ultima)
+ w_class = WEIGHT_CLASS_BULKY
var/obj/item/modular_computer/integratedNTOS
var/NTOS_type = /obj/item/modular_computer/internal
@@ -249,3 +261,6 @@
dual_wield_spread = 140
shaded_charge = TRUE
manufacturer = MANUFACTURER_EOEHOMA
+
+/obj/item/gun/energy/e_gun/e11/empty_cell
+ spawn_no_ammo = TRUE
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 5d0e8d54e4e2..c7cebd1025be 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -4,12 +4,15 @@
icon_state = "kineticgun"
item_state = "kineticgun"
ammo_type = list(/obj/item/ammo_casing/energy/kinetic)
- cell_type = /obj/item/stock_parts/cell/emproof
+ default_ammo_type = /obj/item/stock_parts/cell/emproof
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/emproof,
+ )
item_flags = NONE
obj_flags = UNIQUE_RENAME
weapon_weight = WEAPON_LIGHT
automatic_charge_overlays = FALSE
- internal_cell = TRUE //prevents you from giving it an OP cell - WS Edit
+ internal_magazine = TRUE //prevents you from giving it an OP cell - WS Edit
custom_price = 750
w_class = WEIGHT_CLASS_BULKY
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index eff3d67b2df1..358492ded068 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -2,8 +2,6 @@
name = "SL L-204 laser gun"
desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal."
- icon_state = "laser"
- item_state = "laser"
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=2000)
ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
@@ -16,7 +14,7 @@
spread_unwielded = 10
/obj/item/gun/energy/laser/empty_cell
- dead_cell = TRUE
+ spawn_no_ammo = TRUE
/obj/item/gun/energy/laser/practice
name = "practice laser gun"
@@ -96,8 +94,10 @@
icon_state = "lasercannon"
item_state = "laser"
w_class = WEIGHT_CLASS_BULKY
- mag_size = MAG_SIZE_LARGE
- cell_type = "/obj/item/stock_parts/cell/gun/large"
+ default_ammo_type = /obj/item/stock_parts/cell/gun/large
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/gun/large,
+ )
force = 10
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
@@ -129,6 +129,7 @@
item_state = null
ammo_type = list(/obj/item/ammo_casing/energy/xray)
ammo_x_offset = 3
+ w_class = WEIGHT_CLASS_BULKY
////////Laser Tag////////////////////
@@ -170,8 +171,8 @@
inhand_y_dimension = 64
icon_state = "iotshotgun"
item_state = "shotgun_combat"
- w_class = WEIGHT_CLASS_BULKY
ammo_type = list(/obj/item/ammo_casing/energy/disabler/scatter/ultima)
+ w_class = WEIGHT_CLASS_BULKY
var/obj/item/modular_computer/integratedNTOS
var/NTOS_type = /obj/item/modular_computer/internal
manufacturer = MANUFACTURER_SHARPLITE_NEW
@@ -203,17 +204,19 @@
item_state = "gun"
ammo_x_offset = 2
charge_sections = 4
- mag_size = MAG_SIZE_SMALL
- w_class = WEIGHT_CLASS_NORMAL
- cell_type = /obj/item/stock_parts/cell/gun/mini
+ default_ammo_type = /obj/item/stock_parts/cell/gun/mini
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/gun/mini,
+ )
ammo_type = list(/obj/item/ammo_casing/energy/lasergun/hitscan)
manufacturer = MANUFACTURER_SHARPLITE_NEW
/obj/item/gun/energy/laser/hitscanpistol/examine_more(mob/user)
+ . = ..()
if(in_range(src, user) || isobserver(user))
- . = list("You examine [src] closer. Under the grip is a small inscription: \"NT CN SVALINN 462\".")
+ . += "You examine [src] closer. Under the grip is a small inscription: \"NT CN SVALINN 462\"."
else
- . = list("You try to examine [src] closer, but you're too far away.")
+ . += "You try to examine [src] closer, but you're too far away."
/obj/item/gun/energy/laser/e10
name = "E-10 laser pistol"
@@ -226,7 +229,7 @@
w_class = WEIGHT_CLASS_SMALL
wield_delay = 0.2 SECONDS
- wield_slowdown = 0.15
+ wield_slowdown = LASER_PISTOL_SLOWDOWN
spread = 2
spread_unwielded = 5
@@ -245,20 +248,22 @@
icon_state = "e50"
item_state = "e50"
- mag_size = MAG_SIZE_LARGE
- cell_type = /obj/item/stock_parts/cell/gun/large
+ default_ammo_type = /obj/item/stock_parts/cell/gun/large
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/gun/large,
+ )
ammo_type = list(/obj/item/ammo_casing/energy/laser/eoehoma/e50)
weapon_weight = WEAPON_HEAVY
+ w_class = WEIGHT_CLASS_BULKY
manufacturer = MANUFACTURER_EOEHOMA
wield_delay = 0.7 SECONDS
- wield_slowdown = 0.6
+ wield_slowdown = LASER_SNIPER_SLOWDOWN
spread_unwielded = 20
shaded_charge = FALSE
ammo_x_offset = 4
charge_sections = 2
- w_class = WEIGHT_CLASS_BULKY
slot_flags = 0
diff --git a/code/modules/projectiles/guns/energy/laser_gatling.dm b/code/modules/projectiles/guns/energy/laser_gatling.dm
index 22e6e57d8817..066b19386486 100644
--- a/code/modules/projectiles/guns/energy/laser_gatling.dm
+++ b/code/modules/projectiles/guns/energy/laser_gatling.dm
@@ -116,7 +116,10 @@
custom_materials = null
weapon_weight = WEAPON_MEDIUM
ammo_type = list(/obj/item/ammo_casing/energy/laser/minigun)
- cell_type = /obj/item/stock_parts/cell/crap
+ default_ammo_type = /obj/item/stock_parts/cell/crap
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/crap,
+ )
item_flags = NEEDS_PERMIT | SLOWS_WHILE_IN_HAND
can_charge = FALSE
var/obj/item/minigunpack/ammo_pack
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index 40fd10e94785..973297d1b4e4 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -13,8 +13,11 @@
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/laser)
- internal_cell = TRUE //prevents you from giving it an OP cell - WS Edit
- cell_type = /obj/item/stock_parts/cell/pulse //somone make this backpack mounted, or connected to the deathsquad suit at some point
+ internal_magazine = TRUE //prevents you from giving it an OP cell - WS Edit
+ default_ammo_type = /obj/item/stock_parts/cell/pulse
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/pulse,
+ ) //somone make this backpack mounted, or connected to the deathsquad suit at some point
manufacturer = MANUFACTURER_SHARPLITE_NEW
ammo_x_offset = 2
charge_sections = 6
@@ -38,9 +41,11 @@
slot_flags = ITEM_SLOT_BACK
icon_state = "pulse_carbine"
item_state = null
- internal_cell = FALSE
- mag_size = MAG_SIZE_LARGE //haha gun go brr
- cell_type = /obj/item/stock_parts/cell/gun/large
+ internal_magazine = FALSE
+ default_ammo_type = /obj/item/stock_parts/cell/gun/large
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/gun/large,
+ )
ammo_x_offset = 2
charge_sections = 4
@@ -69,14 +74,20 @@
slot_flags = ITEM_SLOT_BELT
icon_state = "pulse_pistol"
item_state = "gun"
- cell_type = /obj/item/stock_parts/cell/pulse/pistol
+ default_ammo_type = /obj/item/stock_parts/cell/pulse/pistol
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/pulse/pistol,
+ )
ammo_x_offset = 2
charge_sections = 4
/obj/item/gun/energy/pulse/destroyer
name = "pulse destroyer"
desc = "A heavy-duty energy rifle built for pure destruction."
- cell_type = /obj/item/stock_parts/cell/infinite
+ default_ammo_type = /obj/item/stock_parts/cell/infinite
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/infinite,
+ )
ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse)
/obj/item/gun/energy/pulse/destroyer/attack_self(mob/living/user)
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 067a4bbc5d97..ba8dfc7386a2 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -7,7 +7,6 @@
ammo_x_offset = 2
ammo_y_offset = 2
w_class = WEIGHT_CLASS_HUGE
- mag_size = MAG_SIZE_LARGE //yes, you can put the comically large cell in it. No, you aren't getting it roundstart. You slut.
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
ammo_type = list(/obj/item/ammo_casing/energy/ion)
@@ -17,7 +16,7 @@
return
/obj/item/gun/energy/ionrifle/empty_cell
- dead_cell = TRUE
+ spawn_no_ammo = TRUE
/obj/item/gun/energy/ionrifle/carbine
name = "ion carbine"
@@ -59,7 +58,10 @@
item_state = "c20r"
w_class = WEIGHT_CLASS_BULKY
ammo_type = list(/obj/item/ammo_casing/energy/meteor)
- cell_type = /obj/item/stock_parts/cell/potato
+ default_ammo_type = /obj/item/stock_parts/cell/potato
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/potato,
+ )
selfcharge = 1
/obj/item/gun/energy/meteorgun/pen
@@ -124,8 +126,8 @@
usesound = list('sound/items/welder.ogg', 'sound/items/welder2.ogg')
tool_behaviour = TOOL_DECONSTRUCT
wall_decon_damage = 200
- toolspeed = 0.9 //plasmacutters can be used like angle grinders, and are a bit faster
- internal_cell = TRUE //so you don't cheese through the need for plasma - WS EDIT
+ toolspeed = 1 //plasmacutters can be used like angle grinders
+ internal_magazine = TRUE //so you don't cheese through the need for plasma - WS EDIT
var/charge_cut = 100 //amount of charge used up to start action (multiplied by amount) and per progress_flash_divisor ticks of cutting
var/adv = FALSE
@@ -287,7 +289,10 @@
desc = "A modified energy weapon re-designed to fire 3D-printed flechettes, pulled directly from the cyborg's internal power source."
icon_state = "l6_cyborg"
icon = 'icons/obj/guns/projectile.dmi'
- cell_type = /obj/item/stock_parts/cell/secborg
+ default_ammo_type = /obj/item/stock_parts/cell/secborg
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/secborg,
+ )
ammo_type = list(/obj/item/ammo_casing/energy/c3dbullet)
can_charge = FALSE
use_cyborg_cell = TRUE
@@ -345,7 +350,7 @@
icon_state = "freezegun"
desc = "A gun that changes temperatures."
ammo_type = list(/obj/item/ammo_casing/energy/temp, /obj/item/ammo_casing/energy/temp/hot)
- cell_type = /obj/item/stock_parts/cell/gun/upgraded
+ default_ammo_type = /obj/item/stock_parts/cell/gun/upgraded
ammo_x_offset = 2
/obj/item/gun/energy/temperature/security
diff --git a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
index a244b188863a..9bc7ed9abac2 100644
--- a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
@@ -1,3 +1,7 @@
+#define CLIP_ATTACHMENTS list(list(/obj/item/attachment/silencer, /obj/item/attachment/laser_sight, /obj/item/attachment/rail_light, /obj/item/attachment/bayonet))
+#define CLIP_ATTACHMNENT_POINTS list()
+
+
//########### PISTOLS ###########//
/obj/item/gun/ballistic/automatic/pistol/cm23
name = "\improper CM-23"
@@ -10,7 +14,10 @@
icon_state = "cm23"
item_state = "clip_generic"
w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/cm23
+ default_ammo_type = /obj/item/ammo_box/magazine/cm23
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/cm23,
+ )
// can_suppress = FALSE
fire_sound = 'sound/weapons/gun/pistol/cm23.ogg'
rack_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg'
@@ -21,11 +28,29 @@
load_empty_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
eject_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
eject_empty_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
+
+ default_attachments = list(/obj/item/attachment/laser_sight)
+
+ slot_available = list(
+ ATTACHMENT_SLOT_MUZZLE = 1,
+ ATTACHMENT_SLOT_RAIL = 1
+ )
+
+ slot_offsets = list(
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 19,
+ "y" = 18,
+ )
+ )
+
recoil_unwielded = 3
+/obj/item/gun/ballistic/automatic/pistol/cm23/no_mag
+ default_ammo_type = FALSE
+
/obj/item/ammo_box/magazine/cm23
name = "CM-23 pistol magazine (10mm)"
- desc = "An 10-round magazine magazine designed for the CM-70 pistol. These rounds do moderate damage, but struggle against armor."
+ desc = "An 10-round magazine magazine designed for the CM-23 pistol. These rounds do moderate damage, but struggle against armor."
icon_state = "cm23_mag-1"
base_icon_state = "cm23_mag"
ammo_type = /obj/item/ammo_casing/c10mm
@@ -36,6 +61,9 @@
. = ..()
icon_state = "[base_icon_state]-[!!ammo_count()]"
+/obj/item/ammo_box/magazine/cm23/empty
+ start_empty = TRUE
+
/obj/item/gun/ballistic/automatic/pistol/cm70
name = "CM-70 machine pistol"
desc = "A compact machine pistol designed to rapidly fire 3-round bursts. Popular with officers and certain special units, the CM-70 is incredibly dangerous at close range. Chambered in 9mm."
@@ -43,10 +71,12 @@
lefthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi'
-
icon_state = "cm70"
item_state = "clip_generic"
- mag_type = /obj/item/ammo_box/magazine/m9mm_cm70
+ default_ammo_type = /obj/item/ammo_box/magazine/m9mm_cm70
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m9mm_cm70,
+ )
// can_suppress = FALSE
burst_size = 3
burst_delay = 0.1 SECONDS
@@ -77,6 +107,49 @@
. = ..()
icon_state = "[base_icon_state]_[ammo_count() == 1 ? 1 : round(ammo_count(),3)]"
+/obj/item/gun/ballistic/automatic/pistol/cm357
+ name = "\improper CM-357"
+ desc = "A semi-automatic magnum handgun designed specifically for BARD's megafauna removal unit, as standard handguns had proven useless as backup weapons. Its heft and power have also made it a status symbol among the few CLIP officers able to requisition one. Chambered in .357."
+ icon = 'icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi'
+
+ icon_state = "cm357"
+ item_state = "clip_generic"
+ w_class = WEIGHT_CLASS_NORMAL
+ default_ammo_type = /obj/item/ammo_box/magazine/cm357
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/cm357,
+ )
+ fire_sound = 'sound/weapons/gun/pistol/deagle.ogg'
+ rack_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg'
+ lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg'
+ manufacturer = MANUFACTURER_MINUTEMAN
+ load_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
+ load_empty_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
+ eject_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
+ eject_empty_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
+
+ recoil_unwielded = 4
+ recoil = 1
+
+NO_MAG_GUN_HELPER(automatic/pistol/cm357)
+
+/obj/item/ammo_box/magazine/cm357
+ name = "CM-357 pistol magazine (.357)"
+ desc = "A 7-round magazine designed for the CM-357 pistol. These rounds do good damage, but struggle against armor."
+ icon_state = "cm23_mag-1"
+ base_icon_state = "cm23_mag"
+ ammo_type = /obj/item/ammo_casing/a357
+ caliber = ".357"
+ max_ammo = 7
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/cm357/empty
+ start_empty = TRUE
+
//########### SMGS ###########//
/obj/item/gun/ballistic/automatic/smg/cm5
name = "\improper CM-5"
@@ -89,18 +162,16 @@
icon_state = "cm5"
item_state = "cm5"
- mag_type = /obj/item/ammo_box/magazine/cm5_9mm
+ default_ammo_type = /obj/item/ammo_box/magazine/cm5_9mm
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/cm5_9mm,
+ )
bolt_type = BOLT_TYPE_CLIP
weapon_weight = WEAPON_LIGHT
fire_sound = 'sound/weapons/gun/smg/cm5.ogg'
manufacturer = MANUFACTURER_MINUTEMAN
- valid_attachments = list(
- /obj/item/attachment/silencer,
- /obj/item/attachment/laser_sight,
- /obj/item/attachment/rail_light,
- /obj/item/attachment/bayonet
- )
+ valid_attachments = CLIP_ATTACHMENTS
slot_available = list(
ATTACHMENT_SLOT_MUZZLE = 1,
ATTACHMENT_SLOT_RAIL = 1
@@ -119,11 +190,14 @@
fire_select_icon_state_prefix = "clip_"
adjust_fire_select_icon_state_on_safety = TRUE
-EMPTY_GUN_HELPER(automatic/smg/cm5)
+NO_MAG_GUN_HELPER(automatic/smg/cm5)
+
+/obj/item/gun/ballistic/automatic/smg/cm5/rubber
+ default_ammo_type = /obj/item/ammo_box/magazine/cm5_9mm/rubber
/obj/item/ammo_box/magazine/cm5_9mm
name = "CM-5 magazine (9mm)"
- desc = "A 30-round magazine for 9mm submachine guns. These rounds do okay damage, but struggle against armor."
+ desc = "A 30-round magazine for the CM-5 submachine gun. These rounds do okay damage, but struggle against armor."
icon_state = "cm5_mag-1"
base_icon_state = "cm5_mag"
ammo_type = /obj/item/ammo_casing/c9mm
@@ -131,6 +205,11 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
max_ammo = 30
multiple_sprites = AMMO_BOX_FULL_EMPTY
+/obj/item/ammo_box/magazine/cm5_9mm/rubber
+ desc = "A 30-round magazine for the CM-5 submachine gun. These rubber rounds trade lethality for a heavy impact which can incapacitate targets. Performs even worse against armor."
+ caliber = "9mm rubber"
+ ammo_type = /obj/item/ammo_casing/c9mm/rubber
+
/obj/item/gun/ballistic/automatic/smg/cm5/compact
name = "\improper CM-5c"
desc = "A modification of the CM-5 featuring a dramatically shortened barrel and removed stock. Designed for CLIP-GOLD covert enforcement agents to maximize portability without sacrificing firepower, though accuracy at range is abysmal at best. Chambered in 9mm."
@@ -193,7 +272,7 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
/obj/item/gun/ballistic/automatic/smg/cm5/compact/AltClick(mob/user)
if(!current_case)
return ..()
- current_case.forceMove(get_turf(src))
+ user.put_in_hands(current_case)
icon = src::icon
base_icon_state = src::icon_state
item_state = src::item_state
@@ -229,7 +308,10 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
weapon_weight = WEAPON_MEDIUM
w_class = WEIGHT_CLASS_BULKY
bolt_type = BOLT_TYPE_CLIP
- mag_type = /obj/item/ammo_box/magazine/f4_308
+ default_ammo_type = /obj/item/ammo_box/magazine/f4_308
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/f4_308,
+ )
fire_sound = 'sound/weapons/gun/rifle/f4.ogg'
burst_size = 0
actions_types = list()
@@ -256,7 +338,7 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
)
)
- wield_slowdown = 2
+ wield_slowdown = DMR_SLOWDOWN
spread = -4
fire_select_icon_state_prefix = "clip_"
adjust_fire_select_icon_state_on_safety = TRUE
@@ -284,7 +366,10 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
fire_sound = 'sound/weapons/gun/sniper/cmf90.ogg'
- mag_type = /obj/item/ammo_box/magazine/f90
+ default_ammo_type = /obj/item/ammo_box/magazine/f90
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/f90,
+ )
bolt_type = BOLT_TYPE_CLIP
fire_delay = 1 SECONDS
@@ -294,7 +379,7 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
spread_unwielded = 35
recoil = 4
recoil_unwielded = 10
- wield_slowdown = 1
+ wield_slowdown = SNIPER_SLOWDOWN
wield_delay = 1.3 SECONDS
zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
@@ -329,7 +414,10 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
bolt_type = BOLT_TYPE_CLIP
- mag_type = /obj/item/ammo_box/magazine/p16
+ default_ammo_type = /obj/item/ammo_box/magazine/p16
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/p16,
+ )
spread = 2
wield_delay = 0.5 SECONDS
@@ -370,8 +458,6 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
icon_state = "cm40"
item_state = "cm40"
- fire_delay = 0
-
fire_sound = 'sound/weapons/gun/hmg/cm40.ogg'
rack_sound = 'sound/weapons/gun/hmg/cm40_cocked.ogg'
@@ -392,7 +478,10 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
manufacturer = MANUFACTURER_MINUTEMAN
- mag_type = /obj/item/ammo_box/magazine/cm40_762_40_box
+ default_ammo_type = /obj/item/ammo_box/magazine/cm40_762_40_box
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/cm40_762_40_box,
+ )
spread = 10
spread_unwielded = 35
@@ -400,7 +489,7 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
recoil = 2 //identical to other LMGS
recoil_unwielded = 7 //same as skm
- wield_slowdown = 1 //not as severe as other lmgs, but worse than the normal skm
+ wield_slowdown = SAW_SLOWDOWN //not as severe as other lmgs, but worse than the normal skm
wield_delay = 0.9 SECONDS //faster than normal lmgs, slower than stock skm
has_bipod = TRUE
@@ -448,7 +537,10 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
weapon_weight = WEAPON_MEDIUM
// can_suppress = FALSE
- mag_type = /obj/item/ammo_box/magazine/cm15_12g
+ default_ammo_type = /obj/item/ammo_box/magazine/cm15_12g
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/cm15_12g,
+ )
empty_indicator = FALSE
unique_mag_sprites_for_variants = FALSE
@@ -472,6 +564,9 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
spread_unwielded = 16
recoil = 1
recoil_unwielded = 4
- wield_slowdown = 0.6
+ wield_slowdown = HEAVY_SHOTGUN_SLOWDOWN
wield_delay = 0.65 SECONDS
+
+/obj/item/gun/ballistic/shotgun/cm15/incendiary
+ default_ammo_type = /obj/item/ammo_box/magazine/cm15_12g/incendiary
diff --git a/code/modules/projectiles/guns/manufacturer/clip_lanchester/lasers.dm b/code/modules/projectiles/guns/manufacturer/clip_lanchester/lasers.dm
index 2fbe0009a563..de0e28c85b15 100644
--- a/code/modules/projectiles/guns/manufacturer/clip_lanchester/lasers.dm
+++ b/code/modules/projectiles/guns/manufacturer/clip_lanchester/lasers.dm
@@ -12,7 +12,13 @@
gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
default_firemode = FIREMODE_SEMIAUTO
- cell_type = /obj/item/stock_parts/cell/gun
+ default_ammo_type = /obj/item/stock_parts/cell/gun
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/gun,
+ /obj/item/stock_parts/cell/gun/upgraded,
+ /obj/item/stock_parts/cell/gun/empty,
+ /obj/item/stock_parts/cell/gun/upgraded/empty,
+ )
ammo_type = list(/obj/item/ammo_casing/energy/kalix, /obj/item/ammo_casing/energy/disabler/hitscan)
manufacturer = MANUFACTURER_MINUTEMAN_LASER
diff --git a/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm b/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm
index 4e16d2d03512..10a55857cf88 100644
--- a/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm
+++ b/code/modules/projectiles/guns/manufacturer/etherbor/energy_gunsword.dm
@@ -14,9 +14,13 @@
fire_delay = 0.16 SECONDS
wield_delay = 0.7 SECONDS
- wield_slowdown = 0.35
+ wield_slowdown = LASER_RIFLE_SLOWDOWN
- cell_type = /obj/item/stock_parts/cell/gun/kalix
+ default_ammo_type = /obj/item/stock_parts/cell/gun/kalix
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/gun/kalix,
+ /obj/item/stock_parts/cell/gun/pgf,
+ )
ammo_type = list(/obj/item/ammo_casing/energy/kalix, /obj/item/ammo_casing/energy/disabler/hitscan)
load_sound = 'sound/weapons/gun/gauss/pistol_reload.ogg'
@@ -43,7 +47,7 @@
armour_penetration = -10
/obj/item/gun/energy/kalix/empty_cell
- dead_cell = TRUE
+ spawn_no_ammo = TRUE
/obj/item/gun/energy/kalix/pgf
name = "Etherbor BG-16"
@@ -54,7 +58,11 @@
gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
default_firemode = FIREMODE_SEMIAUTO
- cell_type = /obj/item/stock_parts/cell/gun/pgf
+ default_ammo_type = /obj/item/stock_parts/cell/gun/pgf
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/gun/pgf,
+ /obj/item/stock_parts/cell/gun/kalix,
+ )
ammo_type = list(/obj/item/ammo_casing/energy/kalix/pgf , /obj/item/ammo_casing/energy/disabler/hitscan)
/obj/projectile/beam/hitscan/kalix/pgf
@@ -81,12 +89,16 @@
modifystate = FALSE
wield_delay = 0.2 SECONDS
- wield_slowdown = 0.15
+ wield_slowdown = LASER_PISTOL_SLOWDOWN
spread = 2
spread_unwielded = 5
- cell_type = /obj/item/stock_parts/cell/gun/kalix
+ default_ammo_type = /obj/item/stock_parts/cell/gun/kalix
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/gun/kalix,
+ /obj/item/stock_parts/cell/gun/pgf,
+ )
ammo_type = list(/obj/item/ammo_casing/energy/kalix/pistol)
@@ -98,14 +110,13 @@
delay = 0
/obj/item/gun/energy/kalix/pistol/empty_cell
- dead_cell = TRUE
+ spawn_no_ammo = TRUE
/obj/item/gun/energy/kalix/pgf/heavy
name = "Etherbor HBG-7"
desc = "The HBG-7 is the standard-issue rifle weapon of the PGF. It comes with a special DMR mode that has greater armor piercing for dealing with armored targets."
icon_state = "pgfheavy"
item_state = "pgfheavy"
- w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
modifystate = FALSE
@@ -116,7 +127,7 @@
fire_delay = 0.2 SECONDS
wield_delay = 0.7 SECONDS
- wield_slowdown = 0.6
+ wield_slowdown = HEAVY_LASER_RIFLE_SLOWDOWN
spread = 0
spread_unwielded = 20
@@ -169,5 +180,5 @@
spread = -5
spread_unwielded = 40
- wield_slowdown = 1
+ wield_slowdown = LASER_SNIPER_SLOWDOWN
wield_delay = 1.3 SECONDS
diff --git a/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm b/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm
index 224712438b90..4a48dd5ea2b4 100644
--- a/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm
@@ -8,8 +8,10 @@
icon_state = "mauler"
item_state = "hp_generic"
- w_class = WEIGHT_CLASS_NORMAL
- mag_type = /obj/item/ammo_box/magazine/m9mm_mauler
+ default_ammo_type = /obj/item/ammo_box/magazine/m9mm_mauler
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m9mm_mauler,
+ )
fire_delay = 0.06 SECONDS
gun_firemodes = list(FIREMODE_FULLAUTO)
@@ -19,6 +21,8 @@
spread_unwielded = 50
recoil = 1
recoil_unwielded = 4
+ safety_multiplier = 2 //this means its twice as safe right?
+
fire_sound = 'sound/weapons/gun/pistol/mauler.ogg'
rack_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg'
@@ -58,7 +62,10 @@
icon_state = "spitter"
item_state = "spitter"
- mag_type = /obj/item/ammo_box/magazine/spitter_9mm
+ default_ammo_type = /obj/item/ammo_box/magazine/spitter_9mm
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/spitter_9mm,
+ )
bolt_type = BOLT_TYPE_OPEN
weapon_weight = WEAPON_LIGHT
show_magazine_on_sprite = TRUE
@@ -67,9 +74,10 @@
spread = 20
spread_unwielded = 35
dual_wield_spread = 35
- wield_slowdown = 0.25
+ wield_slowdown = SMG_SLOWDOWN
wield_delay = 0.2 SECONDS
fire_delay = 0.09 SECONDS
+ safety_multiplier = 2
fire_sound = 'sound/weapons/gun/smg/spitter.ogg'
rack_sound = 'sound/weapons/gun/smg/spitter_cocked.ogg'
@@ -130,10 +138,14 @@
lefthand_file = 'icons/obj/guns/manufacturer/frontier_import/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/frontier_import/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/frontier_import/onmob.dmi'
+ w_class = WEIGHT_CLASS_BULKY //this gun is visually larger, so I believe this is good
icon_state = "pounder"
item_state = "pounder"
- mag_type = /obj/item/ammo_box/magazine/c22lr_pounder_pan
+ default_ammo_type = /obj/item/ammo_box/magazine/c22lr_pounder_pan
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/c22lr_pounder_pan,
+ )
burst_size = 1
fire_delay = 0.05 SECONDS
spread = 25
@@ -154,7 +166,8 @@
default_firemode = FIREMODE_FULLAUTO
manufacturer = MANUFACTURER_IMPORT
- wield_slowdown = 0.5
+ wield_slowdown = SMG_SLOWDOWN
+ safety_multiplier = 2
/obj/item/ammo_box/magazine/c22lr_pounder_pan
name = "pan magazine (.22 LR)"
@@ -180,7 +193,10 @@
icon_state = "shredder"
item_state = "shredder"
- mag_type = /obj/item/ammo_box/magazine/m12_shredder
+ default_ammo_type = /obj/item/ammo_box/magazine/m12_shredder
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m12_shredder,
+ )
spread = 15
recoil = 2
recoil_unwielded = 7
@@ -231,7 +247,7 @@
/obj/item/gun/ballistic/rocketlauncher/oneshot
name = "\improper Hammer"
- desc = "A disposable rocket-propelled grenade launcher loaded with a HEDP shell."
+ desc = "A disposable rocket-propelled grenade launcher loaded with a standard HE shell."
icon = 'icons/obj/guns/manufacturer/frontier_import/48x32.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/frontier_import/lefthand.dmi'
@@ -241,7 +257,10 @@
icon_state = "rpg"
item_state = "rpg"
- mag_type = /obj/item/ammo_box/magazine/internal/rocketlauncher/oneshot
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/rocketlauncher/oneshot
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/rocketlauncher/oneshot,
+ )
fire_sound = 'sound/weapons/gun/general/rocket_launch.ogg'
load_sound = 'sound/weapons/gun/general/rocket_load.ogg'
weapon_weight = WEAPON_HEAVY
@@ -252,7 +271,19 @@
sealed_magazine = TRUE
manufacturer = MANUFACTURER_IMPORT
slot_flags = ITEM_SLOT_BACK
+ has_safety = FALSE
+ safety = FALSE
+ safety_multiplier = 0
+
+/obj/item/gun/ballistic/rocketlauncher/oneshot/hedp
+ name = "\improper Hammer-DP"
+ desc = "A disposable rocket-propelled grenade launcher loaded with an HEDP shell for Direct Penetration of your target."
+
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/rocketlauncher/oneshot/hedp
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/rocketlauncher/oneshot/hedp,
+ )
/obj/item/gun/ballistic/rocketlauncher/oneshot/Initialize()
. = ..()
@@ -265,6 +296,12 @@
. += span_warning("It has been spent, and is now useless.")
/obj/item/ammo_box/magazine/internal/rocketlauncher/oneshot
+ name = "oneshot rocket launcher magazine"
+ ammo_type = /obj/item/ammo_casing/caseless/rocket
+ caliber = "84mm"
+ max_ammo = 1
+
+/obj/item/ammo_box/magazine/internal/rocketlauncher/oneshot/hedp
name = "oneshot rocket launcher magazine"
ammo_type = /obj/item/ammo_casing/caseless/rocket/hedp
caliber = "84mm"
diff --git a/code/modules/projectiles/guns/manufacturer/hunter_pride/ballistics.dm b/code/modules/projectiles/guns/manufacturer/hunter_pride/ballistics.dm
new file mode 100644
index 000000000000..8162195f909c
--- /dev/null
+++ b/code/modules/projectiles/guns/manufacturer/hunter_pride/ballistics.dm
@@ -0,0 +1,935 @@
+///Hunters Pride Weapons
+
+///Revolvers
+
+/obj/item/gun/ballistic/revolver/montagne
+ name = "\improper HP Montagne"
+ desc = "An ornate break-open revolver issued to high-ranking members of the Saint-Roumain Militia. Chambered in .44."
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
+ icon_state = "montagne"
+ item_state = "hp_generic"
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+ spread_unwielded = 15
+ recoil = 0
+
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44/montagne
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/cylinder/rev44/montagne,
+ )
+
+/obj/item/gun/ballistic/revolver/montagne/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/ammo_hud/revolver)
+
+EMPTY_GUN_HELPER(revolver/montagne)
+
+/obj/item/gun/ballistic/revolver/ashhand
+ name = "HP Ashhand"
+ desc = "A massive, long-barreled revolver often used by the Saint-Roumain Militia as protection against big game. Can only be reloaded one cartridge at a time due to its reinforced frame. Uses .45-70 ammo."
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
+ icon_state = "ashhand"
+ item_state = "ashhand"
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/cylinder/rev4570
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/cylinder/rev4570,
+ )
+ fire_sound = 'sound/weapons/gun/revolver/shot_hunting.ogg'
+ rack_sound = 'sound/weapons/gun/revolver/viper_prime.ogg'
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+ gate_loaded = TRUE
+ fire_delay = 0.6 SECONDS
+ wield_slowdown = HEAVY_REVOLVER_SLOWDOWN
+ spread_unwielded = 20
+ spread = 6
+ recoil = 2
+ recoil_unwielded = 4
+
+/obj/item/gun/ballistic/revolver/ashhand/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/ammo_hud/revolver)
+
+/obj/item/gun/ballistic/revolver/firebrand
+ name = "\improper HP Firebrand"
+ desc = "An archaic precursor to revolver-type firearms, this gun was rendered completely obsolete millennia ago. While fast to fire, it is extremely inaccurate. Uses .357 ammo."
+ icon_state = "pepperbox"
+ item_state = "hp_generic_fresh"
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/cylinder/pepperbox
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/cylinder/pepperbox,
+ )
+ spread = 20
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+ spread_unwielded = 50
+ fire_delay = 0 SECONDS
+ gate_offset = 4
+ semi_auto = TRUE
+ safety_wording = "safety"
+
+EMPTY_GUN_HELPER(revolver/firebrand)
+
+/obj/item/gun/ballistic/revolver/shadow
+ name = "\improper HP Shadow"
+ desc = "A mid-size revolver. Despite the antiquated design, it is cheap, reliable, and stylish, making it a favorite among fast-drawing spacers and the officers of various militaries, as well as small-time police units. Chambered in .44."
+ fire_sound = 'sound/weapons/gun/revolver/cattleman.ogg'
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+ icon_state = "shadow"
+ item_state = "shadow"
+
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/cylinder/rev44,
+ )
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+ obj_flags = UNIQUE_RENAME
+ gate_loaded = TRUE
+ unique_reskin = list(\
+ "Shadow" = "shadow",
+ "Cattleman" = "shadow_cattleman",
+ "General" = "shadow_general",
+ "Sheriff" = "shadow_sheriff",
+ "Cobra" = "shadow_cobra",
+ "Hired Gun" = "shadow_hiredgun",
+ "Buntline" = "shadow_buntline",
+ "Cavalry" = "shadow_cavalry",
+ "Lanchester Special" = "shadow_lanchester"
+ )
+
+ recoil = 0 //weaker than normal revolver, no recoil
+ spread_unwielded = 10
+
+/obj/item/gun/ballistic/revolver/shadow/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/ammo_hud/revolver)
+
+/obj/item/gun/ballistic/revolver/shadow/reskin_obj(mob/M)
+ . = ..()
+ if(current_skin)
+ item_state = unique_reskin[current_skin]
+
+EMPTY_GUN_HELPER(revolver/shadow)
+
+/obj/item/gun/ballistic/revolver/detective
+ name = "\improper HP Detective Special"
+ desc = "A small law enforcement firearm. Originally commissioned by Nanotrasen for their Private Investigation division, it has become extremely popular among independent civilians as a cheap, compact sidearm. Uses .38 Special rounds."
+ fire_sound = 'sound/weapons/gun/revolver/shot_light.ogg'
+ icon_state = "detective"
+ item_state = "hp_generic"
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/cylinder/rev38,
+ )
+ obj_flags = UNIQUE_RENAME
+ semi_auto = TRUE //double action
+ safety_wording = "safety"
+ unique_reskin = list("Default" = "detective",
+ "Stainless Steel" = "detective_stainless",
+ "Gold Trim" = "detective_gold",
+ "Leopard Spots" = "detective_leopard",
+ "The Peacemaker" = "detective_peacemaker",
+ "Black Panther" = "detective_panther"
+ )
+ w_class = WEIGHT_CLASS_SMALL
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+
+ recoil = 0 //weaker than normal revolver, no recoil
+ fire_delay = 0.2 SECONDS
+
+EMPTY_GUN_HELPER(revolver/detective)
+
+/obj/item/gun/ballistic/revolver/detective/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/ammo_hud/revolver) //note that the hud at the moment only supports 6 round revolvers, 7 or 5 isn't supported rn
+//...why...?
+/obj/item/gun/ballistic/revolver/detective/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, burst_firing = FALSE, spread_override = 0, iteration = 0)
+ if(magazine.caliber != initial(magazine.caliber))
+ if(prob(100 - (magazine.ammo_count() * 5))) //minimum probability of 70, maximum of 95
+ playsound(user, fire_sound, fire_sound_volume, vary_fire_sound)
+ to_chat(user, "[src] blows up in your face!")
+ user.take_bodypart_damage(0,20)
+ explosion(src, 0, 0, 1, 1)
+ user.dropItemToGround(src)
+ return 0
+ ..()
+
+/obj/item/gun/ballistic/revolver/detective/screwdriver_act(mob/living/user, obj/item/I)
+ if(..())
+ return TRUE
+ if(magazine.caliber == "38")
+ to_chat(user, "You begin to reinforce the barrel of [src]...")
+ if(magazine.ammo_count())
+ afterattack(user, user) //you know the drill
+ user.visible_message("[src] goes off!", "[src] goes off in your face!")
+ return TRUE
+ if(I.use_tool(src, user, 30))
+ if(magazine.ammo_count())
+ to_chat(user, "You can't modify it!")
+ return TRUE
+ magazine.caliber = ".357"
+ fire_sound = 'sound/weapons/gun/revolver/shot.ogg'
+ desc = "The barrel and chamber assembly seems to have been modified."
+ to_chat(user, "You reinforce the barrel of [src]. Now it will fire .357 rounds.")
+ else
+ to_chat(user, "You begin to revert the modifications to [src]...")
+ if(magazine.ammo_count())
+ afterattack(user, user) //and again
+ user.visible_message("[src] goes off!", "[src] goes off in your face!")
+ return TRUE
+ if(I.use_tool(src, user, 30))
+ if(magazine.ammo_count())
+ to_chat(user, "You can't modify it!")
+ return
+ magazine.caliber = ".38"
+ fire_sound = 'sound/weapons/gun/revolver/shot.ogg'
+ desc = initial(desc)
+ to_chat(user, "You remove the modifications on [src]. Now it will fire .38 rounds.")
+ return TRUE
+
+///pistols
+
+/obj/item/gun/ballistic/automatic/pistol/candor
+ name = "\improper Candor"
+ desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of Hunter's Pride. Chambered in .45."
+ icon_state = "candor"
+ item_state = "hp_generic"
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
+ default_ammo_type = /obj/item/ammo_box/magazine/m45
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m45,
+ )
+ fire_sound = 'sound/weapons/gun/pistol/candor.ogg'
+ rack_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg'
+ lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg'
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+ load_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
+ load_empty_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
+ eject_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
+ eject_empty_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
+ show_magazine_on_sprite = TRUE
+
+NO_MAG_GUN_HELPER(automatic/pistol/candor)
+
+/obj/item/gun/ballistic/automatic/pistol/candor/factory //also give this to the srm, their candors should probably look factory fresh from how well taken care of they are
+ desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of 'Hunter's Pride Arms and Ammunition'. This example has been kept in especially good shape, and may as well be fresh out of the workshop. Chambered in .45."
+ item_state = "hp_generic_fresh"
+
+NO_MAG_GUN_HELPER(automatic/pistol/candor/factory)
+
+/obj/item/gun/ballistic/automatic/pistol/candor/factory/update_overlays()
+ . = ..()
+ . += "[initial(icon_state)]_factory"
+
+/obj/item/gun/ballistic/automatic/pistol/candor/phenex
+ name = "\improper HP Phenex"
+ desc = "A uniquely modified version of the Candor, famously created by Hunter's Pride. Named after the daemonic Phoenix of legend that the Ashen Huntsman had once slain, this hell-kissed weapon is more visually intimidating than its original counterpart, but mechanically acts the same. Chambered in .45."
+ icon_state = "phenex"
+ item_state = "hp_phenex"
+
+/// SMG ///
+
+/obj/item/gun/ballistic/automatic/smg/firestorm //weapon designed by Apogee-dev
+ name = "HP Firestorm"
+ desc = "An unconventional submachinegun, rarely issued to Saint-Roumain Militia mercenary hunters for outstanding situations where normal hunting weapons fall short. Chambered in .45."
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
+ icon_state = "firestorm"
+ item_state = "firestorm"
+ default_ammo_type = /obj/item/ammo_box/magazine/c45_firestorm_mag
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/c45_firestorm_mag,
+ )
+ unique_mag_sprites_for_variants = TRUE
+ burst_size = 1
+ actions_types = list()
+ fire_delay = 0.13 SECONDS
+ bolt_type = BOLT_TYPE_OPEN
+ rack_sound = 'sound/weapons/gun/smg/uzi_cocked.ogg'
+ fire_sound = 'sound/weapons/gun/smg/firestorm.ogg'
+
+
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+ wield_slowdown = SMG_SLOWDOWN
+
+/obj/item/gun/ballistic/automatic/smg/firestorm/pan //spawns with pan magazine, can take sticks instead of just drums, not sure where this would be used, maybe erts?
+ default_ammo_type = /obj/item/ammo_box/magazine/c45_firestorm_mag/pan
+
+///Shotguns
+
+/////////////////////////////
+// DOUBLE BARRELED SHOTGUN //
+/////////////////////////////
+
+/obj/item/gun/ballistic/shotgun/doublebarrel
+ name = "double-barreled shotgun"
+ desc = "A classic break action shotgun, hand-made in a Hunter's Pride workshop. Both barrels can be fired in quick succession or even simultaneously. Guns like this have been popular with hunters, sporters, and criminals for millennia. Chambered in 12g."
+ sawn_desc = "A break action shotgun cut down to the size of a sidearm. While the recoil is even harsher, it offers a lot of power in a very small package. Chambered in 12g."
+
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
+ base_icon_state = "dshotgun"
+
+ icon_state = "dshotgun"
+ item_state = "dshotgun"
+
+ rack_sound = 'sound/weapons/gun/shotgun/dbshotgun_break.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/shotgun/dbshotgun_close.ogg'
+
+ w_class = WEIGHT_CLASS_BULKY
+ weapon_weight = WEAPON_MEDIUM
+ force = 10
+ flags_1 = CONDUCT_1
+ slot_flags = ITEM_SLOT_BACK
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/dual
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/dual,
+ )
+
+ obj_flags = UNIQUE_RENAME
+ unique_reskin = list("Default" = "dshotgun",
+ "Stainless Steel" = "dshotgun_white",
+ "Stained Green" = "dshotgun_green"
+ )
+ semi_auto = TRUE
+ can_be_sawn_off = TRUE
+ bolt_type = BOLT_TYPE_NO_BOLT
+ pb_knockback = 3 // it's a super shotgun!
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+ bolt_wording = "barrel"
+
+ burst_delay = 0.05 SECONDS
+ burst_size = 2
+ gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_BURST)
+ default_firemode = FIREMODE_SEMIAUTO
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/unique_action(mob/living/user)
+ if (bolt_locked == FALSE)
+ to_chat(user, "You snap open the [bolt_wording] of \the [src].")
+ playsound(src, rack_sound, rack_sound_volume, rack_sound_vary)
+ chambered = null
+ var/num_unloaded = 0
+ for(var/obj/item/ammo_casing/casing_bullet in get_ammo_list(FALSE, TRUE))
+ casing_bullet.forceMove(drop_location())
+ var/angle_of_movement =(rand(-3000, 3000) / 100) + dir2angle(turn(user.dir, 180))
+ casing_bullet.AddComponent(/datum/component/movable_physics, _horizontal_velocity = rand(450, 550) / 100, _vertical_velocity = rand(400, 450) / 100, _horizontal_friction = rand(20, 24) / 100, _z_gravity = PHYSICS_GRAV_STANDARD, _z_floor = 0, _angle_of_movement = angle_of_movement, _bounce_sound = casing_bullet.bounce_sfx_override)
+
+ num_unloaded++
+ SSblackbox.record_feedback("tally", "station_mess_created", 1, casing_bullet.name)
+ if (num_unloaded)
+ playsound(user, eject_sound, eject_sound_volume, eject_sound_vary)
+ update_appearance()
+ bolt_locked = TRUE
+ update_appearance()
+ return
+ drop_bolt(user)
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/drop_bolt(mob/user = null)
+ playsound(src, bolt_drop_sound, bolt_drop_sound_volume, FALSE)
+ if (user)
+ to_chat(user, "You snap the [bolt_wording] of \the [src] closed.")
+ chamber_round()
+ bolt_locked = FALSE
+ update_appearance()
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/can_shoot()
+ if (bolt_locked)
+ return FALSE
+ return ..()
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/attackby(obj/item/A, mob/user, params)
+ if (!bolt_locked)
+ to_chat(user, "The [bolt_wording] is shut closed!")
+ return
+ return ..()
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/update_icon_state()
+ . = ..()
+ if(current_skin)
+ icon_state = "[unique_reskin[current_skin]][sawn_off ? "_sawn" : ""][bolt_locked ? "_open" : ""]"
+ else
+ icon_state = "[base_icon_state || initial(icon_state)][sawn_off ? "_sawn" : ""][bolt_locked ? "_open" : ""]"
+
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/AltClick(mob/user)
+ . = ..()
+ if(unique_reskin && !current_skin && user.canUseTopic(src, BE_CLOSE, NO_DEXTERITY) && (!bolt_locked))
+ reskin_obj(user)
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/sawoff(forced = FALSE)
+ . = ..()
+ if(.)
+ weapon_weight = WEAPON_MEDIUM
+ wield_slowdown = wield_slowdown-0.1
+ wield_delay = 0.3 SECONDS //OP? maybe
+
+ spread = 8
+ spread_unwielded = 15
+ recoil = 3 //or not
+ recoil_unwielded = 5
+ item_state = "dshotgun_sawn"
+ mob_overlay_state = item_state
+
+EMPTY_GUN_HELPER(shotgun/doublebarrel)
+
+// sawn off beforehand
+/obj/item/gun/ballistic/shotgun/doublebarrel/presawn
+ name = "sawn-off double-barreled shotgun"
+ desc = "A break action shotgun cut down to the size of a sidearm. While the recoil is even harsher, it offers a lot of power in a very small package. Chambered in 12g."
+ sawn_off = TRUE
+ weapon_weight = WEAPON_MEDIUM
+ w_class = WEIGHT_CLASS_NORMAL
+ slot_flags = ITEM_SLOT_BELT
+
+ wield_slowdown = 0.15
+ wield_delay = 0.3 SECONDS //OP? maybe
+
+ spread = 8
+ spread_unwielded = 15
+ recoil = 3 //or not
+ recoil_unwielded = 5
+ item_state = "dshotgun_sawn"
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/dual/lethal
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/dual/lethal,
+ )
+
+EMPTY_GUN_HELPER(shotgun/doublebarrel/presawn)
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/roumain
+ name = "HP antique double-barreled shotgun"
+ desc = "A special-edition shotgun hand-made by Hunter's Pride with a high-quality walnut stock inlaid with brass scrollwork. Shotguns like this are very rare outside of the Saint-Roumain Militia's ranks. Otherwise functionally identical to a common double-barreled shotgun. Chambered in 12g."
+ sawn_desc = "A special-edition Hunter's Pride shotgun, cut down to the size of a sidearm by some barbarian. The brass inlay on the stock and engravings on the barrel have been obliterated in the process, destroying any value beyond its use as a crude sidearm."
+ base_icon_state = "dshotgun_srm"
+ icon_state = "dshotgun_srm"
+ item_state = "dshotgun_srm"
+ unique_reskin = null
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/roumain/sawoff(forced = FALSE)
+ . = ..()
+ if(.)
+ item_state = "dshotgun_srm_sawn"
+
+// BRIMSTONE //
+
+/obj/item/gun/ballistic/shotgun/brimstone
+ name = "HP Brimstone"
+ desc = "A simple and sturdy pump-action shotgun sporting a 5-round capacity, manufactured by Hunter's Pride. Found widely throughout the Frontier in the hands of hunters, pirates, police, and countless others. Chambered in 12g."
+ sawn_desc = "A stockless and shortened pump-action shotgun. The worsened recoil and accuracy make it a poor sidearm anywhere beyond punching distance."
+ fire_sound = 'sound/weapons/gun/shotgun/brimstone.ogg'
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
+ icon_state = "brimstone"
+ item_state = "brimstone"
+
+ gun_firemodes = list(FIREMODE_FULLAUTO)
+ default_firemode = FIREMODE_FULLAUTO
+
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/lethal
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/lethal,
+ )
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+ fire_delay = 0.05 SECONDS //slamfire
+ rack_delay = 0.2 SECONDS
+
+ can_be_sawn_off = TRUE
+
+
+/obj/item/gun/ballistic/shotgun/brimstone/sawoff(forced = FALSE)
+ . = ..()
+ if(.)
+ weapon_weight = WEAPON_MEDIUM
+ wield_slowdown = wield_slowdown-0.1
+ wield_delay = 0.3 SECONDS //OP? maybe
+
+ spread = 18
+ spread_unwielded = 25
+ recoil = 5 //your punishment for sawing off an short shotgun
+ recoil_unwielded = 8
+ item_state = "illestren_factory_sawn" // i couldnt care about making another sprite, looks close enough
+ mob_overlay_state = item_state
+
+EMPTY_GUN_HELPER(shotgun/brimstone)
+
+// HELLFIRE //
+
+/obj/item/gun/ballistic/shotgun/hellfire
+ name = "HP Hellfire"
+ desc = "A hefty pump-action riot shotgun with a seven-round tube, manufactured by Hunter's Pride. Especially popular among the Frontier's police forces. Chambered in 12g."
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+ icon_state = "hellfire"
+ item_state = "hellfire"
+
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/riot
+ allowed_ammo_types = list(
+ /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 = 0.1 SECONDS
+
+/obj/item/gun/ballistic/shotgun/hellfire/sawoff(forced = FALSE)
+ . = ..()
+ if(.)
+ var/obj/item/ammo_box/magazine/internal/tube = magazine
+ tube.max_ammo = 5 //this makes the gun so much worse
+
+ weapon_weight = WEAPON_MEDIUM
+ wield_slowdown = wield_slowdown-0.1
+ wield_delay = 0.3 SECONDS //OP? maybe
+
+ spread = 8
+ spread_unwielded = 15
+ recoil = 3 //or not
+ recoil_unwielded = 5
+ item_state = "dshotgun_sawn" // ditto
+ mob_overlay_state = item_state
+
+EMPTY_GUN_HELPER(shotgun/hellfire)
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/conflagration
+ name = "HP Conflagration"
+ base_icon_state = "conflagration"
+ icon_state = "conflagration"
+ item_state = "conflagration"
+ fire_sound = 'sound/weapons/gun/shotgun/shot.ogg'
+ desc = "A lightweight lever-action shotgun with a 5 round ammunition capacity. The lever action allows it to be cycled quickly and acurrately. In theory, you could ever operate it one-handed. Chambered in 12g."
+ sawn_desc = "A lever action shotgun that's been sawed down for portability. The recoil makes it mostly useless outside of point-blank range, but it hits hard for its size and, more importantly, can be flipped around stylishly."
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/winchester/conflagration
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/winchester/conflagration,
+ )
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/conflagration/sawoff(forced = FALSE)
+ . = ..()
+ if(.)
+ var/obj/item/ammo_box/magazine/internal/tube = magazine
+ tube.max_ammo = 5
+
+ item_state = "beacon_factory_sawn"
+ mob_overlay_state = item_state
+ weapon_weight = WEAPON_MEDIUM
+
+ wield_slowdown = wield_slowdown-0.1
+ wield_delay = 0.2 SECONDS
+
+ spread = 4
+ spread_unwielded = 12
+
+ recoil = 0
+ recoil_unwielded = 3
+
+EMPTY_GUN_HELPER(shotgun/flamingarrow/conflagration)
+
+
+//Elephant Gun
+/obj/item/gun/ballistic/shotgun/doublebarrel/twobore
+ name = "HP Huntsman"
+ desc = "A comically huge double-barreled rifle replete with brass inlays depicting flames and naturalistic scenes, clearly meant for the nastiest monsters the Frontier has to offer. If you want an intact trophy, don't aim for the head. Chambered in two-bore."
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+ inhand_x_dimension = 32
+ inhand_y_dimension = 32
+ base_icon_state = "huntsman"
+ icon_state = "huntsman"
+ item_state = "huntsman"
+ unique_reskin = null
+ attack_verb = list("bludgeoned", "smashed")
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/twobore
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/twobore,
+ )
+ w_class = WEIGHT_CLASS_BULKY
+ force = 20 //heavy ass elephant gun, why wouldnt it be
+ recoil = 4
+ pb_knockback = 12
+ fire_sound = 'sound/weapons/gun/shotgun/quadfire.ogg'
+ rack_sound = 'sound/weapons/gun/shotgun/quadrack.ogg'
+ load_sound = 'sound/weapons/gun/shotgun/quadinsert.ogg'
+
+ can_be_sawn_off = FALSE
+ fire_sound_volume = 80
+ rack_sound_volume = 50
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+
+ gun_firemodes = list(FIREMODE_SEMIAUTO) //no dual burst for you
+ default_firemode = FIREMODE_SEMIAUTO
+
+/// Rifles
+
+/obj/item/gun/ballistic/rifle/illestren
+ name = "\improper HP Illestren"
+ desc = "A sturdy and conventional bolt-action rifle. One of Hunter's Pride's most successful firearms, the Illestren is popular among colonists, pirates, snipers, and countless others. Chambered in 8x50mmR."
+ icon_state = "illestren"
+ item_state = "illestren"
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
+ sawn_desc = "An Illestren rifle sawn down to a ridiculously small size. There was probably a reason it wasn't made this short to begin with, but it still packs a punch."
+ eject_sound = 'sound/weapons/gun/rifle/vickland_unload.ogg'
+ eject_empty_sound = 'sound/weapons/gun/rifle/vickland_unload.ogg'
+
+ internal_magazine = FALSE
+ default_ammo_type = /obj/item/ammo_box/magazine/illestren_a850r
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/illestren_a850r,
+ )
+ empty_autoeject = TRUE
+ eject_sound_vary = FALSE
+ can_be_sawn_off = TRUE
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+
+/obj/item/gun/ballistic/rifle/illestren/empty //i had to name it empty instead of no_mag because else it wouldnt work with guncases. sorry!
+ default_ammo_type = FALSE
+
+/obj/item/gun/ballistic/rifle/illestren/sawoff(forced = FALSE)
+ . = ..()
+ if(.)
+ spread = 19
+ spread_unwielded = 30
+ item_state = "illestren_sawn"
+ mob_overlay_state = item_state
+ weapon_weight = WEAPON_MEDIUM //you can fire it onehanded, makes it worse than worse than useless onehanded, but you can
+
+/obj/item/gun/ballistic/rifle/illestren/blow_up(mob/user)
+ . = FALSE
+ if(chambered && chambered.BB)
+ process_fire(user, user, FALSE)
+ . = TRUE
+
+/obj/item/gun/ballistic/rifle/illestren/factory
+ desc = "A sturdy and conventional bolt-action rifle. One of Hunter's Pride's most successful firearms, this example has been kept in excellent shape and may as well be fresh out of the workshop. Chambered in 8x50mmR."
+ icon_state = "illestren_factory"
+ item_state = "illestren_factory"
+
+/obj/item/gun/ballistic/rifle/illestren/sawoff(forced = FALSE)
+ . = ..()
+ if(.)
+ item_state = "illestren_factory_sawn"
+ mob_overlay_state = item_state
+
+/obj/item/gun/ballistic/rifle/illestren/sawn
+ desc = "An Illestren rifle sawn down to a ridiculously small size. There was probably a reason it wasn't made this short to begin with, but it still packs a punch."
+ sawn_off = TRUE
+
+//Lever-Action Rifles
+
+/obj/item/gun/ballistic/shotgun/flamingarrow
+ name = "HP Flaming Arrow"
+ desc = "A sturdy and lightweight lever-action rifle with hand-stamped Hunter's Pride marks on the receiver. A popular choice among Frontier homesteaders for hunting small game and rudimentary self-defense. Chambered in .38."
+ sawn_desc = "A lever-action rifle that has been sawed down and modified for extra portability. While surprisingly effective as a sidearm, the more important benefit is how much cooler it looks."
+ base_icon_state = "flamingarrow"
+ icon_state = "flamingarrow"
+ item_state = "flamingarrow"
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+ inhand_x_dimension = 32
+ inhand_y_dimension = 32
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/winchester
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/winchester,
+ )
+ fire_sound = 'sound/weapons/gun/rifle/flamingarrow.ogg'
+ rack_sound = 'sound/weapons/gun/rifle/skm_cocked.ogg'
+ bolt_wording = "lever"
+ cartridge_wording = "bullet"
+ can_be_sawn_off = TRUE
+
+ wield_slowdown = RIFLE_SLOWDOWN
+ wield_delay = 0.65 SECONDS
+
+ spread = -5
+ spread_unwielded = 7
+
+ recoil = 0
+ recoil_unwielded = 2
+
+EMPTY_GUN_HELPER(shotgun/flamingarrow)
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/update_icon_state()
+ . = ..()
+ if(current_skin)
+ icon_state = "[unique_reskin[current_skin]][sawn_off ? "_sawn" : ""]"
+ else
+ icon_state = "[base_icon_state || initial(icon_state)][sawn_off ? "_sawn" : ""]"
+
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/rack(mob/user = null)
+ . = ..()
+ if(!wielded)
+ SpinAnimation(7,1)
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+ var/fan = FALSE
+ if(HAS_TRAIT(user, TRAIT_GUNSLINGER) && !semi_auto && wielded_fully && loc == user && !safety)
+ fan = TRUE
+ fire_delay = 0.35 SECONDS
+ . = ..()
+ fire_delay = src::fire_delay
+ if(fan)
+ rack()
+ to_chat(user, "You quickly rack the [bolt_wording] of \the [src]!")
+ balloon_alert_to_viewers("quickly racks!")
+ fire_delay = 0 SECONDS
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/sawoff(forced = FALSE)
+ . = ..()
+ if(.)
+ var/obj/item/ammo_box/magazine/internal/tube = magazine
+ tube.max_ammo = 7
+
+ item_state = "flamingarrow_sawn"
+ mob_overlay_state = item_state
+ weapon_weight = WEAPON_MEDIUM
+
+ wield_slowdown = wield_slowdown-0.1
+ wield_delay = 0.2 SECONDS //THE COWBOY RIFLE
+
+ spread = 4
+ spread_unwielded = 12
+
+ recoil = 0
+ recoil_unwielded = 3
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/factory
+ desc = "A sturdy and lightweight lever-action rifle with hand-stamped Hunter's Pride marks on the receiver. This example has been kept in excellent shape and may as well be fresh out of the workshop. Chambered in .38."
+ icon_state = "flamingarrow_factory"
+ base_icon_state = "flamingarrow_factory"
+ item_state = "flamingarrow_factory"
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/factory/sawoff(forced = FALSE)
+ . = ..()
+ if(.)
+ item_state = "flamingarrow_factory_sawn"
+ mob_overlay_state = item_state
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/bolt
+ name = "HP Flaming Bolt"
+ desc = "A sturdy, excellently-made lever-action rifle. This one appears to be a genuine antique, kept in incredibly good condition despite its advanced age. Chambered in .38."
+ base_icon_state = "flamingbolt"
+ icon_state = "flamingbolt"
+ item_state = "flamingbolt"
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/bolt/sawoff(forced = FALSE)
+ . = ..()
+ if(.)
+ item_state = "flamingbolt_sawn"
+ mob_overlay_state = item_state
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/absolution
+ name = "HP Absolution"
+ base_icon_state = "absolution"
+ icon_state = "absolution"
+ item_state = "absolution"
+ fire_sound = 'sound/weapons/gun/revolver/shot.ogg'
+ desc = "A large lever-action rifle with hand-stamped Hunter's Pride marks on the receiver and an 8 round ammunition capacity. More powerful than the Flaming Arrow, the Absolution is a popular pick for hunting larger fauna like bears and goliaths, especially when a bolt action's slower rate of fire would be a liability. Chambered in .357."
+ sawn_desc = "A large lever-action rifle, sawn down for portability. It looks much cooler, but you should probably be using a revolver..."
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/winchester/absolution
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/winchester/absolution,
+ )
+
+/obj/item/gun/ballistic/shotgun/flamingarrow/absolution/sawoff(forced = FALSE)
+ . = ..()
+ if(.)
+ var/obj/item/ammo_box/magazine/internal/tube = magazine
+ tube.max_ammo = 8
+
+ item_state = "illestren_sawn"
+ mob_overlay_state = item_state
+ weapon_weight = WEAPON_MEDIUM
+
+ wield_slowdown = wield_slowdown-0.1
+ wield_delay = 0.2 SECONDS
+
+ spread = 4
+ spread_unwielded = 12
+
+ recoil = 0
+ recoil_unwielded = 3
+
+//Break-Action Rifle
+/obj/item/gun/ballistic/shotgun/doublebarrel/beacon
+ name = "HP Beacon"
+ desc = "A single-shot break-action rifle made by Hunter's Pride and sold to civilian hunters. Boasts excellent accuracy and stopping power. Uses .45-70 ammo."
+ sawn_desc= "A single-shot break-action pistol chambered in .45-70. A bit difficult to aim."
+ base_icon_state = "beacon"
+ icon_state = "beacon"
+ item_state = "beacon"
+ unique_reskin = null
+ inhand_x_dimension = 32
+ inhand_y_dimension = 32
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/beacon
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/beacon,
+ )
+ fire_sound = 'sound/weapons/gun/revolver/shot_hunting.ogg'
+ w_class = WEIGHT_CLASS_BULKY
+ weapon_weight = WEAPON_MEDIUM
+ force = 10
+ obj_flags = UNIQUE_RENAME
+ semi_auto = TRUE
+ can_be_sawn_off = TRUE
+ pb_knockback = 3
+ wield_slowdown = HEAVY_RIFLE_SLOWDOWN
+ spread_unwielded = 15
+ spread = 0
+ recoil = 0
+ recoil_unwielded = 5
+
+ gun_firemodes = list(FIREMODE_SEMIAUTO)
+ default_firemode = FIREMODE_SEMIAUTO
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/sawoff(forced = FALSE)
+ . = ..()
+ if(.)
+ item_state = "beacon_sawn"
+ mob_overlay_state = item_state
+ wield_slowdown = wield_slowdown-0.1
+ wield_delay = 0.5 SECONDS
+
+ spread_unwielded = 20 //mostly the hunting revolver stats
+ spread = 6
+ recoil = 2
+ recoil_unwielded = 4
+
+EMPTY_GUN_HELPER(shotgun/doublebarrel/beacon)
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/factory
+ desc = "A single-shot break-action rifle made by Hunter's Pride and sold to civilian hunters. This example has been kept in excellent shape and may as well be fresh out of the workshop. Uses .45-70 ammo."
+ sawn_desc= "A single-shot break-action pistol chambered in .45-70. A bit difficult to aim."
+ base_icon_state = "beacon_factory"
+ icon_state = "beacon_factory"
+ item_state = "beacon_factory"
+
+/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/factory/sawoff(forced = FALSE)
+ . = ..()
+ if(.)
+ item_state = "beacon_factory_sawn"
+ mob_overlay_state = item_state
+
+//pre sawn off beacon
+/obj/item/gun/ballistic/shotgun/doublebarrel/beacon/presawn
+ name = "sawn-off HP Beacon"
+ sawn_desc= "A single-shot break-action pistol chambered in .45-70. A bit difficult to aim."
+ sawn_off = TRUE
+ w_class = WEIGHT_CLASS_NORMAL
+ slot_flags = ITEM_SLOT_BELT
+
+ weapon_weight = WEAPON_MEDIUM
+
+ item_state = "beacon_sawn"
+ mob_overlay_state = "beacon_sawn"
+ wield_slowdown = 0.45
+ wield_delay = 0.5 SECONDS
+
+ spread_unwielded = 20 //mostly the hunting revolver stats
+ spread = 6
+ recoil = 2
+ recoil_unwielded = 4
+
+/// snipers
+
+//well. its almost a sniper.
+/obj/item/gun/ballistic/automatic/marksman/vickland //weapon designed by Apogee-dev
+ name = "\improper Vickland"
+ desc = "The pride of the Saint-Roumain Militia, the Vickland is a rare semi-automatic battle rifle produced by Hunter's Pride exclusively for SRM use. It is unusual in its class for its internal rotary magazine, which must be reloaded using stripper clips. Chambered in .308."
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+
+ fire_sound = 'sound/weapons/gun/rifle/vickland.ogg'
+ icon_state = "vickland"
+ item_state = "vickland"
+ weapon_weight = WEAPON_MEDIUM
+ w_class = WEIGHT_CLASS_BULKY
+ internal_magazine = TRUE
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/vickland
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/vickland,
+ )
+ fire_sound = 'sound/weapons/gun/rifle/vickland.ogg'
+
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+ zoomable = FALSE //no scope on it
+
+ rack_sound = 'sound/weapons/gun/rifle/ar_cock.ogg'
+
+ fire_delay = 0.4 SECONDS
+
+ spread_unwielded = 25
+ recoil = 0
+ recoil_unwielded = 4
+ wield_slowdown = DMR_SLOWDOWN
+
+/obj/item/gun/ballistic/rifle/scout
+ name = "HP Scout"
+ desc = "A powerful bolt-action rifle usually given to mercenary hunters of the Saint-Roumain Militia, equally suited for taking down big game or two-legged game. Chambered in .300 Magnum."
+ icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'
+ icon_state = "scout"
+ item_state = "scout"
+
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/boltaction/smile
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/boltaction/smile,
+ )
+ fire_sound = 'sound/weapons/gun/rifle/scout.ogg'
+
+ rack_sound = 'sound/weapons/gun/rifle/scout_bolt_out.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/rifle/scout_bolt_in.ogg'
+
+ can_be_sawn_off = FALSE
+
+ zoomable = TRUE
+ zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
+ zoom_out_amt = 5
+
+ manufacturer = MANUFACTURER_HUNTERSPRIDE
+
diff --git a/code/modules/projectiles/guns/manufacturer/nanotrasen_sharplite/ballistics.dm b/code/modules/projectiles/guns/manufacturer/nanotrasen_sharplite/ballistics.dm
new file mode 100644
index 000000000000..5386f323e60d
--- /dev/null
+++ b/code/modules/projectiles/guns/manufacturer/nanotrasen_sharplite/ballistics.dm
@@ -0,0 +1,55 @@
+/obj/item/gun/ballistic/automatic/pistol/commander
+ name = "VI Commander"
+ desc = "A service pistol produced as Vigilitas Interstellar's standard sidearm. Has a reputation for being easy to use, due to its light recoil and high magazine capacity. Chambered in 9mm."
+ icon_state = "commander"
+ item_state = "nt_generic"
+ icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/onmob.dmi'
+
+ w_class = WEIGHT_CLASS_NORMAL
+ default_ammo_type = /obj/item/ammo_box/magazine/co9mm
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/co9mm,
+ )
+ manufacturer = MANUFACTURER_VIGILITAS
+ fire_sound = 'sound/weapons/gun/pistol/rattlesnake.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'
+
+ rack_sound = 'sound/weapons/gun/pistol/rack_small.ogg'
+ lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'
+
+NO_MAG_GUN_HELPER(automatic/pistol/commander)
+
+/obj/item/ammo_box/magazine/co9mm
+ name = "commander pistol magazine (9mm)"
+ desc = "A 10-round double-stack magazine for Commander pistols. These rounds do okay damage, but struggle against armor."
+ icon_state = "commander_mag-10"
+ base_icon_state = "commander_mag"
+ ammo_type = /obj/item/ammo_casing/c9mm
+ caliber = "9mm"
+ max_ammo = 10
+ multiple_sprites = AMMO_BOX_PER_BULLET
+
+/obj/item/ammo_box/magazine/co9mm/empty
+ start_empty = TRUE
+
+
+/obj/item/gun/ballistic/automatic/pistol/commander/inteq
+ name = "PS-03 Commissioner"
+ desc = "A modified version of the VI Commander, issued as standard to Inteq Risk Management Group personnel. Features the same excellent handling and high magazine capacity as the original. Chambered in 9mm."
+
+ icon = 'icons/obj/guns/manufacturer/inteq/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/inteq/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/inteq/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/inteq/onmob.dmi'
+ icon_state = "commander_inteq"
+ item_state = "inteq_generic"
+ manufacturer = MANUFACTURER_INTEQ
+
+NO_MAG_GUN_HELPER(automatic/pistol/commander/inteq)
diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
index bbfdbab8d2aa..7d443ad066a8 100644
--- a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
+++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm
@@ -1,3 +1,6 @@
+#define SCARBOROUGH_ATTACHMENTS list(/obj/item/attachment/silencer, /obj/item/attachment/laser_sight, /obj/item/attachment/rail_light, /obj/item/attachment/bayonet, /obj/item/attachment/energy_bayonet)
+#define SCARBOROUGH_ATTACH_SLOTS list(ATTACHMENT_SLOT_MUZZLE = 1, ATTACHMENT_SLOT_SCOPE = 1, ATTACHMENT_SLOT_RAIL = 1)
+
//########### PISTOLS ###########//
/obj/item/gun/ballistic/automatic/pistol/ringneck
name = "PC-76 \"Ringneck\""
@@ -10,7 +13,10 @@
item_state = "sa_generic"
w_class = WEIGHT_CLASS_SMALL
- mag_type = /obj/item/ammo_box/magazine/m10mm_ringneck
+ default_ammo_type = /obj/item/ammo_box/magazine/m10mm_ringneck
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m10mm_ringneck,
+ )
fire_sound = 'sound/weapons/gun/pistol/shot.ogg'
dry_fire_sound = 'sound/weapons/gun/pistol/dry_fire.ogg'
@@ -28,17 +34,8 @@
manufacturer = MANUFACTURER_SCARBOROUGH
show_magazine_on_sprite = TRUE
- valid_attachments = list(
- /obj/item/attachment/silencer,
- /obj/item/attachment/laser_sight,
- /obj/item/attachment/rail_light,
- /obj/item/attachment/bayonet
- )
- slot_available = list(
- ATTACHMENT_SLOT_MUZZLE = 1,
- ATTACHMENT_SLOT_SCOPE = 1,
- ATTACHMENT_SLOT_RAIL = 1
- )
+ valid_attachments = SCARBOROUGH_ATTACHMENTS
+ slot_available = SCARBOROUGH_ATTACH_SLOTS
slot_offsets = list(
ATTACHMENT_SLOT_MUZZLE = list(
"x" = 27,
@@ -59,7 +56,7 @@
spread_unwielded = 9
recoil_unwielded = 2
-EMPTY_GUN_HELPER(automatic/pistol/ringneck)
+NO_MAG_GUN_HELPER(automatic/pistol/ringneck)
/obj/item/gun/ballistic/automatic/pistol/ringneck/indie
name = "Ringneck-76"
@@ -74,7 +71,7 @@ EMPTY_GUN_HELPER(automatic/pistol/ringneck)
spread_unwielded = 7
recoil_unwielded = 3
-EMPTY_GUN_HELPER(automatic/pistol/ringneck/indie)
+NO_MAG_GUN_HELPER(automatic/pistol/ringneck/indie)
/obj/item/ammo_box/magazine/m10mm_ringneck
@@ -101,7 +98,10 @@ EMPTY_GUN_HELPER(automatic/pistol/ringneck/indie)
icon_state = "asp"
item_state = "sa_generic"
- mag_type = /obj/item/ammo_box/magazine/m57_39_asp
+ default_ammo_type = /obj/item/ammo_box/magazine/m57_39_asp
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m57_39_asp,
+ )
fire_sound = 'sound/weapons/gun/pistol/asp.ogg'
@@ -117,17 +117,8 @@ EMPTY_GUN_HELPER(automatic/pistol/ringneck/indie)
manufacturer = MANUFACTURER_SCARBOROUGH
show_magazine_on_sprite = TRUE
- valid_attachments = list(
- /obj/item/attachment/silencer,
- /obj/item/attachment/laser_sight,
- /obj/item/attachment/rail_light,
- /obj/item/attachment/bayonet
- )
- slot_available = list(
- ATTACHMENT_SLOT_MUZZLE = 1,
- ATTACHMENT_SLOT_SCOPE = 1,
- ATTACHMENT_SLOT_RAIL = 1
- )
+ valid_attachments = SCARBOROUGH_ATTACHMENTS
+ slot_available = SCARBOROUGH_ATTACH_SLOTS
slot_offsets = list(
ATTACHMENT_SLOT_MUZZLE = list(
"x" = 32,
@@ -143,7 +134,7 @@ EMPTY_GUN_HELPER(automatic/pistol/ringneck/indie)
)
)
-EMPTY_GUN_HELPER(automatic/pistol/asp)
+NO_MAG_GUN_HELPER(automatic/pistol/asp)
/obj/item/ammo_box/magazine/m57_39_asp
name = "Asp magazine (5.7x39mm)"
@@ -167,6 +158,8 @@ EMPTY_GUN_HELPER(automatic/pistol/asp)
else
icon_state = "[base_icon_state]-0"
+/obj/item/ammo_box/magazine/m57_39_asp/empty
+ start_empty = TRUE
/obj/item/gun/ballistic/revolver/viper
name = "R-23 \"Viper\""
@@ -192,7 +185,8 @@ EMPTY_GUN_HELPER(automatic/pistol/asp)
semi_auto = TRUE //double action
safety_wording = "safety"
-EMPTY_GUN_HELPER(revolver/viper)
+/obj/item/gun/ballistic/revolver/viper/no_mag
+ spawn_no_ammo = TRUE
/obj/item/gun/ballistic/revolver/viper/indie
name = "Viper-23"
@@ -208,7 +202,8 @@ EMPTY_GUN_HELPER(revolver/viper)
. = ..()
AddComponent(/datum/component/ammo_hud/revolver)
-EMPTY_GUN_HELPER(revolver/viper/indie)
+/obj/item/gun/ballistic/revolver/viper/indie/no_mag
+ spawn_no_ammo = TRUE
/obj/item/gun/ballistic/automatic/pistol/rattlesnake
name = "MP-84 \"Rattlesnake\""
@@ -222,7 +217,10 @@ EMPTY_GUN_HELPER(revolver/viper/indie)
icon_state = "rattlesnake"
item_state = "rattlesnake"
- mag_type = /obj/item/ammo_box/magazine/m9mm_rattlesnake
+ default_ammo_type = /obj/item/ammo_box/magazine/m9mm_rattlesnake
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m9mm_rattlesnake,
+ )
fire_sound = 'sound/weapons/gun/pistol/rattlesnake.ogg'
dry_fire_sound = 'sound/weapons/gun/pistol/dry_fire.ogg'
@@ -239,17 +237,8 @@ EMPTY_GUN_HELPER(revolver/viper/indie)
show_magazine_on_sprite = TRUE
- valid_attachments = list(
- /obj/item/attachment/silencer,
- /obj/item/attachment/laser_sight,
- /obj/item/attachment/rail_light,
- /obj/item/attachment/bayonet
- )
- slot_available = list(
- ATTACHMENT_SLOT_MUZZLE = 1,
- ATTACHMENT_SLOT_SCOPE = 1,
- ATTACHMENT_SLOT_RAIL = 1
- )
+ valid_attachments = SCARBOROUGH_ATTACHMENTS
+ slot_available = SCARBOROUGH_ATTACH_SLOTS
slot_offsets = list(
ATTACHMENT_SLOT_MUZZLE = list(
"x" = 40,
@@ -271,7 +260,7 @@ EMPTY_GUN_HELPER(revolver/viper/indie)
gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_BURST)
default_firemode = FIREMODE_SEMIAUTO
-EMPTY_GUN_HELPER(automatic/pistol/rattlesnake)
+NO_MAG_GUN_HELPER(automatic/pistol/rattlesnake)
/obj/item/gun/ballistic/automatic/pistol/rattlesnake/inteq
name = "MP-84m Kingsnake"
@@ -294,6 +283,9 @@ EMPTY_GUN_HELPER(automatic/pistol/rattlesnake)
. = ..()
icon_state = "[base_icon_state]_[ammo_count() == 1 ? 1 : round(ammo_count(),3)]"
+/obj/item/ammo_box/magazine/m9mm_rattlesnake/empty
+ start_empty = TRUE
+
/obj/item/gun/ballistic/automatic/pistol/himehabu
name = "PC-81 \"Himehabu\""
desc = "An astonishingly compact machine pistol firing ultra-light projectiles, designed to be as small and concealable as possible while remaining a credible threat at very close range. Armor penetration is practically non-existent. Chambered in .22."
@@ -307,8 +299,11 @@ EMPTY_GUN_HELPER(automatic/pistol/rattlesnake)
mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
- w_class = WEIGHT_CLASS_TINY
- mag_type = /obj/item/ammo_box/magazine/m22lr_himehabu
+ w_class = WEIGHT_CLASS_SMALL
+ default_ammo_type = /obj/item/ammo_box/magazine/m22lr_himehabu
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m22lr_himehabu,
+ )
fire_sound = 'sound/weapons/gun/pistol/himehabu.ogg'
load_sound = 'sound/weapons/gun/pistol/mag_insert_alt.ogg'
@@ -345,7 +340,7 @@ EMPTY_GUN_HELPER(automatic/pistol/rattlesnake)
spread_unwielded = 0
wield_slowdown = 0
-EMPTY_GUN_HELPER(automatic/pistol/himehabu)
+NO_MAG_GUN_HELPER(automatic/pistol/himehabu)
/obj/item/ammo_box/magazine/m22lr_himehabu
name = "pistol magazine (.22 LR)"
@@ -355,7 +350,7 @@ EMPTY_GUN_HELPER(automatic/pistol/himehabu)
ammo_type = /obj/item/ammo_casing/c22lr
caliber = "22lr"
max_ammo = 10
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
multiple_sprites = AMMO_BOX_PER_BULLET
//########### SMGS ###########//
@@ -371,7 +366,10 @@ EMPTY_GUN_HELPER(automatic/pistol/himehabu)
icon_state = "cobra"
item_state = "cobra"
- mag_type = /obj/item/ammo_box/magazine/m45_cobra
+ default_ammo_type = /obj/item/ammo_box/magazine/m45_cobra
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m45_cobra,
+ )
fire_sound = 'sound/weapons/gun/smg/cobra.ogg'
@@ -385,12 +383,7 @@ EMPTY_GUN_HELPER(automatic/pistol/himehabu)
show_ammo_capacity_on_magazine_sprite = TRUE
manufacturer = MANUFACTURER_SCARBOROUGH
- valid_attachments = list(
- /obj/item/attachment/silencer,
- /obj/item/attachment/laser_sight,
- /obj/item/attachment/rail_light,
- /obj/item/attachment/bayonet
- )
+ valid_attachments = SCARBOROUGH_ATTACHMENTS
slot_available = list(
ATTACHMENT_SLOT_MUZZLE = 1,
ATTACHMENT_SLOT_RAIL = 1
@@ -401,12 +394,12 @@ EMPTY_GUN_HELPER(automatic/pistol/himehabu)
"y" = 23,
),
ATTACHMENT_SLOT_RAIL = list(
- "x" = 38,
- "y" = 18,
+ "x" = 28,
+ "y" = 16,
)
)
-EMPTY_GUN_HELPER(automatic/smg/cobra)
+NO_MAG_GUN_HELPER(automatic/smg/cobra)
/obj/item/gun/ballistic/automatic/smg/cobra/indie
name = "Cobra-20"
@@ -414,19 +407,19 @@ EMPTY_GUN_HELPER(automatic/smg/cobra)
icon_state = "cobra20"
item_state = "cobra20"
-EMPTY_GUN_HELPER(automatic/smg/cobra/indie)
+NO_MAG_GUN_HELPER(automatic/smg/cobra/indie)
/obj/item/ammo_box/magazine/m45_cobra
/obj/item/ammo_box/magazine/m45_cobra
name = "Cobra magazine (.45)"
- desc = "A 28-round magazine for the Cobra submachine gun. These rounds do moderate damage, but struggle against armor."
- icon_state = "cobra_mag-28"
+ desc = "A 24-round magazine for the Cobra submachine gun. These rounds do moderate damage, but struggle against armor."
+ icon_state = "cobra_mag-24"
base_icon_state = "cobra_mag"
ammo_type = /obj/item/ammo_casing/c45
caliber = ".45"
- max_ammo = 28
+ max_ammo = 24
/obj/item/ammo_box/magazine/m45_cobra/update_icon_state()
. = ..()
@@ -445,7 +438,10 @@ EMPTY_GUN_HELPER(automatic/smg/cobra/indie)
icon_state = "sidewinder"
item_state = "sidewinder"
- mag_type = /obj/item/ammo_box/magazine/m57_39_sidewinder
+ default_ammo_type = /obj/item/ammo_box/magazine/m57_39_sidewinder
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m57_39_sidewinder,
+ )
fire_sound = 'sound/weapons/gun/smg/sidewinder.ogg'
@@ -499,11 +495,11 @@ EMPTY_GUN_HELPER(automatic/smg/cobra/indie)
default_attachments = list(/obj/item/attachment/foldable_stock/sidewinder)
-EMPTY_GUN_HELPER(automatic/smg/sidewinder)
+NO_MAG_GUN_HELPER(automatic/smg/sidewinder)
/obj/item/ammo_box/magazine/m57_39_sidewinder
name = "Sidewinder magazine (5.7x39mm)"
- desc = "A 30-round magazine for the Cobra submachine gun. These rounds do okay damage with average performance against armor."
+ desc = "A 30-round magazine for the Sidewinder submachine gun. These rounds do okay damage with average performance against armor."
icon_state = "sidewinder_mag-1"
base_icon_state = "sidewinder_mag"
ammo_type = /obj/item/ammo_casing/c57x39mm
@@ -526,11 +522,16 @@ EMPTY_GUN_HELPER(automatic/smg/sidewinder)
fire_sound = 'sound/weapons/gun/sniper/cmf90.ogg'
- mag_type = /obj/item/ammo_box/magazine/boomslang
+ default_ammo_type = /obj/item/ammo_box/magazine/boomslang
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/boomslang,
+ )
w_class = WEIGHT_CLASS_BULKY
fire_delay = 1 SECONDS
+ slot_flags = ITEM_SLOT_BACK
+
show_magazine_on_sprite = TRUE
unique_mag_sprites_for_variants = TRUE
show_ammo_capacity_on_magazine_sprite = TRUE
@@ -539,18 +540,13 @@ EMPTY_GUN_HELPER(automatic/smg/sidewinder)
spread_unwielded = 35
recoil = 4
recoil_unwielded = 10
- wield_slowdown = 1
+ wield_slowdown = SNIPER_SLOWDOWN
wield_delay = 1.3 SECONDS
zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
zoom_out_amt = 5
- valid_attachments = list(
- /obj/item/attachment/silencer,
- /obj/item/attachment/laser_sight,
- /obj/item/attachment/rail_light,
- /obj/item/attachment/bayonet
- )
+ valid_attachments = SCARBOROUGH_ATTACHMENTS
slot_available = list(
ATTACHMENT_SLOT_MUZZLE = 1,
ATTACHMENT_SLOT_RAIL = 1
@@ -566,7 +562,7 @@ EMPTY_GUN_HELPER(automatic/smg/sidewinder)
)
)
-EMPTY_GUN_HELPER(automatic/marksman/boomslang)
+NO_MAG_GUN_HELPER(automatic/marksman/boomslang)
/obj/item/gun/ballistic/automatic/marksman/boomslang/indie
name = "Boomslang-90"
@@ -578,11 +574,11 @@ EMPTY_GUN_HELPER(automatic/marksman/boomslang)
zoom_amt = 3 //Long range, enough to see in front of you, but no tiles behind you.
zoom_out_amt = 0
-EMPTY_GUN_HELPER(automatic/marksman/boomslang/indie)
+NO_MAG_GUN_HELPER(automatic/marksman/boomslang/indie)
/obj/item/ammo_box/magazine/boomslang
name = "\improper Boomslang Magazine (6.5x57mm CLIP)"
- desc = "A large 10-round box magazine for Boomslang sniper rifles. These rounds deal amazing damage and bypass half of their protective equipment, though it isn't a high enough caliber to pierce armored vehicles."
+ desc = "A large 10-round box magazine for Boomslang sniper rifles. These rounds deal amazing damage and can pierce protective equipment, excluding armored vehicles."
base_icon_state = "boomslang"
icon_state = "boomslang-10"
ammo_type = /obj/item/ammo_casing/a65clip
@@ -592,7 +588,7 @@ EMPTY_GUN_HELPER(automatic/marksman/boomslang/indie)
/obj/item/ammo_box/magazine/boomslang/short
name = "\improper Boomslang Magazine (6.5x57mm CLIP)"
- desc = "A 5-round box magazine for Boomslang sniper rifles. These rounds deal amazing damage and bypass half of their protective equipment, though it isn't a high enough caliber to pierce armored vehicles."
+ desc = "A 5-round box magazine for Boomslang sniper rifles. These rounds deal amazing damage and can pierce protective equipment, excluding armored vehicles."
base_icon_state = "boomslang_short"
icon_state = "boomslang_short-5"
ammo_type = /obj/item/ammo_casing/a65clip
@@ -600,9 +596,6 @@ EMPTY_GUN_HELPER(automatic/marksman/boomslang/indie)
max_ammo = 5
multiple_sprites = AMMO_BOX_PER_BULLET
-/obj/item/ammo_box/magazine/boomslang/short/empty
- start_empty = TRUE
-
/obj/item/gun/ballistic/automatic/marksman/taipan
name = "AMR-83 \"Taipan\""
desc = "A monstrous semi-automatic anti-materiel rifle, surprisingly short for its class. Designed to destroy mechs, light vehicles, and equipment, but more than capable of obliterating regular personnel. Chambered in .50 BMG."
@@ -621,7 +614,10 @@ EMPTY_GUN_HELPER(automatic/marksman/boomslang/indie)
rack_sound = 'sound/weapons/gun/sniper/rack.ogg'
suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg'
weapon_weight = WEAPON_HEAVY
- mag_type = /obj/item/ammo_box/magazine/sniper_rounds
+ default_ammo_type = /obj/item/ammo_box/magazine/sniper_rounds
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/sniper_rounds,
+ )
w_class = WEIGHT_CLASS_BULKY
zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
zoom_out_amt = 5
@@ -642,7 +638,7 @@ EMPTY_GUN_HELPER(automatic/marksman/boomslang/indie)
valid_attachments = list()
slot_available = list()
-EMPTY_GUN_HELPER(automatic/marksman/taipan)
+NO_MAG_GUN_HELPER(automatic/marksman/taipan)
//########### RIFLES ###########//
@@ -657,7 +653,10 @@ EMPTY_GUN_HELPER(automatic/marksman/taipan)
icon_state = "hydra"
item_state = "hydra"
- mag_type = /obj/item/ammo_box/magazine/m556_42_hydra
+ default_ammo_type = /obj/item/ammo_box/magazine/m556_42_hydra
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m556_42_hydra,
+ )
gun_firenames = list(FIREMODE_SEMIAUTO = "single", FIREMODE_BURST = "burst fire", FIREMODE_FULLAUTO = "full auto", FIREMODE_OTHER = "underbarrel grenade launcher")
gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
//gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_BURST, FIREMODE_OTHER)
@@ -681,19 +680,10 @@ EMPTY_GUN_HELPER(automatic/marksman/taipan)
fire_delay = 0.18 SECONDS
spread = 1
spread_unwielded = 8
- wield_slowdown = 0.4
+ wield_slowdown = LIGHT_RIFLE_SLOWDOWN
- valid_attachments = list(
- /obj/item/attachment/silencer,
- /obj/item/attachment/laser_sight,
- /obj/item/attachment/rail_light,
- /obj/item/attachment/bayonet
- )
- slot_available = list(
- ATTACHMENT_SLOT_MUZZLE = 1,
- ATTACHMENT_SLOT_SCOPE = 1,
- ATTACHMENT_SLOT_RAIL = 1
- )
+ valid_attachments = SCARBOROUGH_ATTACHMENTS
+ slot_available = SCARBOROUGH_ATTACH_SLOTS
slot_offsets = list(
ATTACHMENT_SLOT_MUZZLE = list(
"x" = 42,
@@ -709,7 +699,7 @@ EMPTY_GUN_HELPER(automatic/marksman/taipan)
)
)
-EMPTY_GUN_HELPER(automatic/assault/hydra)
+NO_MAG_GUN_HELPER(automatic/assault/hydra)
//we hard code "hydra", why? because if not, i would need to duplicate the extended/short magazine sprites like 3 fucking times for every variant with a different icon state. this eases the spriting burden
/obj/item/gun/ballistic/automatic/assault/hydra/update_overlays()
@@ -746,20 +736,11 @@ EMPTY_GUN_HELPER(automatic/assault/hydra)
fire_delay = 0.08 SECONDS
spread = 6
spread_unwielded = 20
- wield_slowdown = 0.85 //better than the lmgs since it doesnt have a bipod, still not ideal
+ wield_slowdown = SAW_SLOWDOWN //better than the lmgs since it doesnt have a bipod, still not ideal
wield_delay = 0.9 SECONDS //ditto
- valid_attachments = list(
- /obj/item/attachment/silencer,
- /obj/item/attachment/laser_sight,
- /obj/item/attachment/rail_light,
- /obj/item/attachment/bayonet
- )
- slot_available = list(
- ATTACHMENT_SLOT_MUZZLE = 1,
- ATTACHMENT_SLOT_SCOPE = 1,
- ATTACHMENT_SLOT_RAIL = 1
- )
+ valid_attachments = SCARBOROUGH_ATTACHMENTS
+ slot_available = SCARBOROUGH_ATTACH_SLOTS
slot_offsets = list(
ATTACHMENT_SLOT_MUZZLE = list(
"x" = 48,
@@ -776,20 +757,11 @@ EMPTY_GUN_HELPER(automatic/assault/hydra)
)
/obj/item/gun/ballistic/automatic/assault/hydra/lmg/extended
- spawnwithmagazine = FALSE //so we spawn with the short magaine
+ default_ammo_type = /obj/item/ammo_box/magazine/m556_42_hydra/extended
-/obj/item/gun/ballistic/automatic/assault/hydra/lmg/extended/Initialize()
- . = ..()
- magazine = new /obj/item/ammo_box/magazine/m556_42_hydra/extended(src)
- chamber_round()
/obj/item/gun/ballistic/automatic/assault/hydra/lmg/casket_mag
- spawnwithmagazine = FALSE //so we spawn with the short magaine
-
-/obj/item/gun/ballistic/automatic/assault/hydra/lmg/casket_mag/Initialize()
- . = ..()
- magazine = new /obj/item/ammo_box/magazine/m556_42_hydra/casket(src)
- chamber_round()
+ default_ammo_type = /obj/item/ammo_box/magazine/m556_42_hydra/casket
/obj/item/gun/ballistic/automatic/assault/hydra/dmr
name = "SBR-80 \"Hydra\""
@@ -803,10 +775,10 @@ EMPTY_GUN_HELPER(automatic/assault/hydra)
spread = 0
spread_unwielded = 12
- wield_slowdown = 0.8 //dmrrrr
+ wield_slowdown = DMR_SLOWDOWN //dmrrrr
wield_delay = 0.85 SECONDS //above
- spawnwithmagazine = FALSE //so we spawn with the short magaine
zoomable = TRUE
+ default_ammo_type = /obj/item/ammo_box/magazine/m556_42_hydra/small
EMPTY_GUN_HELPER(automatic/assault/hydra/dmr)
@@ -814,11 +786,10 @@ EMPTY_GUN_HELPER(automatic/assault/hydra/dmr)
. = ..()
// [CELADON-EDIT] -- CELADON_FIXES -- фиксим неподходящий магазин (вагабага дырдырдыр)
// magazine = new /obj/item/ammo_box/magazine/m556_42_hydra/small(src)
- magazine = new mag_type(src)
+ // magazine = new mag_type(src)
// [/CELADON-EDIT]
chamber_round()
-
/obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl
name = "SMR-80 \"Hydra\""
desc = "Scarborough Arms' premier modular assault rifle platform. This is the basic configuration, optimized for light weight and handiness. A very well-regarded, if expensive and rare, assault rifle. This one has an underslung grenade launcher attached. Chambered in 5.56x42mm CLIP."
@@ -872,7 +843,7 @@ EMPTY_GUN_HELPER(automatic/assault/hydra/dmr)
/obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl/on_wield(obj/item/source, mob/user)
wielded = TRUE
secondary.wielded = TRUE
- INVOKE_ASYNC(src, .proc.do_wield, user)
+ INVOKE_ASYNC(src, PROC_REF(do_wield), user)
/obj/item/gun/ballistic/automatic/assault/hydra/underbarrel_gl/do_wield(mob/user)
. = ..()
@@ -943,7 +914,10 @@ EMPTY_GUN_HELPER(automatic/assault/hydra/dmr)
item_state = "bulldog"
weapon_weight = WEAPON_MEDIUM
- mag_type = /obj/item/ammo_box/magazine/m12g_bulldog
+ default_ammo_type = /obj/item/ammo_box/magazine/m12g_bulldog
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m12g_bulldog,
+ )
fire_delay = 0.4 SECONDS // this NEEDS the old delay.
fire_sound = 'sound/weapons/gun/shotgun/bulldog.ogg'
show_magazine_on_sprite = TRUE
@@ -968,16 +942,11 @@ EMPTY_GUN_HELPER(automatic/assault/hydra/dmr)
spread_unwielded = 16
recoil = 1
recoil_unwielded = 4
- wield_slowdown = 0.6
+ wield_slowdown = HEAVY_SHOTGUN_SLOWDOWN
wield_delay = 0.65 SECONDS
- valid_attachments = list(
- /obj/item/attachment/silencer,
- )
- slot_available = list(
- ATTACHMENT_SLOT_MUZZLE = 1,
- ATTACHMENT_SLOT_SCOPE = 1
- )
+ valid_attachments = SCARBOROUGH_ATTACHMENTS
+ slot_available = SCARBOROUGH_ATTACH_SLOTS
slot_offsets = list(
ATTACHMENT_SLOT_MUZZLE = list(
"x" = 44,
@@ -986,10 +955,17 @@ EMPTY_GUN_HELPER(automatic/assault/hydra/dmr)
ATTACHMENT_SLOT_SCOPE = list(
"x" = 25,
"y" = 24,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 30,
+ "y" = 18,
)
)
-EMPTY_GUN_HELPER(shotgun/automatic/bulldog)
+/obj/item/gun/ballistic/shotgun/automatic/bulldog/drum
+ default_ammo_type = /obj/item/ammo_box/magazine/m12g_bulldog/drum
+
+NO_MAG_GUN_HELPER(shotgun/automatic/bulldog)
/obj/item/ammo_box/magazine/m12g_bulldog
name = "shotgun box magazine (12g buckshot)"
@@ -1001,6 +977,9 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog)
max_ammo = 8
multiple_sprites = AMMO_BOX_FULL_EMPTY
+/obj/item/ammo_box/magazine/m12g_bulldog/empty
+ start_empty = TRUE
+
/obj/item/ammo_box/magazine/m12g_bulldog/drum
name = "shotgun drum magazine (12g buckshot)"
desc = "A bulky 12-round drum designed for the Bulldog shotgun and it's derivatives."
@@ -1012,6 +991,9 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog)
w_class = WEIGHT_CLASS_NORMAL
multiple_sprites = AMMO_BOX_FULL_EMPTY
+/obj/item/ammo_box/magazine/m12g_bulldog/drum/empty
+ start_empty = TRUE
+
/obj/item/ammo_box/magazine/m12g_bulldog/drum/stun
name = "shotgun drum magazine (12g taser slugs)"
ammo_type = /obj/item/ammo_casing/shotgun/stunslug
@@ -1032,10 +1014,6 @@ EMPTY_GUN_HELPER(shotgun/automatic/bulldog)
name = "shotgun drum magazine (12g meteor slugs)"
ammo_type = /obj/item/ammo_casing/shotgun/meteorslug
-
-EMPTY_GUN_HELPER(shotgun/bulldog)
-
-
/obj/item/gun/ballistic/rocketlauncher/mako
name = "RR-86 \"Mako\""
desc = "A large, four-tube rocket launcher, the Mako fires (relatively) small rockets filled with incendiary compound, designed to cause fires and deny enemy movement. Capable of causing significant damage to exosuits on impact, as well."
@@ -1047,7 +1025,10 @@ EMPTY_GUN_HELPER(shotgun/bulldog)
icon_state = "mako"
item_state = "mako"
- mag_type = /obj/item/ammo_box/magazine/internal/mako
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/mako
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/mako,
+ )
fire_sound = 'sound/weapons/gun/general/rocket_launch.ogg'
load_sound = 'sound/weapons/gun/general/rocket_load.ogg'
w_class = WEIGHT_CLASS_BULKY
@@ -1073,7 +1054,7 @@ EMPTY_GUN_HELPER(shotgun/bulldog)
/obj/item/ammo_casing/caseless/rocket/a70mm
name = "\improper M-KO-9HE"
- desc = "An 70mm High Explosive rocket. Fire at mech and pray."
+ desc = "A 70mm High Explosive rocket. Fire at mech and pray."
icon_state = "srm-8"
caliber = "70mm"
projectile_type = /obj/projectile/bullet/a84mm_he
@@ -1081,7 +1062,10 @@ EMPTY_GUN_HELPER(shotgun/bulldog)
/obj/item/ammo_casing/caseless/rocket/a70mm/hedp
name = "\improper M-KO-9HEDP"
- desc = "An 84mm High Explosive Dual Purpose rocket. Pointy end toward armor."
+ desc = "A 70mm High Explosive Dual Purpose rocket. Pointy end toward armor."
caliber = "70mm"
icon_state = "84mm-hedp"
projectile_type = /obj/projectile/bullet/a84mm
+
+#undef SCARBOROUGH_ATTACHMENTS
+#undef SCARBOROUGH_ATTACH_SLOTS
diff --git a/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm b/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm
new file mode 100644
index 000000000000..9cce455663ca
--- /dev/null
+++ b/code/modules/projectiles/guns/manufacturer/serene_sporting/ballistics.dm
@@ -0,0 +1,274 @@
+#define SERENE_ATTACHMENTS list(/obj/item/attachment/rail_light, /obj/item/attachment/bayonet)
+#define SERENE_ATTACH_SLOTS list(ATTACHMENT_SLOT_MUZZLE = 1, ATTACHMENT_SLOT_RAIL = 1)
+
+/* Micro Target */
+
+/obj/item/gun/ballistic/automatic/pistol/m17
+ name = "Model 17 \"Micro Target\""
+ desc = "A lightweight and very accurate target pistol produced by Serene Outdoors. The barrel can be unscrewed for storage. Chambered in .22 LR."
+
+ icon = 'icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi'
+ icon_state = "m17"
+ item_state = "so_generic"
+
+ default_ammo_type = /obj/item/ammo_box/magazine/m17
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m17,
+ )
+
+ fire_sound = 'sound/weapons/gun/pistol/himehabu.ogg'
+
+ manufacturer = MANUFACTURER_SERENE
+ show_magazine_on_sprite = TRUE
+ bolt_type = BOLT_TYPE_LOCKING
+
+ w_class = WEIGHT_CLASS_SMALL
+
+ spread = 25
+ spread_unwielded = 45
+ recoil = -2
+ recoil_unwielded = -2
+
+ wield_slowdown = PISTOL_SLOWDOWN
+
+ valid_attachments = list(
+ /obj/item/attachment/m17_barrel,
+ )
+ slot_available = list(
+ ATTACHMENT_SLOT_MUZZLE = 1,
+ )
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 30,
+ "y" = 23,
+ ),
+ )
+
+ default_attachments = list(/obj/item/attachment/m17_barrel)
+
+EMPTY_GUN_HELPER(automatic/pistol/m17)
+
+/obj/item/ammo_box/magazine/m17
+ name = "Model 17 magazine (.22lr)"
+ desc = "A 10-round magazine for the Model 17 \"Micro Target\". These rounds do okay damage with awful performance against armor."
+ icon_state = "m17_mag-1"
+ base_icon_state = "m17_mag"
+ ammo_type = /obj/item/ammo_casing/c22lr
+ caliber = "22lr"
+ max_ammo = 10
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/m17/empty
+ start_empty = TRUE
+
+/* Sporter */
+
+/obj/item/gun/ballistic/automatic/m12_sporter
+ name = "Model 12 \"Sporter\""
+ desc = "An extremely popular target shooting rifle produced by Serene Outdoors. Inexpensive, widely available, and produced in massive numbers, the Sporter is also popular for hunting small game and ground birds. Chambered in .22 LR."
+
+ icon = 'icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi'
+ icon_state = "m12"
+ item_state = "m12"
+
+ weapon_weight = WEAPON_MEDIUM
+ default_ammo_type = /obj/item/ammo_box/magazine/m12_sporter
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m12_sporter,
+ )
+
+ fire_delay = 0.4 SECONDS
+ burst_size = 1
+ w_class = WEIGHT_CLASS_BULKY
+ slot_flags = ITEM_SLOT_BACK
+ show_magazine_on_sprite = TRUE
+ bolt_type = BOLT_TYPE_LOCKING
+
+ fire_sound = 'sound/weapons/gun/gauss/claris.ogg'
+
+ spread = 0
+ spread_unwielded = 15
+ recoil = 0
+ recoil_unwielded = 2
+ wield_slowdown = LIGHT_RIFLE_SLOWDOWN
+ wield_delay = 1 SECONDS
+
+ manufacturer = MANUFACTURER_SERENE
+
+ valid_attachments = SERENE_ATTACHMENTS
+ slot_available = SERENE_ATTACH_SLOTS
+
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 44,
+ "y" = 18,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 17,
+ "y" = 20,
+ )
+ )
+
+EMPTY_GUN_HELPER(automatic/m12_sporter)
+
+
+/obj/item/ammo_box/magazine/m12_sporter
+ name = "Model 12 magazine (.22lr)"
+ desc = "A 25-round magazine for the Model 12 \"Sporter\". These rounds do okay damage with awful performance against armor."
+ icon_state = "m12_mag-1"
+ base_icon_state = "m12_mag"
+ ammo_type = /obj/item/ammo_casing/c22lr
+ caliber = "22lr"
+ max_ammo = 25
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/m12_sporter/empty
+ start_empty = TRUE
+
+/obj/item/gun/ballistic/automatic/m12_sporter/mod
+ name = "Model 13 \"Larker\""
+ desc = "A common after-market modification of the Model 12 \"Sporter\" rifle, keyed to fire a three round burst."
+ burst_size = 3
+ burst_delay = 0.6
+
+ icon_state = "larker"
+ item_state = "larker"
+
+ gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_BURST)
+ gun_firenames = list(FIREMODE_SEMIAUTO = "single", FIREMODE_BURST = "triptych")
+ default_firemode = FIREMODE_BURST
+
+EMPTY_GUN_HELPER(automatic/m12_sporter/mod)
+
+/* super soaker */
+
+/obj/item/gun/ballistic/automatic/m15
+ name = "Model 15 Super Sporter"
+ desc = "A popular semi-automatic hunting rifle produced by Serene Outdoors. Solid all-round performance, high accuracy, and ease of access compared to military rifles makes the Super Sporter a popular choice for hunting medium game and occasionally self-defense. Chambered in 5.56mm."
+
+ icon = 'icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi'
+ icon_state = "m15"
+ item_state = "m15"
+
+ default_ammo_type = /obj/item/ammo_box/magazine/m15
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/m15,
+ )
+
+ fire_sound = 'sound/weapons/gun/rifle/m16.ogg'
+
+ manufacturer = MANUFACTURER_SERENE
+ show_magazine_on_sprite = TRUE
+
+ bolt_type = BOLT_TYPE_LOCKING
+
+ slot_flags = ITEM_SLOT_BACK
+
+ w_class = WEIGHT_CLASS_BULKY
+ weapon_weight = WEAPON_MEDIUM
+
+ slot_flags = ITEM_SLOT_BACK
+
+ spread = 0
+ spread_unwielded = 20
+ recoil = 0.5
+ recoil_unwielded = 3
+ wield_slowdown = LIGHT_RIFLE_SLOWDOWN
+ wield_delay = 1 SECONDS
+
+ valid_attachments = SERENE_ATTACHMENTS
+ slot_available = SERENE_ATTACH_SLOTS
+
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 47,
+ "y" = 21,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 13,
+ "y" = 23,
+ )
+ )
+
+EMPTY_GUN_HELPER(automatic/m15)
+
+/obj/item/ammo_box/magazine/m15
+ name = "Model 15 magazine (5.56x42mm CLIP)"
+ desc = "A 20-round magazine for the Model 15 \"Super Sporter\". These rounds do average damage and perform moderately against armor."
+ icon_state = "p16_mag-1"
+ base_icon_state = "p16_mag"
+ ammo_type = /obj/item/ammo_casing/a556_42
+ caliber = "5.56x42mm"
+ max_ammo = 20
+ multiple_sprites = AMMO_BOX_FULL_EMPTY
+
+/obj/item/ammo_box/magazine/m15/empty
+ start_empty = TRUE
+
+/* cuckmaster */
+
+/obj/item/gun/ballistic/shotgun/automatic/m11
+ name = "Model 11 \"Buckmaster\""
+ desc = "A semi-automatic hunting shotgun produced by Serene Outdoors. Much lighter and handier than military combat shotguns, it offers the same fire rate and magazine capacity, making it an excellent choice for hunting birds and large game or for security forces looking to upgrade from pump action guns. Chambered in 12g."
+
+ icon = 'icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi'
+ icon_state = "buckmaster"
+ item_state = "buckmaster"
+
+ fire_delay = 0.5 SECONDS
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/shot/buckmaster
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/shot/buckmaster,
+ )
+ w_class = WEIGHT_CLASS_BULKY
+
+ bolt_type = BOLT_TYPE_LOCKING
+
+ fire_sound = 'sound/weapons/gun/shotgun/bulldog.ogg'
+
+ spread = 4
+ spread_unwielded = 16
+ recoil = 1
+ recoil_unwielded = 4
+ wield_slowdown = SHOTGUN_SLOWDOWN
+ wield_delay = 0.65 SECONDS
+
+ casing_ejector = TRUE
+
+ manufacturer = MANUFACTURER_SERENE
+
+ valid_attachments = SERENE_ATTACHMENTS
+ slot_available = SERENE_ATTACH_SLOTS
+
+ slot_offsets = list(
+ ATTACHMENT_SLOT_MUZZLE = list(
+ "x" = 45,
+ "y" = 18,
+ ),
+ ATTACHMENT_SLOT_RAIL = list(
+ "x" = 16,
+ "y" = 22,
+ )
+ )
+
+/obj/item/ammo_box/magazine/internal/shot/buckmaster
+ name = "Buckmaster internal magazine"
+ ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+ max_ammo = 8
+
+EMPTY_GUN_HELPER(shotgun/automatic/m11)
+
+#undef SERENE_ATTACHMENTS
+#undef SERENE_ATTACH_SLOTS
diff --git a/code/modules/projectiles/guns/manufacturer/solar_armories/ballistic.dm b/code/modules/projectiles/guns/manufacturer/solar_armories/ballistic.dm
new file mode 100644
index 000000000000..6a1575ab2043
--- /dev/null
+++ b/code/modules/projectiles/guns/manufacturer/solar_armories/ballistic.dm
@@ -0,0 +1,209 @@
+///SOLAR ARMORIES
+//fuck you im not typing the full name out
+//solarwaffledesuckenmydickengeschutzenweaponmanufacturinglocation
+
+///Pistols
+/obj/item/gun/ballistic/automatic/powered/gauss/modelh
+ name = "Model H"
+ desc = "A standard-issue pistol exported from the Solarian Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor."
+
+ icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
+ icon_state = "model-h"
+ item_state = "model-h"
+ fire_sound = 'sound/weapons/gun/gauss/modelh.ogg'
+ load_sound = 'sound/weapons/gun/gauss/pistol_reload.ogg'
+
+ default_ammo_type = /obj/item/ammo_box/magazine/modelh
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/modelh,
+ )
+ default_cell_type = /obj/item/stock_parts/cell/gun/solgov
+ allowed_cell_types = list(
+ /obj/item/stock_parts/cell/gun/solgov,
+ )
+
+ slot_flags = ITEM_SLOT_BELT
+ w_class = WEIGHT_CLASS_SMALL
+ fire_delay = 0.6 SECONDS //pistol, but heavy caliber.
+ show_magazine_on_sprite = FALSE
+ empty_indicator = FALSE
+ manufacturer = MANUFACTURER_SOLARARMORIES
+ recoil = 2
+ recoil_unwielded = 4
+ spread = 6
+ spread_unwielded = 12
+ fire_select_icon_state_prefix = "slug_"
+
+ valid_attachments = list(
+ /obj/item/attachment/laser_sight,
+ /obj/item/attachment/rail_light,
+ )
+
+/obj/item/gun/ballistic/automatic/powered/gauss/modelh/no_mag
+ default_ammo_type = FALSE
+
+/obj/item/gun/ballistic/automatic/powered/gauss/modelh/suns
+ desc = "A standard-issue pistol exported from the Solarian Confederation. It fires slow flesh-rending ferromagnetic slugs at a high energy cost, however they are ineffective on any armor. It is painted in the colors of SUNS."
+ default_ammo_type = /obj/item/ammo_box/magazine/modelh
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/modelh,
+ )
+ icon_state = "model-h_suns"
+ item_state = "model-h_suns"
+
+//not gauss pistol
+/obj/item/gun/ballistic/automatic/pistol/solgov
+ name = "\improper Pistole C"
+ desc = "A favorite of the Terran Regency that is despised by the Solarian bureaucracy. Shifted out of military service centuries ago, though still popular among civilians. Chambered in 5.56mm caseless."
+ icon_state = "pistole-c"
+ icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
+
+ weapon_weight = WEAPON_LIGHT
+ default_ammo_type = /obj/item/ammo_box/magazine/pistol556mm
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/pistol556mm,
+ )
+ fire_sound = 'sound/weapons/gun/pistol/pistolec.ogg'
+ manufacturer = MANUFACTURER_SOLARARMORIES
+ 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'
+
+ rack_sound = 'sound/weapons/gun/pistol/rack_small.ogg'
+ lock_back_sound = 'sound/weapons/gun/pistol/lock_small.ogg'
+ bolt_drop_sound = 'sound/weapons/gun/pistol/drop_small.ogg'
+
+ fire_select_icon_state_prefix = "caseless_"
+
+ slot_flags = ITEM_SLOT_BELT
+
+/obj/item/gun/ballistic/automatic/pistol/solgov/old
+ icon_state = "pistole-c-old"
+
+///Rifles
+
+/obj/item/gun/ballistic/automatic/powered/gauss/claris
+ name = "Claris"
+ desc = "An antiquated Solarian rifle. Chambered in ferromagnetic pellets, just as the founding Solarians intended."
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/claris
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/claris,
+ )
+ icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
+ icon_state = "claris"
+ item_state = "claris"
+ fire_sound = 'sound/weapons/gun/gauss/claris.ogg'
+ load_sound = 'sound/weapons/gun/gauss/sniper_reload.ogg'
+ default_cell_type = /obj/item/stock_parts/cell/gun/solgov
+ allowed_cell_types = list(
+ /obj/item/stock_parts/cell/gun/solgov,
+ )
+ fire_delay = 0.4 SECONDS
+ bolt_type = BOLT_TYPE_NO_BOLT
+ internal_magazine = TRUE
+ show_magazine_on_sprite = FALSE
+ empty_indicator = FALSE
+ manufacturer = MANUFACTURER_SOLARARMORIES
+ fire_select_icon_state_prefix = "pellet_"
+
+ slot_flags = ITEM_SLOT_BACK
+
+ valid_attachments = list(
+ /obj/item/attachment/laser_sight,
+ /obj/item/attachment/rail_light,
+ /obj/item/attachment/bayonet,
+ /obj/item/attachment/energy_bayonet
+ )
+
+
+/obj/item/gun/ballistic/automatic/powered/gauss/claris/suns
+ desc = "An antiquated Solarian rifle. Chambered in ferromagnetic pellets, just as the founding Solarians intended. Evidently, SUNS' founders echo the sentiment, as it appears to be painted in their colors."
+ icon_state = "claris_suns"
+ item_state = "claris_suns"
+
+/obj/item/gun/ballistic/automatic/powered/gauss/gar
+ name = "Solar 'GAR' Carbine"
+ desc = "A Solarian carbine, unusually modern for its producers. Launches ferromagnetic lances at alarming speeds."
+ default_ammo_type = /obj/item/ammo_box/magazine/gar
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/gar,
+ )
+ icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
+ icon_state = "gar"
+ item_state = "gar"
+ fire_sound = 'sound/weapons/gun/gauss/gar.ogg'
+ load_sound = 'sound/weapons/gun/gauss/rifle_reload.ogg'
+ default_cell_type = /obj/item/stock_parts/cell/gun/solgov
+ allowed_cell_types = list(
+ /obj/item/stock_parts/cell/gun/solgov,
+ )
+ burst_size = 1
+
+ fire_delay = 0.2 SECONDS
+
+ actions_types = list()
+ empty_indicator = FALSE
+ manufacturer = MANUFACTURER_SOLARARMORIES
+
+ slot_flags = ITEM_SLOT_BACK
+
+ valid_attachments = list(
+ /obj/item/attachment/laser_sight,
+ /obj/item/attachment/rail_light,
+ /obj/item/attachment/bayonet,
+ /obj/item/attachment/energy_bayonet
+ )
+
+ gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
+ default_firemode = FIREMODE_SEMIAUTO
+
+ wield_delay = 0.7 SECONDS
+ fire_select_icon_state_prefix = "lance_"
+
+/obj/item/gun/ballistic/automatic/powered/gauss/gar/suns
+ desc = "A Solarian carbine, unusually modern for its producers. It's just modern enough for SUNS, however, who have painted the weapon in their colors. Launches ferromagnetic lances at alarming speeds."
+ icon_state = "gar_suns"
+ item_state = "gar_suns"
+
+///Sniper
+/obj/item/gun/ballistic/rifle/solgov
+ name = "SSG-669C"
+ desc = "A bolt-action sniper rifle used by Solarian troops. Beloved for its rotary design and accuracy. Chambered in 8x58mm Caseless."
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/boltaction/solgov
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/boltaction/solgov,
+ )
+ icon_state = "ssg669c"
+ item_state = "ssg669c"
+ icon = 'icons/obj/guns/manufacturer/solararmories/48x32.dmi'
+ lefthand_file = 'icons/obj/guns/manufacturer/solararmories/lefthand.dmi'
+ righthand_file = 'icons/obj/guns/manufacturer/solararmories/righthand.dmi'
+ mob_overlay_icon = 'icons/obj/guns/manufacturer/solararmories/onmob.dmi'
+
+ fire_sound = 'sound/weapons/gun/rifle/ssg669c.ogg'
+ can_be_sawn_off = FALSE
+
+ zoomable = TRUE
+ zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.
+ zoom_out_amt = 5
+
+ manufacturer = MANUFACTURER_SOLARARMORIES
+ spread = -5
+ spread_unwielded = 20
+ recoil = 0
+ recoil_unwielded = 4
+ wield_slowdown = SNIPER_SLOWDOWN
+ wield_delay = 1.3 SECONDS
diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm
index b131b03ec148..3d1c407a7e56 100644
--- a/code/modules/projectiles/guns/misc/beam_rifle.dm
+++ b/code/modules/projectiles/guns/misc/beam_rifle.dm
@@ -28,9 +28,11 @@
weapon_weight = WEAPON_HEAVY
w_class = WEIGHT_CLASS_BULKY
ammo_type = list(/obj/item/ammo_casing/energy/beam_rifle/hitscan)
- internal_cell = FALSE //prevents you from giving it an OP cell - WS Edit //shut up dumb nerd
- mag_size = MAG_SIZE_LARGE
- cell_type = "/obj/item/stock_parts/cell/gun/large"
+ internal_magazine = FALSE //prevents you from giving it an OP cell - WS Edit //shut up dumb nerd
+ default_ammo_type = /obj/item/stock_parts/cell/gun/large
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/gun/large,
+ )
canMouseDown = TRUE
var/aiming = FALSE
var/aiming_time = 12
@@ -78,7 +80,10 @@
/obj/item/gun/energy/beam_rifle/debug
delay = 0
- cell_type = /obj/item/stock_parts/cell/infinite
+ default_ammo_type = /obj/item/stock_parts/cell/infinite
+ allowed_ammo_types = list(
+ /obj/item/stock_parts/cell/infinite,
+ )
aiming_time = 0
recoil = 0
@@ -477,7 +482,7 @@
if(isliving(target))
var/mob/living/L = target
L.adjustFireLoss(impact_direct_damage)
- L.emote("scream")
+ L.force_scream()
/obj/projectile/beam/beam_rifle/proc/handle_hit(atom/target, piercing_hit = FALSE)
set waitfor = FALSE
diff --git a/code/modules/projectiles/guns/misc/bow.dm b/code/modules/projectiles/guns/misc/bow.dm
index 9f2957ba40cd..01c60b3ca865 100644
--- a/code/modules/projectiles/guns/misc/bow.dm
+++ b/code/modules/projectiles/guns/misc/bow.dm
@@ -7,7 +7,10 @@
load_sound = null
fire_sound = 'sound/weapons/bowfire.ogg'
slot_flags = ITEM_SLOT_BACK
- mag_type = /obj/item/ammo_box/magazine/internal/bow
+ default_ammo_type = /obj/item/ammo_box/magazine/internal/bow
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/internal/bow,
+ )
trigger_guard = TRIGGER_GUARD_ALLOW_ALL
force = 15
attack_verb = list("whipped", "cracked")
diff --git a/code/modules/projectiles/guns/powered.dm b/code/modules/projectiles/guns/powered.dm
index a9ab2f6365f4..44419c099564 100644
--- a/code/modules/projectiles/guns/powered.dm
+++ b/code/modules/projectiles/guns/powered.dm
@@ -1,13 +1,21 @@
/obj/item/gun/ballistic/automatic/powered
- mag_type = /obj/item/ammo_box/magazine/gauss
+ default_ammo_type = /obj/item/ammo_box/magazine/gauss
+ allowed_ammo_types = list(
+ /obj/item/ammo_box/magazine/gauss,
+ )
+ var/default_cell_type = /obj/item/stock_parts/cell/gun
+ var/list/allowed_cell_types = list(
+ /obj/item/stock_parts/cell/gun,
+ /obj/item/stock_parts/cell/gun/upgraded,
+ /obj/item/stock_parts/cell/gun/empty,
+ /obj/item/stock_parts/cell/gun/upgraded/empty,
+ )
charge_sections = 3
/obj/item/gun/ballistic/automatic/powered/Initialize()
. = ..()
- if(cell_type)
- cell = new cell_type(src)
- else
- cell = new(src)
+ if(default_cell_type)
+ cell = new default_cell_type(src)
update_appearance()
/obj/item/gun/ballistic/automatic/powered/examine(mob/user)
@@ -39,19 +47,13 @@
//the things below were taken from energy gun code. blame whoever coded this, not me
/obj/item/gun/ballistic/automatic/powered/attackby(obj/item/A, mob/user, params)
- if (!internal_cell && istype(A, /obj/item/stock_parts/cell/gun))
+ if (!internal_cell && (A.type in allowed_cell_types))
var/obj/item/stock_parts/cell/gun/C = A
if (!cell)
insert_cell(user, C)
return ..()
/obj/item/gun/ballistic/automatic/powered/proc/insert_cell(mob/user, obj/item/stock_parts/cell/gun/C)
- if(mag_size == MAG_SIZE_SMALL && !istype(C, /obj/item/stock_parts/cell/gun/mini))
- to_chat(user, "\The [C] doesn't seem to fit into \the [src]...")
- return FALSE
- if(mag_size == MAG_SIZE_LARGE && !istype(C, /obj/item/stock_parts/cell/gun/large))
- to_chat(user, "\The [C] doesn't seem to fit into \the [src]...")
- return FALSE
if(user.transferItemToLoc(C, src))
cell = C
to_chat(user, "You load the [C] into \the [src].")
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 61c0e7d5e154..5367517b2230 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -73,7 +73,10 @@
/// number of times we've pierced something. Incremented BEFORE bullet_act and on_hit proc!
var/pierces = 0
- var/speed = 0.8 //Amount of deciseconds it takes for projectile to travel
+ ///Amount of deciseconds it takes for projectile to travel
+ var/speed = 0.8
+ ///plus/minus modifier to projectile speed
+ var/speed_mod = 0
var/Angle = 0
var/original_angle = 0 //Angle at firing
var/nondirectional_sprite = FALSE //Set TRUE to prevent projectiles from having their sprites rotated based on firing angle
@@ -141,6 +144,7 @@
var/decayedRange //stores original range
var/reflect_range_decrease = 5 //amount of original range that falls off when reflecting, so it doesn't go forever
var/reflectable = NONE // Can it be reflected or not?
+
//Effects
var/stun = 0
var/knockdown = 0
@@ -164,6 +168,7 @@
///If defined, on hit we create an item of this type then call hitby() on the hit target with this, mainly used for embedding items (bullets) in targets
var/shrapnel_type
+
///If TRUE, hit mobs even if they're on the floor and not our target
var/hit_stunned_targets = FALSE
/// If true directly targeted turfs can be hit
@@ -176,6 +181,7 @@
/obj/projectile/Initialize()
. = ..()
decayedRange = range
+ speed = speed + speed_mod
AddElement(/datum/element/connect_loc, projectile_connections)
/obj/projectile/proc/Range()
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index b95c3dd37ddb..b0942a242cac 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -63,6 +63,9 @@
muzzle_type = /obj/effect/projectile/muzzle/heavy_laser
impact_type = /obj/effect/projectile/impact/heavy_laser
+/obj/projectile/beam/laser/heavylaser/assault
+ armour_penetration = 20
+
/obj/projectile/beam/laser/heavylaser/sharplite
speed = 0.4
@@ -80,6 +83,10 @@
/obj/projectile/beam/weaker
damage = 10
+/obj/projectile/beam/weak/low_range
+ damage = 10
+ range = 9
+
/obj/projectile/beam/weak/penetrator
armour_penetration = 50
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 43106f97deec..277aa5e0404e 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -2,7 +2,7 @@
name = "bullet"
icon_state = "gauss"
damage = 60
- speed = 0.4
+ speed = BULLET_SPEED_RIFLE
damage_type = BRUTE
nodamage = FALSE
flag = "bullet"
diff --git a/code/modules/projectiles/projectile/bullets/lmg.dm b/code/modules/projectiles/projectile/bullets/lmg.dm
index 71da70475dde..5e246236fc70 100644
--- a/code/modules/projectiles/projectile/bullets/lmg.dm
+++ b/code/modules/projectiles/projectile/bullets/lmg.dm
@@ -59,28 +59,25 @@
/obj/projectile/bullet/mm712x82
name = "7.12x82mm bullet"
damage = 25
- armour_penetration = 4076
+ armour_penetration = 40
+ speed = BULLET_SPEED_RIFLE
/obj/projectile/bullet/mm712x82/ap
name = "7.12x82mm armor-piercing bullet"
armour_penetration = 75
+ speed_mod = BULLET_SPEED_AP_MOD
/obj/projectile/bullet/mm712x82/hp
name = "7.12x82mm hollow point bullet"
damage = 40
armour_penetration = -20
-
-/obj/projectile/bullet/incendiary/mm712x82
- name = "7.12x82mm incendiary bullet"
- damage = 15
- armour_penetration = 40
- fire_stacks = 3
+ speed_mod = BULLET_SPEED_HP_MOD
/obj/projectile/bullet/mm712x82/match
name = "7.12x82mm match bullet"
- speed = 0.3
armour_penetration = 50
ricochets_max = 2
ricochet_chance = 60
ricochet_auto_aim_range = 4
ricochet_incidence_leeway = 35
+ speed_mod = BULLET_SPEED_HP_MOD
diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm
index 37af59c1de57..73da54ea5819 100644
--- a/code/modules/projectiles/projectile/bullets/pistol.dm
+++ b/code/modules/projectiles/projectile/bullets/pistol.dm
@@ -1,98 +1,144 @@
+//.22lr (Himehabu, Micro Target, Pounder (uwu))
+
+/obj/projectile/bullet/c22lr
+ name = ".22LR bullet"
+ damage = 18
+ armour_penetration = -45
+ ricochet_incidence_leeway = 20
+ ricochet_chance = 65
+ speed = BULLET_SPEED_HANDGUN
+
+/obj/projectile/bullet/c22lr/hp
+ name = ".22LR bullet"
+ damage = 24
+ armour_penetration = -65
+ ricochet_chance = 0
+ speed_mod = BULLET_SPEED_HP_MOD
+
+/obj/projectile/bullet/c22lr/ap
+ name = ".22LR armor piercing bullet"
+ damage = 14
+ armour_penetration = -25
+ ricochet_incidence_leeway = 20
+ ricochet_chance = 30
+ speed_mod = BULLET_SPEED_AP_MOD
+
+/obj/projectile/bullet/c22lr/rubber
+ name = ".22LR rubber bullet"
+ damage = 4
+ stamina = 15
+ armour_penetration = -70
+ speed_mod = BULLET_SPEED_HV_MOD //do not do this for other rubber bullets. If you do I will come out of the woodwork and bludgeon you to death with this stick i found.
+ ricochets_max = 8 //ding ding ding ding
+ ricochet_incidence_leeway = 70
+ ricochet_chance = 130
+ ricochet_decay_damage = 0.8
+
// 9mm (Commander, SABR)
/obj/projectile/bullet/c9mm
name = "9mm bullet"
damage = 20
armour_penetration = -20
+ speed = BULLET_SPEED_HANDGUN
/obj/projectile/bullet/c9mm/surplus
name = "9mm surplus bullet"
damage = 15
+ speed_mod = BULLET_SPEED_SURPLUS_MOD
/obj/projectile/bullet/c9mm/ap
name = "9mm armor-piercing bullet"
damage = 15
armour_penetration = 20
+ speed_mod = BULLET_SPEED_AP_MOD
/obj/projectile/bullet/c9mm/hp
name = "9mm hollow point bullet"
damage = 35
armour_penetration = -50
-
-/obj/projectile/bullet/incendiary/c9mm
- name = "9mm incendiary bullet"
- damage = 10
- armour_penetration = -20
- fire_stacks = 2
+ speed_mod = BULLET_SPEED_HP_MOD
/obj/projectile/bullet/c9mm/rubber
name = "9mm rubber bullet"
damage = 5
armour_penetration = -40
stamina = 30
+ speed_mod = BULLET_SPEED_RUBBER_MOD
-// 10mm (Ringneck & SkM-44(k))
+// 10mm (Ringneck)
/obj/projectile/bullet/c10mm
name = "10mm bullet"
damage = 25
armour_penetration = -20
+ speed = BULLET_SPEED_HANDGUN
/obj/projectile/bullet/c10mm/surplus
name = "10mm surplus bullet"
damage = 20
+ speed_mod = BULLET_SPEED_SURPLUS_MOD
/obj/projectile/bullet/c10mm/ap
name = "10mm armor-piercing bullet"
damage = 20
armour_penetration = 20
+ speed_mod = BULLET_SPEED_AP_MOD
/obj/projectile/bullet/c10mm/hp
name = "10mm hollow point bullet"
damage = 40
armour_penetration = -50
-
-/obj/projectile/bullet/incendiary/c10mm
- name = "10mm incendiary bullet"
- damage = 15
- armour_penetration = -20
- fire_stacks = 2
+ speed_mod = BULLET_SPEED_HP_MOD
/obj/projectile/bullet/c10mm/rubber
name = "10mm rubber bullet"
damage = 7
stamina = 38
armour_penetration = -40
+ speed_mod = BULLET_SPEED_RUBBER_MOD
-// .45 (Candor, C20r, Thompson)
+// .45 (Candor, C20r)
/obj/projectile/bullet/c45
name = ".45 bullet"
damage = 25
armour_penetration = -20
+ speed = BULLET_SPEED_HANDGUN
/obj/projectile/bullet/c45/surplus
name = ".45 surplus bullet"
damage = 20
+ speed_mod = BULLET_SPEED_SURPLUS_MOD
/obj/projectile/bullet/c45/ap
name = ".45 armor-piercing bullet"
damage = 20
armour_penetration = 20
+ speed_mod = BULLET_SPEED_AP_MOD
/obj/projectile/bullet/c45/hp
name = ".45 hollow point bullet"
damage = 40
armour_penetration = -50
-
-/obj/projectile/bullet/incendiary/c45
- name = ".45 incendiary bullet"
- damage = 15
- fire_stacks = 2
- armour_penetration = -20
+ speed_mod = BULLET_SPEED_HP_MOD
/obj/projectile/bullet/c45/rubber
name = ".45 rubber bullet"
damage = 7
stamina = 38
armour_penetration = -40
+ speed_mod = BULLET_SPEED_RUBBER_MOD
+
+// .50 AE (Desert Eagle)
+
+/obj/projectile/bullet/a50AE
+ name = ".50 AE bullet"
+ damage = 40
+ speed = BULLET_SPEED_HANDGUN
+
+/obj/projectile/bullet/a50AE/hp
+ name = ".50 AE hollow point bullet"
+ damage = 55
+ armour_penetration = -20
+ speed_mod = BULLET_SPEED_HP_MOD
diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm
index 340aa692f5b2..47036d5dbda9 100644
--- a/code/modules/projectiles/projectile/bullets/revolver.dm
+++ b/code/modules/projectiles/projectile/bullets/revolver.dm
@@ -1,28 +1,19 @@
-// .50 AE (Desert Eagle)
-
-/obj/projectile/bullet/a50AE
- name = ".50 AE bullet"
- damage = 40
-
-/obj/projectile/bullet/a50AE/hp
- name = ".50 AE hollow point bullet"
- damage = 55
- armour_penetration = -50
-
// .38 (Colt Detective Special & Winchester)
/obj/projectile/bullet/c38
name = ".38 bullet"
damage = 20
armour_penetration = -20
+ speed = BULLET_SPEED_REVOLVER
/obj/projectile/bullet/c38/surplus
damage = 15
+ speed_mod = BULLET_SPEED_SURPLUS_MOD
/obj/projectile/bullet/c38/match
name = ".38 match bullet"
- speed = 0.3
armour_penetration = -10
+ speed_mod = BULLET_SPEED_AP_MOD
ricochets_max = 4
ricochet_chance = 100
ricochet_auto_aim_angle = 40
@@ -31,17 +22,16 @@
ricochet_decay_chance = 1
ricochet_decay_damage = 1
-/obj/projectile/bullet/c38/match/bouncy // I don't know why this is a subtype of match
+/obj/projectile/bullet/c38/bouncy
name = ".38 rubber bullet"
- speed = 0.4
damage = 7
- stamina = 38
+ stamina = 28
armour_penetration = -60
+ speed_mod = BULLET_SPEED_RUBBER_MOD
ricochets_max = 6
ricochet_incidence_leeway = 70
ricochet_chance = 130
ricochet_decay_damage = 0.8
- shrapnel_type = NONE
/obj/projectile/bullet/c38/dumdum
name = ".38 dum-dum bullet"
@@ -51,22 +41,10 @@
shrapnel_type = /obj/item/shrapnel/bullet/c38/dumdum
/obj/projectile/bullet/c38/trac
- name = ".38 TRAC bullet"
+ name = ".38 tracker"
damage = 10
ricochets_max = 0
-
-/obj/projectile/bullet/c38/trac/on_hit(atom/target, blocked = FALSE)
- . = ..()
- var/mob/living/carbon/M = target
- if(!istype(M))
- return
- var/obj/item/implant/tracking/c38/imp
- for(var/obj/item/implant/tracking/c38/TI in M.implants) //checks if the target already contains a tracking implant
- imp = TI
- return
- if(!imp)
- imp = new /obj/item/implant/tracking/c38(M)
- imp.implant(M)
+ shrapnel_type = /obj/item/shrapnel/bullet/tracker/c38
/obj/projectile/bullet/c38/hotshot //similar to incendiary bullets, but do not leave a flaming trail
name = ".38 hearth bullet"
@@ -94,13 +72,14 @@
/obj/projectile/bullet/a357
name = ".357 bullet"
- damage = 30 //shiptest nerf
+ damage = 30
+
+ speed = BULLET_SPEED_REVOLVER
-// admin only really, for ocelot memes
/obj/projectile/bullet/a357/match
name = ".357 match bullet"
- speed = 0.3
armour_penetration = 10
+ speed_mod = BULLET_SPEED_AP_MOD
ricochets_max = 5
ricochet_chance = 140
ricochet_auto_aim_angle = 50
@@ -111,19 +90,22 @@
/obj/projectile/bullet/a357/hp
name = ".357 hollow point bullet"
damage = 45
- armour_penetration = -50
- ricochet_chance = 0 //mushroom on impact, no bounces
+ armour_penetration = -20
+ speed_mod = BULLET_SPEED_HP_MOD
+ ricochet_chance = 0
+
// .45-70 Gov't (Hunting Revolver)
/obj/projectile/bullet/a4570
name = ".45-70 bullet"
damage = 45 //crits in 3-4 taps depending on armor
+ speed = BULLET_SPEED_REVOLVER
/obj/projectile/bullet/a4570/match
name = ".45-70 match bullet"
- speed = 0.3
armour_penetration = 10
+ speed_mod = BULLET_SPEED_AP_MOD
ricochets_max = 5
ricochet_chance = 140
ricochet_auto_aim_angle = 50
@@ -133,8 +115,9 @@
/obj/projectile/bullet/a4570/hp
name = ".45-70 hollow point bullet"
- damage = 55 //it's ALMOST the pre-nerf .357 with less armor pen
+ damage = 55
armour_penetration = -50
+ speed_mod = BULLET_SPEED_HP_MOD
/obj/projectile/bullet/a4570/explosive //for extra oof
name = ".45-70 explosive bullet"
@@ -145,27 +128,23 @@
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 = 65
-
// 44 Short (Roumain & Shadow)
/obj/projectile/bullet/a44roum
name = ".44 roumain bullet"
damage = 25
+ speed = BULLET_SPEED_REVOLVER
/obj/projectile/bullet/a44roum/rubber
- name = ".44 roumain bullet"
+ name = ".44 roumain rubber bullet"
damage = 7
stamina = 38
armour_penetration = -20
+ speed_mod = BULLET_SPEED_RUBBER_MOD
/obj/projectile/bullet/a44roum/hp
- name = ".44 roumain bullet"
+ name = ".44 roumain hollow point bullet"
damage = 40
armour_penetration = -20
+ ricochet_chance = 0
+ speed_mod = BULLET_SPEED_HP_MOD
diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm
index 331e3cc505ce..b25abef63ac8 100644
--- a/code/modules/projectiles/projectile/bullets/rifle.dm
+++ b/code/modules/projectiles/projectile/bullets/rifle.dm
@@ -4,57 +4,85 @@
name = "5.56x42mm CLIP bullet"
damage = 25
armour_penetration = 20
+ speed = BULLET_SPEED_RIFLE
+
+/obj/projectile/bullet/a556_42/hp
+ name = "5.56x42mm CLIP hollow point bullet"
+ damage = 35
+ armour_penetration = 0
+ speed_mod = BULLET_SPEED_HP_MOD
+
+/obj/projectile/bullet/a556_42/ap
+ name = "5.56x42mm CLIP bullet"
+ damage = 20
+ armour_penetration = 40
+ speed_mod = BULLET_SPEED_AP_MOD
+
+/obj/projectile/bullet/a556_42/rubber
+ name = "5.56x42mm CLIP bullet"
+ damage = 5
+ stamina = 25
+ armour_penetration = 0
+ speed_mod = BULLET_SPEED_RUBBER_MOD
// 8x50mmR (Illestren Rifle)
/obj/projectile/bullet/a8_50r
name = "8x50mmR bullet"
- speed = 0.3
damage = 35
armour_penetration = 40
+ speed = BULLET_SPEED_RIFLE
-/obj/projectile/bullet/a8_50rhp
- name = "8x50mmR bullet"
- speed = 0.3
+/obj/projectile/bullet/a8_50r/hp
+ name = "8x50mmR hollow point bullet"
damage = 49
armour_penetration = 0
+ speed_mod = BULLET_SPEED_HP_MOD
-// .300 Magnum (Smile Rifle)
-
-/obj/projectile/bullet/a300
- name = ".300 Magnum bullet"
- speed = 0.3
- damage = 45
- stamina = 10
- armour_penetration = 40
-
-// Bloat evil wizard stupid shit
-
-/obj/projectile/bullet/a762_enchanted
- name = "enchanted 8x50mmR bullet"
- damage = 20
- stamina = 80
-
-//5.45x39mm (SVG-76u)
-
-/obj/projectile/bullet/a545_39
- name = "5.45x39mm bullet"
- damage = 25
- armour_penetration = 20
+/obj/projectile/bullet/a8_50r/match
+ name = "8x50mmR match bullet"
+ damage = 40
+ armour_penetration = -10
+ speed_mod = BULLET_SPEED_AP_MOD
+ ricochets_max = 4
+ ricochet_chance = 80
+ ricochet_auto_aim_angle = 40
+ ricochet_auto_aim_range = 5
+ ricochet_incidence_leeway = 50
+ ricochet_decay_chance = 1
+ ricochet_decay_damage = 1
+
+/obj/projectile/bullet/a8_50r/trac
+ damage = 10
+ armour_penetration = 0
+ shrapnel_type = /obj/item/shrapnel/bullet/tracker/a8_50r
//7.62x40mm CLIP (SKM Rifles)
/obj/projectile/bullet/a762_40
- name = "7.62x40mm CLIP"
+ name = "7.62x40mm CLIP bullet"
damage = 30
armour_penetration = 20
+ speed = BULLET_SPEED_RIFLE
+
+/obj/projectile/bullet/a762_40/hp
+ name = "7.62x40mm CLIP hollow point bullet"
+ damage = 40
+ armour_penetration = 0
+ speed_mod = BULLET_SPEED_HP_MOD
+
+/obj/projectile/bullet/a762_40/ap
+ name = "7.62x40mm CLIP armor piercing bullet"
+ damage = 25
+ armour_penetration = 40
+ speed_mod = BULLET_SPEED_AP_MOD
/obj/projectile/bullet/a762_40/rubber //"rubber"
- name = "7.62x40mm CLIP Rubber"
+ name = "7.62x40mm CLIP rubber bullet"
damage = 15
stamina = 40
- armour_penetration = 20
-
+ armour_penetration = 0
+ speed_mod = BULLET_SPEED_RUBBER_MOD
//.308 WIN (M514 & GAL DMRs)
@@ -62,20 +90,34 @@
//[СELADON-REMOVE] - CELADON_WEAPONS - хватит это терпеть! Теперь эти патроны только в модпаке - mod_celadon\weapons\code\modules\projectiles\projectile\bullets\rifle.dm
/*
/obj/projectile/bullet/a308
- name = ".308"
+ name = ".308 bullet"
speed = 0.3
damage = 30
armour_penetration = 40
+ speed = BULLET_SPEED_RIFLE
*/
//[/СELADON-REMOVE]
+/obj/projectile/bullet/a308/hp
+ name = ".308 hollow point bullet"
+ damage = 40
+ armour_penetration = 10
+ speed_mod = BULLET_SPEED_HP_MOD
+
+/obj/projectile/bullet/a308/ap
+ name = ".308 armor piercing bullet"
+ damage = 25
+ armour_penetration = 60
+ speed_mod = BULLET_SPEED_AP_MOD
+
/obj/projectile/bullet/a308/rubber //"rubber"
- name = ".308 Rubber"
+ name = ".308 rubber bullet"
speed = 0.3
damage = 25
stamina = 50
armour_penetration = 40
+ speed_mod = BULLET_SPEED_RUBBER_MOD
// 8x58mm caseless (SG-669)
@@ -91,17 +133,4 @@
name = ".299 Eoehoma caseless bullet"
damage = 20
armour_penetration = 10
-
-//6.5x57mm CLIP (F90)
-
-/obj/projectile/bullet/a65clip
- name = "6.5x57mm CLIP bullet"
- speed = 0.3
- stamina = 10
- damage = 40
- armour_penetration = 50
-
- icon_state = "redtrac"
- light_system = MOVABLE_LIGHT
- light_color = COLOR_SOFT_RED
- light_range = 2
+ speed = BULLET_SPEED_RIFLE
diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
index a069102a39cc..41a12f7eaf30 100644
--- a/code/modules/projectiles/projectile/bullets/shotgun.dm
+++ b/code/modules/projectiles/projectile/bullets/shotgun.dm
@@ -2,7 +2,7 @@
name = "12g shotgun slug"
damage = 40
armour_penetration = -10
- speed = 0.5
+ speed = BULLET_SPEED_SHOTGUN
/obj/projectile/bullet/slug/beanbag
name = "beanbag slug"
@@ -14,7 +14,7 @@
name = "incendiary slug"
damage = 25
armour_penetration = -10
- speed = 0.5
+ speed = BULLET_SPEED_SHOTGUN
/obj/projectile/bullet/incendiary/shotgun/dragonsbreath
name = "dragonsbreath pellet"
@@ -54,7 +54,7 @@
/obj/projectile/bullet/slug/frag12
name = "frag12 slug"
damage = 25
- paralyze = 50
+ paralyze = 20
/obj/projectile/bullet/slug/frag12/on_hit(atom/target, blocked = FALSE)
..()
@@ -69,7 +69,7 @@
icon_state = "pellet"
armour_penetration = -35
- speed = 0.5
+ speed = BULLET_SPEED_SHOTGUN
/obj/projectile/bullet/pellet/buckshot
name = "buckshot pellet"
diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm
index 9b11c74e4c1d..9557f40b1e1c 100644
--- a/code/modules/projectiles/projectile/bullets/smg.dm
+++ b/code/modules/projectiles/projectile/bullets/smg.dm
@@ -3,22 +3,53 @@
/obj/projectile/bullet/c57x39mm
name = "5.7x39mm bullet"
damage = 20
+ speed = BULLET_SPEED_PDW
+
+/obj/projectile/bullet/c57x39mm/hp
+ name = "5.7x39mm hollow point bullet"
+ damage = 30
+ armour_penetration = -20
+ speed_mod = BULLET_SPEED_HP_MOD
+
+/obj/projectile/bullet/c57x39mm/ap
+ name = "5.7x39mm armor piercing bullet"
+ damage = 20
+ armour_penetration = 20
+ speed_mod = BULLET_SPEED_AP_MOD
+
+/obj/projectile/bullet/c57x39mm/rubber
+ name = "5.7x39mm rubber bullet"
+ damage = 5
+ stamina = 20
+ speed_mod = BULLET_SPEED_RUBBER_MOD
// 4.6x30mm (WT-550 Automatic Rifle & NT-SVG)
/obj/projectile/bullet/c46x30mm
name = "4.6x30mm bullet"
damage = 20
+ speed = BULLET_SPEED_PDW
+
+/obj/projectile/bullet/c46x30mm/recycled
+ damage = 17
+ speed_mod = BULLET_SPEED_SURPLUS_MOD
/obj/projectile/bullet/c46x30mm/ap
name = "4.6x30mm armor-piercing bullet"
damage = 15
armour_penetration = 40
+ speed_mod = BULLET_SPEED_AP_MOD
+
+/obj/projectile/bullet/c46x30mm/hp
+ name = "4.6x30mm bullet"
+ damage = 25
+ speed_mod = BULLET_SPEED_HP_MOD
-/obj/projectile/bullet/incendiary/c46x30mm
- name = "4.6x30mm incendiary bullet"
- damage = 10
- fire_stacks = 1
+/obj/projectile/bullet/c46x30mm/rubber
+ name = "4.6x30mm bullet"
+ damage = 4
+ stamina = 20
+ speed_mod = BULLET_SPEED_RUBBER_MOD
// 4.73x33mm caseless (Solar)
@@ -36,19 +67,23 @@
/obj/projectile/bullet/c556mm/surplus
name = "5.56mm HITP surplus bullet"
damage = 15
+ speed_mod = BULLET_SPEED_SURPLUS_MOD
/obj/projectile/bullet/c556mm/ap
name = "5.56mm HITP AP bullet"
damage = 15
armour_penetration = 40
+ speed_mod = BULLET_SPEED_AP_MOD
/obj/projectile/bullet/c556mm/hp
name = "5.56mm HITP hollow point bullet"
damage = 30
armour_penetration = -50
+ speed_mod = BULLET_SPEED_HP_MOD
/obj/projectile/bullet/c556mm/rubber
name = "5.56mm HITP rubber bullet"
damage = 5
stamina = 30
armour_penetration = -20
+ speed_mod = BULLET_SPEED_RUBBER_MOD
diff --git a/code/modules/projectiles/projectile/bullets/sniper.dm b/code/modules/projectiles/projectile/bullets/sniper.dm
index 1f725b8113f2..268d4a9aaf23 100644
--- a/code/modules/projectiles/projectile/bullets/sniper.dm
+++ b/code/modules/projectiles/projectile/bullets/sniper.dm
@@ -2,7 +2,7 @@
/obj/projectile/bullet/p50
name = ".50 BMG bullet"
- speed = 0.3
+ speed = BULLET_SPEED_SNIPER
damage = 70
knockdown = 100
dismemberment = 50
@@ -39,7 +39,58 @@
knockdown = 0
breakthings = FALSE
-/obj/projectile/bullet/p50/penetrator/shuttle //Nukeop Shuttle Variety
- icon_state = "gaussstrong"
- damage = 25
- range = 16
+//6.5x57mm CLIP (F90)
+
+/obj/projectile/bullet/a65clip
+ name = "6.5x57mm CLIP bullet"
+ stamina = 10
+ damage = 40
+ armour_penetration = 50
+
+ speed = BULLET_SPEED_SNIPER
+
+ icon_state = "redtrac"
+ light_system = MOVABLE_LIGHT
+ light_color = COLOR_SOFT_RED
+ light_range = 2
+
+/obj/projectile/bullet/a65clip/trac
+ damage = 10
+ armour_penetration = 0
+ shrapnel_type = /obj/item/shrapnel/bullet/tracker/a65clip
+
+//this should only exist on the big ass turrets. don't fucking give players this.
+/obj/projectile/bullet/a65clip/rubber //"rubber"
+ name = "6.5x57mm CLIP rubber bullet"
+ damage = 10
+ stamina = 40
+ speed_mod = BULLET_SPEED_RUBBER_MOD
+
+// 8x58mm caseless (SG-669)
+
+/obj/projectile/bullet/a858
+ name = "8x58mm caseless bullet"
+ damage = 35
+ armour_penetration = 40
+ speed = BULLET_SPEED_SNIPER
+
+/obj/projectile/bullet/a858/trac
+ name = "8x58mm tracker"
+ damage = 12
+ armour_penetration = 0
+ shrapnel_type = /obj/item/shrapnel/bullet/tracker/a858
+
+// .300 Magnum
+
+/obj/projectile/bullet/a300
+ name = ".300 Magnum bullet"
+ damage = 45
+ stamina = 10
+ armour_penetration = 40
+ speed = BULLET_SPEED_RIFLE
+
+/obj/projectile/bullet/a300/trac
+ name = ".300 Tracker"
+ damage = 10
+ armour_penetration = 0
+ shrapnel_type = /obj/item/shrapnel/bullet/tracker/a308
diff --git a/code/modules/projectiles/projectile/bullets/special.dm b/code/modules/projectiles/projectile/bullets/special.dm
deleted file mode 100644
index d3c1b3a72b1a..000000000000
--- a/code/modules/projectiles/projectile/bullets/special.dm
+++ /dev/null
@@ -1,33 +0,0 @@
-// Honker
-
-/obj/projectile/bullet/honker
- name = "banana"
- damage = 0
- movement_type = FLYING
- projectile_piercing = ALL
- nodamage = TRUE
- hitsound = 'sound/items/bikehorn.ogg'
- icon = 'icons/obj/hydroponics/harvest.dmi'
- icon_state = "banana"
- range = 200
-
-/obj/projectile/bullet/honker/Initialize()
- . = ..()
- SpinAnimation()
-
-/obj/projectile/bullet/honker/on_hit(atom/target, blocked = FALSE)
- . = ..()
- var/mob/M = target
- if(istype(M))
- M.slip(100, M.loc, GALOSHES_DONT_HELP|SLIDE, 0, FALSE)
-
-// Mime
-
-/obj/projectile/bullet/mime
- damage = 40
-
-/obj/projectile/bullet/mime/on_hit(atom/target, blocked = FALSE)
- . = ..()
- if(iscarbon(target))
- var/mob/living/carbon/M = target
- M.silent = max(M.silent, 10)
diff --git a/code/modules/projectiles/projectile/energy/misc.dm b/code/modules/projectiles/projectile/energy/misc.dm
index 11f948ddb415..e7b689cce2d5 100644
--- a/code/modules/projectiles/projectile/energy/misc.dm
+++ b/code/modules/projectiles/projectile/energy/misc.dm
@@ -27,18 +27,33 @@
/obj/projectile/energy/plasmabolt
name = "ionized plasma"
damage = 25
- armour_penetration = -10
+ armour_penetration = -15
range = 8
damage_type = BURN
icon_state = "blastwave"
color = "#00ff00"
hitsound = 'sound/weapons/sear.ogg'
+ var/heatpwr = 6
/obj/projectile/energy/plasmabolt/on_hit(atom/target, blocked = FALSE)
. = ..()
if(iscarbon(target))
- var/mob/living/carbon/M = target
- M.adjust_bodytemperature(350)
+ var/mob/living/carbon/cooked = target
+ cooked.adjust_bodytemperature(heatpwr)
if(prob(35))
- M.adjust_fire_stacks(15)
- M.IgniteMob()
+ cooked.adjust_fire_stacks(15)
+ cooked.IgniteMob()
+ else
+ if(cooked.on_fire)
+ cooked.adjust_fire_stacks(10)
+
+/obj/projectile/energy/plasmabolt/shred
+ name = "high-energy ionized plasma"
+ damage = 35
+ armour_penetration = -5
+ range = 2
+ damage_type = BURN
+ icon_state = "blastwave"
+ color = "#00ff00"
+ hitsound = 'sound/weapons/sear.ogg'
+ heatpwr = 11
diff --git a/code/modules/projectiles/projectile/special/rocket.dm b/code/modules/projectiles/projectile/special/rocket.dm
index ede0e69b3ea9..536cfdf0be32 100644
--- a/code/modules/projectiles/projectile/special/rocket.dm
+++ b/code/modules/projectiles/projectile/special/rocket.dm
@@ -13,13 +13,13 @@
desc = "USE A WEEL GUN"
icon_state= "84mm-hedp"
damage = 80
- var/anti_armour_damage = 200
+ var/anti_armour_damage = 120
armour_penetration = 100
- dismemberment = 100
+ dismemberment = 30
/obj/projectile/bullet/a84mm/on_hit(atom/target, blocked = FALSE)
..()
- explosion(target, 1, 1, 2, 1, 0, flame_range = 4)
+ explosion(target, 0, 1, 2, 1, 0, flame_range = 4)
if(ismecha(target))
var/obj/mecha/M = target
diff --git a/code/modules/projectiles/projectile/special/temperature.dm b/code/modules/projectiles/projectile/special/temperature.dm
index 53a4bb62b9e1..65b7ad1d4dd7 100644
--- a/code/modules/projectiles/projectile/special/temperature.dm
+++ b/code/modules/projectiles/projectile/special/temperature.dm
@@ -5,7 +5,7 @@
damage_type = BURN
nodamage = FALSE
flag = "energy"
- var/temperature = -50 // reduce the body temperature by 50 points
+ var/temperature = -5 // reduce the body temperature by 5c
/obj/projectile/temp/on_hit(atom/target, blocked = 0)
. = ..()
@@ -29,12 +29,12 @@
/obj/projectile/temp/hot
name = "heat beam"
- temperature = 100 // Raise the body temp by 100 points
+ temperature = 10 // Raise the body temp by 10c
/obj/projectile/temp/cryo
name = "cryo beam"
range = 3
- temperature = -240 // Single slow shot reduces temp greatly
+ temperature = -20 // Single slow shot reduces temp greatly
/obj/projectile/temp/cryo/on_range()
var/turf/T = get_turf(src)
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 49765fd6747b..a442ee2a11c8 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -519,11 +519,6 @@
if(!C.required_other)
matching_other = 1
- else if(istype(cached_my_atom, /obj/item/slime_extract))
- var/obj/item/slime_extract/M = cached_my_atom
-
- if(M.Uses > 0) // added a limit to slime cores -- Muskets requested this
- matching_other = 1
else
if(!C.required_container)
matching_container = 1
@@ -571,15 +566,6 @@
for(var/mob/M in seen)
to_chat(M, "[iconhtml] [selected_reaction.mix_message]")
- if(istype(cached_my_atom, /obj/item/slime_extract))
- var/obj/item/slime_extract/ME2 = my_atom
- ME2.Uses--
- if(ME2.Uses <= 0) // give the notification that the slime core is dead
- for(var/mob/M in seen)
- to_chat(M, "[iconhtml] \The [my_atom]'s power is consumed in the reaction.")
- ME2.name = "used slime extract"
- ME2.desc = "This extract has been used up."
-
selected_reaction.on_reaction(src, multiplier)
reaction_occurred = 1
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index ad27b15207a8..b4319025e484 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -218,7 +218,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/vimukti/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-7)
M.AdjustSleeping(-40)
- M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
if(!HAS_TRAIT(M, TRAIT_ALCOHOL_TOLERANCE))
M.Jitter(5)
return ..()
@@ -655,7 +655,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
shot_glass_icon_state = "toxinsspecialglass"
/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/M)
- M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal() + 20) //310.15 is the normal bodytemp.
+ M.adjust_bodytemperature(1 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal() + 20) //310.15 is the normal bodytemp.
return ..()
/datum/reagent/consumable/ethanol/beepsky_smash
@@ -846,7 +846,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Vodka, cream, and ice. No actual antifreeze included, of course."
/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(20 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal() + 20) //310.15 is the normal bodytemp.
+ M.adjust_bodytemperature(1 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal() + 20) //310.15 is the normal bodytemp.
return ..()
/datum/reagent/consumable/ethanol/barefoot
@@ -959,7 +959,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Vodka with capsaicin for the extra feeling of intense warmth. Difficult to take large swallows."
/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(50 * TEMPERATURE_DAMAGE_COEFFICIENT, 0 , M.dna.species.bodytemp_heat_damage_limit) //310.15 is the normal bodytemp.
+ M.adjust_bodytemperature(1 * TEMPERATURE_DAMAGE_COEFFICIENT, 0 , M.dna.species.bodytemp_heat_damage_limit) //310.15 is the normal bodytemp.
return ..()
/datum/reagent/consumable/ethanol/red_mead
@@ -996,7 +996,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Iced beer, served in a chilled glass. It's cold enough to leave a trail in the air."
/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(-20 * TEMPERATURE_DAMAGE_COEFFICIENT, T0C) //310.15 is the normal bodytemp.
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, T0C) //310.15 is the normal bodytemp.
return ..()
/datum/reagent/consumable/ethanol/grog
@@ -1625,7 +1625,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/carbon/M)
M.apply_status_effect(/datum/status_effect/throat_soothed)
- M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
+ M.adjust_bodytemperature(1 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
..()
/datum/reagent/consumable/ethanol/alexander
@@ -1809,7 +1809,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/branca_menta/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(-20 * TEMPERATURE_DAMAGE_COEFFICIENT, T0C)
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, T0C)
return ..()
/datum/reagent/consumable/ethanol/branca_menta/on_mob_metabolize(mob/living/M)
@@ -2121,7 +2121,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/mauna_loa/on_mob_life(mob/living/carbon/M)
// Heats the user up while the reagent is in the body. Occasionally makes you burst into flames.
- M.adjust_bodytemperature(25 * TEMPERATURE_DAMAGE_COEFFICIENT)
+ M.adjust_bodytemperature(2 * TEMPERATURE_DAMAGE_COEFFICIENT)
if (prob(5))
M.adjust_fire_stacks(1)
M.IgniteMob()
diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
index f781313bf582..e84cc952c5b9 100644
--- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
@@ -488,7 +488,7 @@ WS End*/
if(H.health <= H.crit_threshold) //certain death above this threshold
REMOVE_TRAIT(H, TRAIT_STABLEHEART, type) //we have to remove the stable heart before we give him heart attack
to_chat(H,"You feel something rupturing inside your chest!")
- H.emote("scream")
+ H.force_scream()
H.set_heartattack(TRUE)
volume = 0
. = ..()
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index d37048250e62..281b15d2e6b5 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -63,7 +63,7 @@
M.adjust_blindness(-1)
switch(current_cycle)
if(1 to 20)
- //nothing
+ EMPTY_BLOCK_GUARD //nothing
if(21 to INFINITY)
if(prob(current_cycle-10))
M.cure_nearsighted(list(EYE_DAMAGE))
@@ -257,7 +257,7 @@
M.drowsyness = max(0,M.drowsyness-3)
M.AdjustSleeping(-40)
//310.15 is the normal bodytemp.
- M.adjust_bodytemperature(25 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
+ M.adjust_bodytemperature(3 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
if(holder.has_reagent(/datum/reagent/consumable/frostoil))
holder.remove_reagent(/datum/reagent/consumable/frostoil, 5)
..()
@@ -280,7 +280,7 @@
M.AdjustSleeping(-20)
if(M.getToxLoss() && prob(20))
M.adjustToxLoss(-1, 0)
- M.adjust_bodytemperature(20 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
+ M.adjust_bodytemperature(2 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
..()
. = 1
@@ -330,7 +330,7 @@
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.AdjustSleeping(-40)
- M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
. = 1
@@ -354,7 +354,7 @@
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.AdjustSleeping(-60)
- M.adjust_bodytemperature(-20 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
M.adjustToxLoss(1*REM, 0)
..()
. = TRUE
@@ -375,7 +375,7 @@
M.AdjustSleeping(-40)
if(M.getToxLoss() && prob(20))
M.adjustToxLoss(-1, 0)
- M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
. = 1
@@ -390,7 +390,7 @@
/datum/reagent/consumable/space_cola/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-5)
- M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
/datum/reagent/consumable/crosstalk
@@ -416,7 +416,7 @@
M.dizziness +=1
M.drowsyness = 0
M.AdjustSleeping(-40)
- M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
/datum/reagent/consumable/comet_trail
@@ -431,7 +431,7 @@
/datum/reagent/consumable/comet_trail/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-7)
M.AdjustSleeping(-20)
- M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
M.Jitter(5)
..()
. = 1
@@ -447,7 +447,7 @@
/datum/reagent/consumable/tadrixx/on_mob_life(mob/living/carbon/M)
M.drowsyness = max(0,M.drowsyness-6)
- M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
/datum/reagent/consumable/space_up
@@ -461,7 +461,7 @@
/datum/reagent/consumable/space_up/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-2 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
/datum/reagent/consumable/molten
@@ -476,9 +476,9 @@
/datum/reagent/consumable/molten/on_mob_life(mob/living/carbon/M)
M.heal_bodypart_damage(1,1,0)
if(M.bodytemperature > M.get_body_temp_normal(apply_change=FALSE))
- M.adjust_bodytemperature(-10 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal(apply_change=FALSE))
+ M.adjust_bodytemperature(-2 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal(apply_change=FALSE))
else if(M.bodytemperature < (M.get_body_temp_normal(apply_change=FALSE) + 1))
- M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal(apply_change=FALSE))
+ M.adjust_bodytemperature(2 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal(apply_change=FALSE))
..()
/datum/reagent/consumable/molten/plasma_fizz
@@ -509,7 +509,7 @@
/datum/reagent/consumable/lemon_lime/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-2 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
@@ -530,7 +530,7 @@
You feel as though a great secret of the universe has been made known to you...")
/datum/reagent/consumable/pacfuel/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-2 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
if(prob(10))
M?.mind.adjust_experience(/datum/skill/gaming, 5)
..()
@@ -545,7 +545,7 @@
glass_desc = "It's hard to imagine all those fruits getting condensed into a cup like this."
/datum/reagent/consumable/shoal_punch/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-2 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
/datum/reagent/consumable/sodawater
name = "Soda Water"
@@ -559,7 +559,7 @@
/datum/reagent/consumable/sodawater/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
- M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
/datum/reagent/consumable/tonic
@@ -575,7 +575,7 @@
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.AdjustSleeping(-40)
- M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
. = 1
@@ -594,7 +594,7 @@
M.dizziness +=1
M.drowsyness = 0
M.AdjustSleeping(-40)
- M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
/datum/reagent/consumable/xeno_energy/on_mob_metabolize(mob/living/L)
@@ -617,7 +617,7 @@
glass_desc = "Generally, you're supposed to put something else in there, too..."
/datum/reagent/consumable/ice/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
/datum/reagent/consumable/soy_latte
@@ -639,7 +639,7 @@
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.SetSleeping(0)
- M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
+ M.adjust_bodytemperature(1 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
if(M.getBruteLoss() && prob(20))
M.heal_bodypart_damage(1,0, 0)
..()
@@ -664,7 +664,7 @@
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.SetSleeping(0)
- M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
+ M.adjust_bodytemperature(1 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
if(M.getBruteLoss() && prob(20))
M.heal_bodypart_damage(1,0, 0)
..()
@@ -788,7 +788,7 @@
glass_desc = "It's grape soda!"
/datum/reagent/consumable/grape_soda/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
/datum/reagent/consumable/milk/chocolate_milk
@@ -817,7 +817,7 @@
glass_desc = "A favorite winter drink from the Solar Confederation. Good for warming yourself up."
/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
+ M.adjust_bodytemperature(1 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
..()
/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/carbon/M)
@@ -884,7 +884,7 @@
glass_desc = "A classic vanilla flavored soft drink."
/datum/reagent/consumable/cream_soda/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-1 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
..()
/datum/reagent/consumable/sol_dry
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index abdaf511691d..8b06736dbce2 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -119,7 +119,7 @@
F.fry(volume)
F.reagents.add_reagent(/datum/reagent/consumable/cooking_oil, reac_volume)
-/datum/reagent/consumable/cooking_oil/expose_mob(mob/living/M, method = TOUCH, method = SMOKE, reac_volume, show_message = 1, touch_protection = 0)
+/datum/reagent/consumable/cooking_oil/expose_mob(mob/living/M, method = TOUCH, reac_volume, show_message = 1, touch_protection = 0)
if(!istype(M))
return
var/boiling = FALSE
@@ -137,7 +137,7 @@
M.visible_message("The boiling oil sizzles as it covers [M]!", \
"You're covered in boiling oil!")
if(FryLoss)
- M.emote("scream")
+ M.force_scream()
playsound(M, 'sound/machines/fryer/deep_fryer_emerge.ogg', 25, TRUE)
ADD_TRAIT(M, TRAIT_OIL_FRIED, "cooking_oil_react")
addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living, unfry_mob)), 3)
@@ -223,24 +223,24 @@
if(holder.has_reagent(/datum/reagent/consumable/capsaicin))
holder.remove_reagent(/datum/reagent/consumable/capsaicin, 5)
if(isslime(M))
- cooling = -rand(5,20)
+ cooling = -rand(1,2)
if(15 to 25)
cooling = -20 * TEMPERATURE_DAMAGE_COEFFICIENT
if(isslime(M))
- cooling = -rand(10,20)
+ cooling = -rand(2,4)
if(25 to 35)
cooling = -30 * TEMPERATURE_DAMAGE_COEFFICIENT
if(prob(1))
M.emote("shiver")
if(isslime(M))
- cooling = -rand(15,20)
+ cooling = -rand(4,8)
if(35 to INFINITY)
cooling = -40 * TEMPERATURE_DAMAGE_COEFFICIENT
if(prob(5))
M.emote("shiver")
if(isslime(M))
- cooling = -rand(20,25)
- M.adjust_bodytemperature(cooling, 50)
+ cooling = -rand(8,10)
+ M.adjust_bodytemperature(cooling, 10)
..()
/datum/reagent/consumable/frostoil/expose_turf(turf/T, reac_volume)
@@ -271,7 +271,7 @@
//actually handle the pepperspray effects
if (!(pepper_proof)) // you need both eye and mouth protection
if(prob(5))
- victim.emote("scream")
+ victim.force_scream()
victim.blur_eyes(5) // 10 seconds
victim.blind_eyes(3) // 6 seconds
victim.confused = max(M.confused, 5) // 10 seconds
@@ -428,7 +428,7 @@
taste_description = "your imprisonment"
/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
+ M.adjust_bodytemperature(1 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
..()
/datum/reagent/consumable/hell_ramen
@@ -439,7 +439,7 @@
taste_description = "wet and cheap noodles on fire"
/datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(10 * TEMPERATURE_DAMAGE_COEFFICIENT)
+ M.adjust_bodytemperature(1 * TEMPERATURE_DAMAGE_COEFFICIENT)
..()
/datum/reagent/consumable/flour
@@ -776,7 +776,7 @@
..()
/datum/reagent/consumable/pyre_elementum/on_mob_life(mob/living/carbon/M)
- M.adjust_bodytemperature(20 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal()) // Doesn't kill you like capsaicin
+ M.adjust_bodytemperature(2 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal()) // Doesn't kill you like capsaicin
if(!ingested) // Unless you didn't eat it
M.adjustFireLoss(0.25*REM, 0)
..()
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 48b8e3793c21..8abff5ad5448 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -22,9 +22,9 @@
/datum/reagent/medicine/leporazine/on_mob_life(mob/living/carbon/M)
if(M.bodytemperature > M.get_body_temp_normal(apply_change=FALSE))
- M.adjust_bodytemperature(-40 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal(apply_change=FALSE))
+ M.adjust_bodytemperature(-4 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal(apply_change=FALSE))
else if(M.bodytemperature < (M.get_body_temp_normal(apply_change=FALSE) + 1))
- M.adjust_bodytemperature(40 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal(apply_change=FALSE))
+ M.adjust_bodytemperature(4 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal(apply_change=FALSE))
..()
/datum/reagent/medicine/adminordrazine //An OP chemical for admins
@@ -257,9 +257,12 @@
to_chat(M, "You don't feel so good...")
else if(M.getFireLoss())
M.adjustFireLoss(-reac_volume)
- if(show_message)
+ M.force_scream()
+ if(show_message && !HAS_TRAIT(M, TRAIT_ANALGESIA))
to_chat(M, "You feel your burns healing! It stings like hell!")
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+ else
+ to_chat(M, span_notice("You feel your burns throbbing."))
..()
/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(mob/living/carbon/M)
@@ -310,9 +313,12 @@
to_chat(M, "You don't feel so good...")
else if(M.getBruteLoss())
M.adjustBruteLoss(-reac_volume)
- if(show_message)
+ M.force_scream()
+ if(show_message && !HAS_TRAIT(M, TRAIT_ANALGESIA))
to_chat(M, "You feel your bruises healing! It stings like hell!")
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+ else
+ to_chat(M, span_notice("You feel your bruises throbbing."))
..()
@@ -375,6 +381,9 @@
color = "#6D6374"
metabolization_rate = 0.4 * REAGENTS_METABOLISM
+/datum/reagent/medicine/mine_salve/on_mob_metabolize(mob/living/L)
+ ADD_TRAIT(L, TRAIT_PAIN_RESIST, type)
+
/datum/reagent/medicine/mine_salve/on_mob_life(mob/living/carbon/C)
C.hal_screwyhud = SCREWYHUD_HEALTHY
C.adjustBruteLoss(-0.25*REM, 0)
@@ -401,6 +410,7 @@
/datum/reagent/medicine/mine_salve/on_mob_end_metabolize(mob/living/M)
if(iscarbon(M))
var/mob/living/carbon/N = M
+ REMOVE_TRAIT(N, TRAIT_PAIN_RESIST, type)
N.hal_screwyhud = SCREWYHUD_NONE
..()
@@ -565,9 +575,13 @@
color = "#E6FFF0"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
+/datum/reagent/medicine/anti_rad/on_mob_metabolize(mob/living/L)
+ to_chat(L, span_warning("Your stomach starts to churn and cramp!"))
+ . = ..()
+
/datum/reagent/medicine/anti_rad/on_mob_life(mob/living/carbon/M)
M.radiation -= M.radiation - rand(50,150)
- M.adjust_disgust(7*REM, 0)
+ M.adjust_disgust(4*REM)
..()
. = 1
@@ -750,9 +764,11 @@
/datum/reagent/medicine/morphine/on_mob_metabolize(mob/living/L)
..()
+ ADD_TRAIT(L, TRAIT_PAIN_RESIST, type)
L.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
/datum/reagent/medicine/morphine/on_mob_end_metabolize(mob/living/L)
+ REMOVE_TRAIT(L, TRAIT_PAIN_RESIST, type)
L.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
..()
@@ -1451,10 +1467,12 @@
/datum/reagent/medicine/corazone/on_mob_metabolize(mob/living/M)
..()
+ ADD_TRAIT(M, TRAIT_PAIN_RESIST, type)
ADD_TRAIT(M, TRAIT_STABLEHEART, type)
ADD_TRAIT(M, TRAIT_STABLELIVER, type)
/datum/reagent/medicine/corazone/on_mob_end_metabolize(mob/living/M)
+ REMOVE_TRAIT(M, TRAIT_PAIN_RESIST, type)
REMOVE_TRAIT(M, TRAIT_STABLEHEART, type)
REMOVE_TRAIT(M, TRAIT_STABLELIVER, type)
@@ -1746,9 +1764,12 @@
else if(M.getBruteLoss())
M.adjustBruteLoss(-reac_volume)
M.adjustFireLoss(reac_volume)
- if(show_message)
+ M.force_scream()
+ if(show_message && !HAS_TRAIT(M, TRAIT_ANALGESIA))
to_chat(M, "You feel your skin bubble and burn as your flesh knits itself together!")
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+ else
+ to_chat(M, span_notice("You feel your skin shifting around unnaturally."))
..()
/datum/reagent/medicine/converbital/on_mob_life(mob/living/carbon/M)
@@ -1780,9 +1801,12 @@
else if(M.getBruteLoss())
M.adjustFireLoss(-reac_volume)
M.adjustBruteLoss(reac_volume)
- if(show_message)
- to_chat(M, "You feel your flesh tear as your skin rapidly regenerates!")
- SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+ M.force_scream()
+ if(show_message && !HAS_TRAIT(M, TRAIT_ANALGESIA))
+ to_chat(M, "You feel your skin tear as your flesh rapidly regenerates!")
+ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "painful_medicine", /datum/mood_event/painful_medicine)
+ else
+ to_chat(M, span_notice("You feel your skin shifting around unnaturally."))
..()
/datum/reagent/medicine/convuri/on_mob_life(mob/living/carbon/M)
@@ -1833,7 +1857,7 @@
/datum/reagent/medicine/rhigoxane/on_mob_life(mob/living/carbon/M)
M.adjustFireLoss(-2*REM, 0.)
- M.adjust_bodytemperature(-20 * TEMPERATURE_DAMAGE_COEFFICIENT, M.dna.species.bodytemp_normal)
+ M.adjust_bodytemperature(-0.2 * TEMPERATURE_DAMAGE_COEFFICIENT, M.dna.species.bodytemp_normal)
..()
. = 1
@@ -1841,7 +1865,7 @@
if(method != VAPOR)
return
- M.adjust_bodytemperature(-reac_volume * TEMPERATURE_DAMAGE_COEFFICIENT * 20, 200)
+ M.adjust_bodytemperature(-reac_volume * TEMPERATURE_DAMAGE_COEFFICIENT * 0.5, 200)
M.adjust_fire_stacks(-reac_volume / 2)
if(reac_volume >= metabolization_rate)
M.ExtinguishMob()
@@ -1850,7 +1874,7 @@
/datum/reagent/medicine/rhigoxane/overdose_process(mob/living/carbon/M)
M.adjustFireLoss(3*REM, 0.)
- M.adjust_bodytemperature(-35 * TEMPERATURE_DAMAGE_COEFFICIENT, 50)
+ M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, 50)
..()
@@ -1932,8 +1956,8 @@
reagent_state = SOLID
color = "#302f20"
metabolization_rate = REAGENTS_METABOLISM * 0.8
- overdose_threshold = 100
- var/clone_dam = 0.25
+ overdose_threshold = 50
+ var/clone_dam = 0.1
/datum/reagent/medicine/soulus/expose_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
if(iscarbon(M) && M.stat != DEAD)
@@ -1952,7 +1976,7 @@
/datum/reagent/medicine/soulus/on_mob_life(mob/living/carbon/M)
M.adjustFireLoss(-0.1*REM, 0)
M.adjustBruteLoss(-0.1*REM, 0)
- M.adjustCloneLoss(clone_dam *REM, 0)
+ M.adjustCloneLoss(clone_dam*REM, 0)
..()
/datum/reagent/medicine/soulus/overdose_process(mob/living/M)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 11e3f0179a8a..b246a81f364e 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -243,49 +243,10 @@
REMOVE_TRAIT(L, TRAIT_HOLY, type)
..()
-/datum/reagent/water/holywater/expose_mob(mob/living/M, method=TOUCH, reac_volume)
- if(iscultist(M))
- to_chat(M, "A vile holiness begins to spread its shining tendrils through your mind, purging the Geometer of Blood's influence!")
- ..()
-
-/datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M)
- if(!data)
- data = list("misc" = 1)
- data["misc"]++
- M.jitteriness = min(M.jitteriness+4,10)
- if(iscultist(M))
- for(var/datum/action/innate/cult/blood_magic/BM in M.actions)
- to_chat(M, "Your blood rites falter as holy water scours your body!")
- for(var/datum/action/innate/cult/blood_spell/BS in BM.spells)
- qdel(BS)
- if(data["misc"] >= 25) // 10 units, 45 seconds @ metabolism 0.4 units & tick rate 1.8 sec
- if(!M.stuttering)
- M.stuttering = 1
- M.stuttering = min(M.stuttering+4, 10)
- M.Dizzy(5)
- if(iscultist(M) && prob(20))
- M.say(pick("Av'te Nar'Sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","R'ge Na'sie","Diabo us Vo'iscum","Eld' Mon Nobis"), forced = "holy water")
- if(prob(10))
- M.visible_message("[M] starts having a seizure!", "You have a seizure!")
- M.Unconscious(120)
- to_chat(M, "[pick("Your blood is your bond - you are nothing without it", "Do not forget your place", \
- "All that power, and you still fail?", "If you cannot scour this poison, I shall scour your meager life!")].")
- if(data["misc"] >= 60) // 30 units, 135 seconds
- if(iscultist(M))
- SSticker.mode.remove_cultist(M.mind, FALSE, TRUE)
- M.jitteriness = 0
- M.stuttering = 0
- holder.remove_reagent(type, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
- return
- holder.remove_reagent(type, 0.4) //fixed consumption to prevent balancing going out of whack
-
/datum/reagent/water/holywater/expose_turf(turf/T, reac_volume)
..()
if(!istype(T))
return
- if(reac_volume>=10)
- for(var/obj/effect/rune/R in T)
- qdel(R)
T.Bless()
// Holy water. Mostly the same as water, it also heals the plant a little with the power of the spirits. Also ALSO increases instability.
@@ -346,22 +307,12 @@
return ..()
/datum/reagent/fuel/unholywater/on_mob_life(mob/living/carbon/M)
- if(iscultist(M))
- M.drowsyness = max(M.drowsyness-5, 0)
- M.AdjustAllImmobility(-40)
- M.adjustStaminaLoss(-10, 0)
- M.adjustToxLoss(-2, 0)
- M.adjustOxyLoss(-2, 0)
- M.adjustBruteLoss(-2, 0)
- M.adjustFireLoss(-2, 0)
- if(ishuman(M) && M.blood_volume < BLOOD_VOLUME_NORMAL)
- M.blood_volume += 3
- else // Will deal about 90 damage when 50 units are thrown
- M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 150)
- M.adjustToxLoss(2, 0)
- M.adjustFireLoss(2, 0)
- M.adjustOxyLoss(2, 0)
- M.adjustBruteLoss(2, 0)
+ // Will deal about 90 damage when 50 units are thrown
+ M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 150)
+ M.adjustToxLoss(2, 0)
+ M.adjustFireLoss(2, 0)
+ M.adjustOxyLoss(2, 0)
+ M.adjustBruteLoss(2, 0)
holder.remove_reagent(type, 1)
return TRUE
@@ -523,18 +474,57 @@
color = "#808080" // rgb: 128, 128, 128
taste_mult = 0 // oderless and tasteless
+/datum/reagent/oxygen/dip_object(obj/item/I, mob/user, obj/item/reagent_containers/H)
+ . = ..()
+ var/obj/item/stock_parts/cell/current_cell
+ if(istype(I, /obj/item/stock_parts/cell))
+ if(!current_cell.use(1))
+ return
+ H.reagents.add_reagent(/datum/reagent/ozone, (H.reagents.remove_reagent(/datum/reagent/oxygen, 0.05*I.get_part_rating())))
+ return TRUE
+ return
+
/datum/reagent/oxygen/expose_obj(obj/O, reac_volume)
if((!O) || (!reac_volume))
return 0
var/temp = holder ? holder.chem_temp : T20C
- O.atmos_spawn_air("o2=[reac_volume/2];TEMP=[temp]")
+ O.atmos_spawn_air("[GAS_O2]=[reac_volume/2];TEMP=[temp]")
/datum/reagent/oxygen/expose_turf(turf/open/T, reac_volume)
if(istype(T))
var/temp = holder ? holder.chem_temp : T20C
- T.atmos_spawn_air("o2=[reac_volume/2];TEMP=[temp]")
+ T.atmos_spawn_air("[GAS_O2]=[reac_volume/2];TEMP=[temp]")
return
+/datum/reagent/ozone
+ name = "Ozone"
+ description = "A pale blue gas, with a distinct smell. While it is oxygen with an extra molecule attached, it is quite dangerous."
+ reagent_state = GAS
+ metabolization_rate = REAGENTS_METABOLISM * 0.5
+ color = "#a1a1e6"
+ taste_mult = 0
+
+/datum/reagent/ozone/on_mob_life(mob/living/carbon/M)
+ if(prob(30))
+ M.adjustOrganLoss(ORGAN_SLOT_LUNGS,1*REM)
+ if(prob(40))
+ M.adjustOrganLoss(ORGAN_SLOT_HEART,2*REM)
+ . = 1
+ return ..()
+
+/datum/reagent/ozone/expose_obj(obj/exposed_object, reac_volume)
+ if((!exposed_object) || (!reac_volume))
+ return 0
+ var/temp = holder ? holder.chem_temp : T20C
+ exposed_object.atmos_spawn_air("[GAS_O3]=[reac_volume/2];TEMP=[temp]")
+
+/datum/reagent/ozone/expose_turf(turf/open/exposed_turf, reac_volume)
+ if(istype(exposed_turf))
+ var/temp = holder ? holder.chem_temp : T20C
+ exposed_turf.atmos_spawn_air("[GAS_O3]=[reac_volume/2];TEMP=[temp]")
+ return
+
+
/datum/reagent/copper
name = "Copper"
description = "A highly ductile metal. Things made out of copper aren't very durable, but it makes a decent material for electrical wiring."
@@ -560,12 +550,12 @@
if((!O) || (!reac_volume))
return 0
var/temp = holder ? holder.chem_temp : T20C
- O.atmos_spawn_air("n2=[reac_volume/2];TEMP=[temp]")
+ O.atmos_spawn_air("[GAS_N2]=[reac_volume/2];TEMP=[temp]")
/datum/reagent/nitrogen/expose_turf(turf/open/T, reac_volume)
if(istype(T))
var/temp = holder ? holder.chem_temp : T20C
- T.atmos_spawn_air("n2=[reac_volume/2];TEMP=[temp]")
+ T.atmos_spawn_air("[GAS_N2]=[reac_volume/2];TEMP=[temp]")
return
/datum/reagent/hydrogen
@@ -598,7 +588,7 @@
name = "Sulfur"
description = "A sickly yellow solid mostly known for its nasty smell. It's actually much more helpful than it looks in biochemisty."
reagent_state = SOLID
- color = "#BF8C00" // rgb: 191, 140, 0
+ color = "#f0e518"
taste_description = "rotten eggs"
/datum/reagent/carbon
@@ -648,12 +638,12 @@
if((!exposed_object) || (!reac_volume))
return 0
var/temp = holder ? holder.chem_temp : T20C
- exposed_object.atmos_spawn_air("cl2=[reac_volume/2];TEMP=[temp]")
+ exposed_object.atmos_spawn_air("[GAS_CHLORINE]=[reac_volume/2];TEMP=[temp]")
/datum/reagent/chlorine/expose_turf(turf/open/exposed_turf, reac_volume)
if(istype(exposed_turf))
var/temp = holder ? holder.chem_temp : T20C
- exposed_turf.atmos_spawn_air("cl2=[reac_volume/2];TEMP=[temp]")
+ exposed_turf.atmos_spawn_air("[GAS_CHLORINE]=[reac_volume/2];TEMP=[temp]")
return
/datum/reagent/hydrogen_chloride
@@ -675,12 +665,12 @@
if((!exposed_object) || (!reac_volume))
return 0
var/temp = holder ? holder.chem_temp : T20C
- exposed_object.atmos_spawn_air("hcl=[reac_volume/2];TEMP=[temp]")
+ exposed_object.atmos_spawn_air("[GAS_HYDROGEN_CHLORIDE]=[reac_volume/2];TEMP=[temp]")
/datum/reagent/hydrogen_chloride/expose_turf(turf/open/exposed_turf, reac_volume)
if(istype(exposed_turf))
var/temp = holder ? holder.chem_temp : T20C
- exposed_turf.atmos_spawn_air("hcl=[reac_volume/2];TEMP=[temp]")
+ exposed_turf.atmos_spawn_air("[GAS_HYDROGEN_CHLORIDE]=[reac_volume/2];TEMP=[temp]")
return
/datum/reagent/fluorine
@@ -1134,12 +1124,12 @@
if((!O) || (!reac_volume))
return 0
var/temp = holder ? holder.chem_temp : T20C
- O.atmos_spawn_air("co2=[reac_volume/5];TEMP=[temp]")
+ O.atmos_spawn_air("[GAS_CO2]=[reac_volume/5];TEMP=[temp]")
/datum/reagent/carbondioxide/expose_turf(turf/open/T, reac_volume)
if(istype(T))
var/temp = holder ? holder.chem_temp : T20C
- T.atmos_spawn_air("co2=[reac_volume/5];TEMP=[temp]")
+ T.atmos_spawn_air("[GAS_CO2]=[reac_volume/5];TEMP=[temp]")
return
// This is more bad ass, and pests get hurt by the corrosive nature of it, not the plant. The new trade off is it culls stability.
@@ -1164,12 +1154,12 @@
if((!O) || (!reac_volume))
return 0
var/temp = holder ? holder.chem_temp : T20C
- O.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]")
+ O.atmos_spawn_air("[GAS_NITROUS]=[reac_volume/5];TEMP=[temp]")
/datum/reagent/nitrous_oxide/expose_turf(turf/open/T, reac_volume)
if(istype(T))
var/temp = holder ? holder.chem_temp : T20C
- T.atmos_spawn_air("n2o=[reac_volume/5];TEMP=[temp]")
+ T.atmos_spawn_air("[GAS_NITROUS]=[reac_volume/5];TEMP=[temp]")
/datum/reagent/nitrous_oxide/expose_mob(mob/living/M, method=TOUCH, reac_volume)
if(method == VAPOR)
@@ -1185,6 +1175,80 @@
M.confused = min(M.confused + 2, 5)
..()
+/datum/reagent/carbon_monoxide
+ name = "Carbon Monoxide"
+ description = "A highly dangerous gas for sapients."
+ reagent_state = GAS
+ metabolization_rate = REAGENTS_METABOLISM
+ color = "#96898c"
+ var/accumulation
+
+/datum/reagent/carbon_monoxide/on_mob_life(mob/living/carbon/victim)
+ if(holder.has_reagent(/datum/reagent/oxygen))
+ holder.remove_reagent(/datum/reagent/carbon_monoxide, 2*REM)
+ accumulation = accumulation/4
+
+ accumulation += volume
+ switch(accumulation)
+ if(10 to 50)
+ to_chat(src, span_warning("You feel dizzy."))
+ if(50 to 150)
+ to_chat(victim, span_warning("[pick("Your head hurts.", "Your head pounds.")]"))
+ victim.Dizzy(5)
+ if(150 to 250)
+ to_chat(victim, span_userdanger("[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]"))
+ victim.Stun(10)
+ victim.Dizzy(5)
+ victim.confused = (accumulation/50)
+ victim.gain_trauma(/datum/brain_trauma/mild/monoxide_poisoning_stage1)
+
+ if(250 to 350)
+ to_chat(victim, span_userdanger("[pick("What were you doing...?", "Where are you...?", "What's going on...?")]"))
+ victim.adjustStaminaLoss(3)
+
+ victim.Dizzy(5)
+ victim.confused = (accumulation/50)
+ victim.drowsyness = (accumulation/50)
+
+ victim.adjustToxLoss(accumulation/100*REM, 0)
+
+ victim.gain_trauma(/datum/brain_trauma/mild/monoxide_poisoning_stage2)
+
+ if(350 to 1000)
+ victim.Unconscious(20 SECONDS)
+
+ victim.drowsyness += (accumulation/100)
+ victim.adjustToxLoss(accumulation/100*REM, 0)
+ if(1000 to INFINITY) //anti salt measure, if they reach this, just fucking kill them at this point
+ victim.death()
+ victim.cure_trauma_type(/datum/brain_trauma/mild/monoxide_poisoning_stage1)
+ victim.cure_trauma_type(/datum/brain_trauma/mild/monoxide_poisoning_stage2)
+
+ qdel(src)
+ return TRUE
+ accumulation -= (metabolization_rate * victim.metabolism_efficiency)
+ if(accumulation < 0)
+ holder.remove_reagent(/datum/reagent/carbon_monoxide, volume)
+ return TRUE //to avoid a runtime
+ return ..()
+
+/datum/reagent/carbon_monoxide/expose_obj(obj/O, reac_volume)
+ if((!O) || (!reac_volume))
+ return FALSE
+ var/temp = holder ? holder.chem_temp : T20C
+ O.atmos_spawn_air("[GAS_CO]=[reac_volume/2];TEMP=[temp]")
+
+/datum/reagent/carbon_monoxide/expose_turf(turf/open/T, reac_volume)
+ if(istype(T))
+ var/temp = holder ? holder.chem_temp : T20C
+ T.atmos_spawn_air("[GAS_CO]=[reac_volume/2];TEMP=[temp]")
+ return
+
+/datum/reagent/carbon_monoxide/on_mob_delete(mob/living/living_mob)
+ var/mob/living/carbon/living_carbon = living_mob
+ living_carbon.cure_trauma_type(/datum/brain_trauma/mild/monoxide_poisoning_stage1)
+ living_carbon.cure_trauma_type(/datum/brain_trauma/mild/monoxide_poisoning_stage2)
+
/datum/reagent/stimulum
name = "Stimulum"
description = "An unstable experimental gas that greatly increases the energy of those that inhale it." //WS Edit -- No longer references toxin damage.
@@ -1566,9 +1630,9 @@
var/turf/open/floor/F = T
playsound(T, 'sound/effects/bubbles.ogg', 50)
F.PlaceOnTop(/turf/open/floor/grass, flags = CHANGETURF_INHERIT_AIR)
- new /obj/effect/spawner/lootdrop/flower(T)
+ new /obj/effect/spawner/random/flower(T)
if(prob(75))
- new /obj/effect/spawner/lootdrop/flora(T)
+ new /obj/effect/spawner/random/flora(T)
..()
/datum/reagent/genesis/on_hydroponics_apply(obj/item/seeds/myseed, datum/reagents/chems, obj/machinery/hydroponics/mytray, mob/user)
@@ -1879,25 +1943,14 @@
/datum/reagent/growthserum
name = "Growth Serum"
- description = "A commercial chemical designed to help older men in the bedroom."//not really it just makes you a giant
+ description = "A strange chemical that causes growth, but wears off over time. The growth effect is limited."
color = "#ff0000"//strong red. rgb 255, 0, 0
var/current_size = RESIZE_DEFAULT_SIZE
- taste_description = "bitterness" // apparently what viagra tastes like
+ taste_description = "bitterness"
/datum/reagent/growthserum/on_mob_life(mob/living/carbon/H)
var/newsize = current_size
- switch(volume)
- if(0 to 19)
- newsize = 1.25*RESIZE_DEFAULT_SIZE
- if(20 to 49)
- newsize = 1.5*RESIZE_DEFAULT_SIZE
- if(50 to 99)
- newsize = 2*RESIZE_DEFAULT_SIZE
- if(100 to 199)
- newsize = 2.5*RESIZE_DEFAULT_SIZE
- if(200 to INFINITY)
- newsize = 3.5*RESIZE_DEFAULT_SIZE
-
+ newsize = (1 + (clamp(volume, 0, 25) / 100)) * RESIZE_DEFAULT_SIZE
H.resize = newsize/current_size
current_size = newsize
H.update_transform()
@@ -2555,3 +2608,29 @@
M.adjust_disgust(4)
..()
. = 1
+
+/datum/reagent/sulfur_dioxide
+ name = "Sulfur Dioxide"
+ description = "A transparent gas produced by geological activity and burning certain fuels."
+ reagent_state = GAS
+ color = "#f0e518"
+ taste_mult = 0 // tasteless
+
+/datum/reagent/sulfur_dioxide/on_mob_life(mob/living/carbon/M)
+ M.adjustOxyLoss(1*REM, 0)
+ if(prob(40))
+ M.adjustOrganLoss(ORGAN_SLOT_LUNGS,1*REM)
+ . = 1
+ ..()
+
+/datum/reagent/sulfur_dioxide/expose_obj(obj/exposed_object, reac_volume)
+ if((!exposed_object) || (!reac_volume))
+ return 0
+ var/temp = holder ? holder.chem_temp : T20C
+ exposed_object.atmos_spawn_air("[GAS_SO2]=[reac_volume/2];TEMP=[temp]")
+
+/datum/reagent/sulfur_dioxide/expose_turf(turf/open/exposed_turf, reac_volume)
+ if(istype(exposed_turf))
+ var/temp = holder ? holder.chem_temp : T20C
+ exposed_turf.atmos_spawn_air("[GAS_SO2]=[reac_volume/2];TEMP=[temp]")
+ return
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
index 313fb7475e00..792831c37fd8 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -230,7 +230,7 @@
/datum/reagent/cryostylane/on_mob_life(mob/living/carbon/M) //TODO: code freezing into an ice cube
if(M.reagents.has_reagent(/datum/reagent/oxygen))
M.reagents.remove_reagent(/datum/reagent/oxygen, 0.5)
- M.adjust_bodytemperature(-15)
+ M.adjust_bodytemperature(-5)
..()
/datum/reagent/cryostylane/expose_turf(turf/T, reac_volume)
@@ -251,7 +251,7 @@
/datum/reagent/pyrosium/on_mob_life(mob/living/carbon/M)
if(M.reagents.has_reagent(/datum/reagent/oxygen))
M.reagents.remove_reagent(/datum/reagent/oxygen, 0.5)
- M.adjust_bodytemperature(15)
+ M.adjust_bodytemperature(5)
..()
/datum/reagent/teslium //Teslium. Causes periodic shocks, and makes shocks against the target much more effective.
@@ -299,10 +299,6 @@
shock_timer = 0 //immune to shocks
M.AdjustAllImmobility(-40)
M.adjustStaminaLoss(-2, 0)
- if(isluminescent(M))
- var/mob/living/carbon/human/H = M
- var/datum/species/jelly/luminescent/L = H.dna.species
- L.extract_cooldown = max(0, L.extract_cooldown - 20)
..()
/datum/reagent/firefighting_foam
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 6045779f6030..e1553a6dffcf 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -132,7 +132,7 @@
if(holder.has_reagent(/datum/reagent/medicine/epinephrine))
holder.remove_reagent(/datum/reagent/medicine/epinephrine, 2*REM)
M.adjustPlasma(20)
- M.adjust_bodytemperature(-7 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
+ M.adjust_bodytemperature(-2 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
return ..()
/datum/reagent/toxin/lexorin
diff --git a/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm b/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm
index ff82cd185fb2..380c049adcb0 100644
--- a/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm
@@ -3,26 +3,22 @@
description = "How is this even possible"
/datum/reagent/consumable/ethanol/trickwine/ash_wine
- name = "Ashwine"
- description = "A traditional sacrament for members of the Saint-Roumain Militia. Known to grant visions, and is used both for ritual and entertainment purposes aboard Saint-Roumain vessels."
+ name = "Wine Of Ash"
+ description = "A traditional sacrament for members of the Saint-Roumain Militia. Believed to grant visions, seeing use both in ritual and entertainment within the Militia."
color = "#6CC66C"
boozepwr = 80
quality = DRINK_VERYGOOD
- taste_description = "devotional energy and a hint of high-potency hallucinogens"
- glass_name = "Ashwine"
- glass_desc = "A traditional sacrament for members of the Saint-Roumain Militia. Known to grant visions, and is used both for ritual and entertainment purposes aboard Saint-Roumain vessels."
+ taste_description = "a rustic fruit, with hints of sweet yet tangy ash."
+ glass_name = "Wine Of Ash"
+ glass_desc = "A traditional sacrament for members of the Saint-Roumain Militia. Believed to grant visions, seeing use both in ritual and entertainment within the Militia."
breakaway_flask_icon_state = "baflaskashwine"
/datum/reagent/consumable/ethanol/trickwine/ash_wine/on_mob_life(mob/living/M)
- var/high_message = pick("You feel far more devoted to the cause", "You feel like you should go on a hunt")
- var/cleanse_message = pick("Divine light purifies you.", "You are purged of foul spirts.")
- if(prob(10))
- M.set_drugginess(10)
- to_chat(M, "[high_message]")
- if(M.faction && ("roumain" in M.faction))
- M.adjustToxLoss(-2)
- if(prob(10))
- to_chat(M, "[cleanse_message]")
+ if(prob(15))
+ M.adjustToxLoss(-1)
+ M.adjust_drugginess(5)
+ var/high_message = pick("Devotion runs wild within your soul", "A lust for hunting leaps from within your psyche", "The inner beauty of nature courses within your minds' eye.", "Calm warmth spreads within your body.")
+ to_chat(M, span_notice("[high_message]"))
return ..()
/datum/reagent/consumable/ethanol/trickwine/ash_wine/expose_mob(mob/living/M, method=TOUCH, reac_volume)
@@ -30,7 +26,7 @@
if(!iscarbon(M))
var/mob/living/simple_animal/hostile/hostile_target = M
var/hostile_ai_status = hostile_target.AIStatus
- hostile_target.AIStatus = AI_OFF
+ hostile_target.toggle_ai(AI_OFF)
addtimer(VARSET_CALLBACK(hostile_target, AIStatus, hostile_ai_status),reac_volume)
M.Jitter(3 * reac_volume)
M.Dizzy(2 * reac_volume)
@@ -38,18 +34,20 @@
return ..()
/datum/reagent/consumable/ethanol/trickwine/ice_wine
- name = "Icewine"
+ name = "Wine Of Ice"
description = "A specialized brew utilized by members of the Saint-Roumain Militia, designed to assist in temperature regulation while working in hot environments. Known to give one the cold shoulder when thrown."
color = "#C0F1EE"
boozepwr = 70
- taste_description = "a cold night on the hunt"
- glass_name = "Icewine"
+ taste_description = "a weighty meat, undercut by a mild pepper."
+ glass_name = "Wine Of Ice"
glass_desc = "A specialized brew utilized by members of the Saint-Roumain Militia, designed to assist in temperature regulation while working in hot environments. Known to give one the cold shoulder when thrown."
breakaway_flask_icon_state = "baflaskicewine"
/datum/reagent/consumable/ethanol/trickwine/ice_wine/on_mob_life(mob/living/M)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
- M.adjustFireLoss(-1)
+ M.adjustFireLoss(-0.25)
+ if(prob(10))
+ to_chat(M, span_notice("Sweat runs down your body."))
return ..()
@@ -64,30 +62,30 @@
paralyze_dur = reac_volume
else
paralyze_dur = 50 + ((reac_volume - 50) / 4)
- M.adjust_bodytemperature((-20*reac_volume) * TEMPERATURE_DAMAGE_COEFFICIENT, 50)
+ M.adjust_bodytemperature((-1*reac_volume) * TEMPERATURE_DAMAGE_COEFFICIENT, 50)
M.Paralyze(paralyze_dur)
walk(M, 0) //stops them mid pathing even if they're stunimmunee
M.apply_status_effect(/datum/status_effect/ice_block_talisman, paralyze_dur)
return ..()
/datum/reagent/consumable/ethanol/trickwine/shock_wine
- name = "Shockwine"
+ name = "Lightning's Blessing"
description = "A stimulating brew utilized by members of the Saint-Roumain Militia, created to allow trackers to keep up with highly mobile prey. Known to have a shocking effect when thrown"
color = "#FEFEB8"
- boozepwr = 70
- taste_description = "the adrenaline of the chase"
- glass_name = "Shockwine"
+ boozepwr = 50
+ taste_description = "a sharp and unrelenting citrus"
+ glass_name = "Lightning's Blessing"
glass_desc = "A stimulating brew utilized by members of the Saint-Roumain Militia, created to allow trackers to keep up with highly mobile prey. Known to have a shocking effect when thrown"
breakaway_flask_icon_state = "baflaskshockwine"
/datum/reagent/consumable/ethanol/trickwine/shock_wine/on_mob_metabolize(mob/living/M)
..()
M.add_movespeed_modifier(/datum/movespeed_modifier/reagent/shock_wine)
- to_chat(M, "You feel faster the lightning!")
+ to_chat(M, span_notice("You feel like a bolt of lightning!"))
/datum/reagent/consumable/ethanol/trickwine/shock_wine/on_mob_end_metabolize(mob/living/M)
M.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/shock_wine)
- to_chat(M, "You slow to a crawl...")
+ to_chat(M, span_notice("Inertia leaves your body!"))
..()
/datum/reagent/consumable/ethanol/trickwine/shock_wine/expose_mob(mob/living/M, method=TOUCH, reac_volume)
@@ -101,13 +99,13 @@
return ..()
/datum/reagent/consumable/ethanol/trickwine/hearth_wine
- name = "Hearthwine"
- description = "A fiery brew utilized by members of the Saint-Roumain Militia, engineered to cauterize wounds in the field. Goes out in a blaze of glory when thrown."
+ name = "Hearthflame"
+ description = "A fiery brew utilized by members of the Saint-Roumain Militia, engineered to heat the body and cauterize wounds. Goes out in a blaze of glory when thrown."
color = "#FEE185"
boozepwr = 70
- taste_description = "the heat of battle"
- glass_name = "Hearthwine"
- glass_desc = "Fiery brew utilized by members of the Saint-Roumain Militia, engineered to cauterize wounds in the field. Goes out in a blaze of glory when thrown."
+ taste_description = "apple cut apart by tangy pricks"
+ glass_name = "Hearthflame"
+ glass_desc = "Fiery brew utilized by members of the Saint-Roumain Militia, engineered to heat the body and cauterize wounds. Goes out in a blaze of glory when thrown."
breakaway_flask_icon_state = "baflaskhearthwine"
/datum/reagent/consumable/ethanol/trickwine/hearth_wine/on_mob_life(mob/living/M)
@@ -131,78 +129,3 @@
otherT.IgniteTurf(reac_volume)
new /obj/effect/hotspot(otherT, reac_volume * 1, FIRE_MINIMUM_TEMPERATURE_TO_EXIST + reac_volume * 10)
return ..()
-
-/datum/reagent/consumable/ethanol/trickwine/force_wine
- name = "Forcewine"
- description = "A fortifying brew utilized by members of the Saint-Roumain Militia, created to protect against the esoteric. Known to act defensively when thrown."
- color = "#709AAF"
- boozepwr = 70
- taste_description = "the strength of your convictions"
- glass_name = "Forcewine"
- glass_desc = "A fortifying brew utilized by members of the Saint-Roumain Militia, created to protect against the esoteric. Known to act defensively when thrown."
- breakaway_flask_icon_state = "baflaskforcewine"
-
-/datum/reagent/consumable/ethanol/trickwine/force_wine/on_mob_metabolize(mob/living/M)
- ..()
- ADD_TRAIT(M, TRAIT_ANTIMAGIC, "trickwine")
- ADD_TRAIT(M, TRAIT_MINDSHIELD, "trickwine")
- M.visible_message("[M] glows a dim grey aura")
-
-/datum/reagent/consumable/ethanol/trickwine/force_wine/on_mob_end_metabolize(mob/living/M)
- M.visible_message("[M]'s aura fades away ")
- REMOVE_TRAIT(M, TRAIT_ANTIMAGIC, "trickwine")
- REMOVE_TRAIT(M, TRAIT_MINDSHIELD, "trickwine")
- ..()
-
-/datum/reagent/consumable/ethanol/trickwine/force_wine/expose_mob(mob/living/M, method=TOUCH, reac_volume)
- if(method == TOUCH)
- if(!iscarbon(M))
- reac_volume = reac_volume * 2
- var/turf/T = get_turf(M)
- var/turf/otherT
- new /obj/effect/forcefield/resin(T, reac_volume * 4)
- for(var/direction in GLOB.cardinals)
- otherT = get_step(T, direction)
- new /obj/effect/forcefield/resin(otherT, reac_volume * 4)
- return ..()
-
-/datum/reagent/consumable/ethanol/trickwine/prism_wine
- name = "Prismwine"
- description = "A glittering brew utilized by members of the Saint-Roumain Militia, mixed to provide defense against the blasts and burns of foes and fauna alike. Softens targets against your own burns when thrown."
- color = "#F0F0F0"
- boozepwr = 70
- taste_description = "the reflective quality of meditation"
- glass_name = "Prismwine"
- glass_desc = "A glittering brew utilized by members of the Saint-Roumain Militia, mixed to provide defense against the blasts and burns of foes and fauna alike. Softens targets against your own burns when thrown."
- breakaway_flask_icon_state = "baflaskprismwine"
-
-/datum/reagent/consumable/ethanol/trickwine/prism_wine/on_mob_metabolize(mob/living/carbon/human/M)
- ..()
- ADD_TRAIT(M, TRAIT_REFLECTIVE, "trickwine")
- M.physiology.burn_mod *= 0.5
- M.add_filter("prism-wine", 2, list("type"="outline", "color"="#8FD7DF", "size"=1))
- M.visible_message("[M] seems to shimmer with power!")
-
-/datum/reagent/consumable/ethanol/trickwine/prism_wine/on_mob_end_metabolize(mob/living/carbon/human/M)
- REMOVE_TRAIT(M, TRAIT_REFLECTIVE, "trickwine")
- M.physiology.burn_mod *= 2
- M.remove_filter("prism-wine")
- M.visible_message("[M] has returned to normal!")
- ..()
-
-/datum/reagent/consumable/ethanol/trickwine/prism_wine/expose_mob(mob/living/M, method=TOUCH, reac_volume)
- if(method == TOUCH)
- if(istype(M, /mob/living/simple_animal/hostile/asteroid))
- var/mob/living/simple_animal/hostile/asteroid/the_animal = M
- the_animal.armor.modifyRating(energy = -50)
- spawn(reac_volume SECONDS)
- the_animal.armor.modifyRating(energy = 50)
- if(ishuman(M))
- var/mob/living/carbon/human/the_human = M
- if(the_human.physiology.burn_mod < 2)
- the_human.physiology.burn_mod *= 2
- the_human.visible_message("[the_human] seemed weakend!")
- spawn(reac_volume SECONDS)
- the_human.physiology.burn_mod *= 0.5
- the_human.visible_message("[the_human] has returned to normal!")
- return ..()
diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm
index 851a9e38a267..d5e74a6766bb 100644
--- a/code/modules/reagents/chemistry/recipes.dm
+++ b/code/modules/reagents/chemistry/recipes.dm
@@ -18,38 +18,6 @@
return
//I recommend you set the result amount to the total volume of all components.
-/datum/chemical_reaction/proc/chemical_mob_spawn(datum/reagents/holder, amount_to_spawn, reaction_name, mob_class = HOSTILE_SPAWN, mob_faction = "chemicalsummon", random = TRUE)
- if(holder && holder.my_atom)
- var/atom/A = holder.my_atom
- var/turf/T = get_turf(A)
- var/message = "Mobs have been spawned in [ADMIN_VERBOSEJMP(T)] by a [reaction_name] reaction."
- message += " (VV)"
-
- var/mob/M = get(A, /mob)
- if(M)
- message += " - Carried By: [ADMIN_LOOKUPFLW(M)]"
- else
- message += " - Last Fingerprint: [(A.fingerprintslast ? A.fingerprintslast : "N/A")]"
-
- message_admins(message, 0, 1)
- log_game("[reaction_name] chemical mob spawn reaction occuring at [AREACOORD(T)] carried by [key_name(M)] with last fingerprint [A.fingerprintslast? A.fingerprintslast : "N/A"]")
-
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, TRUE)
-
- for(var/mob/living/carbon/C in viewers(get_turf(holder.my_atom), null))
- C.flash_act()
-
- for(var/i in 1 to amount_to_spawn)
- var/mob/living/simple_animal/S
- if(random)
- S = create_random_mob(get_turf(holder.my_atom), mob_class)
- else
- S = new mob_class(get_turf(holder.my_atom))//Spawn our specific mob_class
- S.faction |= mob_faction
- if(prob(50))
- for(var/j = 1, j <= rand(1, 3), j++)
- step(S, pick(NORTH,SOUTH,EAST,WEST))
-
///Simulates a vortex that moves nearby movable atoms towards or away from the turf T. Range also determines the strength of the effect. High values cause nearby objects to be thrown.
/proc/goonchem_vortex(turf/T, setting_type, range)
for(var/atom/movable/X in orange(range, T))
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index f58cc93d31f5..c4eaf50e45d0 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -435,18 +435,6 @@
results = list(/datum/reagent/colorful_reagent = 5)
required_reagents = list(/datum/reagent/stable_plasma = 1, /datum/reagent/uranium/radium = 1, /datum/reagent/drug/space_drugs = 1, /datum/reagent/medicine/cryoxadone = 1, /datum/reagent/consumable/triple_citrus = 1)
-/datum/chemical_reaction/life
- required_reagents = list(/datum/reagent/medicine/strange_reagent = 1, /datum/reagent/medicine/synthflesh = 1, /datum/reagent/blood = 1)
-
-/datum/chemical_reaction/life/on_reaction(datum/reagents/holder, created_volume)
- chemical_mob_spawn(holder, rand(1, round(created_volume, 1)), "Life (hostile)") //defaults to HOSTILE_SPAWN
-
-/datum/chemical_reaction/life_friendly
- required_reagents = list(/datum/reagent/medicine/strange_reagent = 1, /datum/reagent/medicine/synthflesh = 1, /datum/reagent/consumable/sugar = 1)
-
-/datum/chemical_reaction/life_friendly/on_reaction(datum/reagents/holder, created_volume)
- chemical_mob_spawn(holder, rand(1, round(created_volume, 1)), "Life (friendly)", FRIENDLY_SPAWN)
-
/datum/chemical_reaction/corgium
required_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/colorful_reagent = 1, /datum/reagent/medicine/strange_reagent = 1, /datum/reagent/blood = 1)
required_temp = 374
@@ -560,17 +548,6 @@
required_container = /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom
mix_message = "The mushroom's insides bubble and pop and it becomes very limp."
-/datum/chemical_reaction/slime_extractification
- // [CELADON-EDIT] - CELADON_BALANCE - Меняем кровь слаймоменов
- // required_reagents = list(/datum/reagent/toxin/slimejelly = 30, /datum/reagent/consumable/frostoil = 5, /datum/reagent/toxin/plasma = 5) // CELADON-EDIT - ORIGINAL
- required_reagents = list(/datum/reagent/toxin/acid/fluacid = 20, /datum/reagent/consumable/frostoil = 5, /datum/reagent/toxin/plasma = 5)
- // [/CELADON-EDIT]
- mix_message = "The mixture condenses into a ball."
-
-/datum/chemical_reaction/slime_extractification/on_reaction(datum/reagents/holder, created_volume)
- var/location = get_turf(holder.my_atom)
- new /obj/item/slime_extract/grey(location)
-
/datum/chemical_reaction/metalgen_imprint
required_reagents = list(/datum/reagent/metalgen = 1, /datum/reagent/liquid_dark_matter = 1)
results = list(/datum/reagent/metalgen = 1)
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index f6f46d3c3970..96c2a85c280c 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -6,6 +6,8 @@
explode(holder, created_volume)
/datum/chemical_reaction/reagent_explosion/proc/explode(datum/reagents/holder, created_volume)
+ if(QDELING(holder.my_atom))
+ return
var/power = modifier + round(created_volume/strengthdiv, 1)
if(power > 0)
var/turf/T = get_turf(holder.my_atom)
@@ -151,17 +153,8 @@
R.stun(20)
R.reveal(100)
R.adjustHealth(50)
- addtimer(CALLBACK(src, PROC_REF(divine_explosion), round(created_volume/48,1),get_turf(holder.my_atom)), 2 SECONDS)
..()
-/datum/chemical_reaction/reagent_explosion/potassium_explosion/holyboom/proc/divine_explosion(size, turf/T)
- for(var/mob/living/carbon/C in get_hearers_in_view(size,T))
- if(iscultist(C))
- to_chat(C, "The divine explosion sears you!")
- C.Paralyze(40)
- C.adjust_fire_stacks(5)
- C.IgniteMob()
-
/datum/chemical_reaction/gunpowder
results = list(/datum/reagent/gunpowder = 3)
required_reagents = list(/datum/reagent/saltpetre = 1, /datum/reagent/medicine/charcoal = 1, /datum/reagent/sulfur = 1)
@@ -173,7 +166,6 @@
modifier = 1
mix_message = "Sparks start flying around the gunpowder!"
-
/datum/chemical_reaction/reagent_explosion/gunpowder_explosion/on_reaction(datum/reagents/holder, created_volume)
addtimer(CALLBACK(src, PROC_REF(explode), holder, created_volume), rand(5,10) SECONDS)
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
deleted file mode 100644
index 7429db4c1dec..000000000000
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ /dev/null
@@ -1,595 +0,0 @@
-
-/datum/chemical_reaction/slime
- var/deletes_extract = TRUE
-
-/datum/chemical_reaction/slime/on_reaction(datum/reagents/holder)
- use_slime_core(holder)
-
-/datum/chemical_reaction/slime/proc/use_slime_core(datum/reagents/holder)
- SSblackbox.record_feedback("tally", "slime_cores_used", 1, "type")
- if(deletes_extract)
- delete_extract(holder)
-
-/datum/chemical_reaction/slime/proc/delete_extract(datum/reagents/holder)
- var/obj/item/slime_extract/M = holder.my_atom
- if(M.Uses <= 0 && !results.len) //if the slime doesn't output chemicals
- qdel(M)
-
-//Grey
-/datum/chemical_reaction/slime/slimespawn
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/grey
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimespawn/on_reaction(datum/reagents/holder)
- var/mob/living/simple_animal/slime/S = new(get_turf(holder.my_atom), "grey")
- S.visible_message("Infused with plasma, the core begins to quiver and grow, and a new baby slime emerges from it!")
- ..()
-
-/datum/chemical_reaction/slime/slimeinaprov
- results = list(/datum/reagent/medicine/epinephrine = 3)
- required_reagents = list(/datum/reagent/water = 5)
- required_other = TRUE
- required_container = /obj/item/slime_extract/grey
-
-/datum/chemical_reaction/slime/slimemonkey
- required_reagents = list(/datum/reagent/blood = 1)
- required_container = /obj/item/slime_extract/grey
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimemonkey/on_reaction(datum/reagents/holder)
- for(var/i in 1 to 3)
- new /obj/item/reagent_containers/food/snacks/monkeycube(get_turf(holder.my_atom))
- ..()
-
-//Green
-/datum/chemical_reaction/slime/slimemutate
- results = list(/datum/reagent/consumable/berryjuice = 1) // Removal of mutation toxins. This used to be jellyperson toxin, but is now just jelly.
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_other = TRUE
- required_container = /obj/item/slime_extract/green
-
-/datum/chemical_reaction/slime/unstabletoxin
- results = list(/datum/reagent/toxin/mutagen = 1) // Removal of mutation toxins. This used to be unstable toxin, but is now unstable mutagen.
- required_reagents = list(/datum/reagent/uranium/radium = 1)
- required_other = TRUE
- required_container = /obj/item/slime_extract/green
-
-
-//Metal
-/datum/chemical_reaction/slime/slimemetal
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/metal
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimemetal/on_reaction(datum/reagents/holder)
- var/turf/location = get_turf(holder.my_atom)
- new /obj/item/stack/sheet/plasteel(location, 5)
- new /obj/item/stack/sheet/metal(location, 15)
- ..()
-
-/datum/chemical_reaction/slime/slimeglass
- required_reagents = list(/datum/reagent/water = 1)
- required_container = /obj/item/slime_extract/metal
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimeglass/on_reaction(datum/reagents/holder)
- var/turf/location = get_turf(holder.my_atom)
- new /obj/item/stack/sheet/rglass(location, 5)
- new /obj/item/stack/sheet/glass(location, 15)
- ..()
-
-//Gold
-/datum/chemical_reaction/slime/slimemobspawn
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/gold
- required_other = TRUE
- deletes_extract = FALSE //we do delete, but we don't do so instantly
-
-/datum/chemical_reaction/slime/slimemobspawn/on_reaction(datum/reagents/holder)
- var/turf/T = get_turf(holder.my_atom)
- summon_mobs(holder, T)
- var/obj/item/slime_extract/M = holder.my_atom
- deltimer(M.qdel_timer)
- ..()
- M.qdel_timer = addtimer(CALLBACK(src, PROC_REF(delete_extract), holder), 55, TIMER_STOPPABLE)
-
-/datum/chemical_reaction/slime/slimemobspawn/proc/summon_mobs(datum/reagents/holder, turf/T)
- T.visible_message("The slime extract begins to vibrate violently!")
- addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 5, "Gold Slime", HOSTILE_SPAWN), 50)
-
-/datum/chemical_reaction/slime/slimemobspawn/lesser
- required_reagents = list(/datum/reagent/blood = 1)
-
-/datum/chemical_reaction/slime/slimemobspawn/lesser/summon_mobs(datum/reagents/holder, turf/T)
- T.visible_message("The slime extract begins to vibrate violently!")
- addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 3, "Lesser Gold Slime", HOSTILE_SPAWN, "neutral"), 50)
-
-/datum/chemical_reaction/slime/slimemobspawn/friendly
- required_reagents = list(/datum/reagent/water = 1)
-
-/datum/chemical_reaction/slime/slimemobspawn/friendly/summon_mobs(datum/reagents/holder, turf/T)
- T.visible_message("The slime extract begins to vibrate adorably!")
- addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 1, "Friendly Gold Slime", FRIENDLY_SPAWN, "neutral"), 50)
-
-/datum/chemical_reaction/slime/slimemobspawn/spider
- required_reagents = list(/datum/reagent/spider_extract = 1)
-
-/datum/chemical_reaction/slime/slimemobspawn/spider/summon_mobs(datum/reagents/holder, turf/T)
- T.visible_message("The slime extract begins to vibrate crikey-ingly!")
- addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 3, "Traitor Spider Slime", /mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife, "neutral", FALSE), 50)
-
-
-//Silver
-/datum/chemical_reaction/slime/slimebork
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/silver
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimebork/on_reaction(datum/reagents/holder)
- //BORK BORK BORK
- var/turf/T = get_turf(holder.my_atom)
-
- playsound(T, 'sound/effects/phasein.ogg', 100, TRUE)
-
- for(var/mob/living/carbon/C in viewers(T, null))
- C.flash_act()
-
- for(var/i in 1 to 4 + rand(1,2))
- var/chosen = getbork()
- var/obj/B = new chosen(T)
- if(prob(5))//Fry it!
- var/obj/item/food/deepfryholder/fried
- fried = new(T, B)
- fried.fry() // actually set the name and colour it
- B = fried
- if(prob(50))
- for(var/j in 1 to rand(1, 3))
- step(B, pick(NORTH,SOUTH,EAST,WEST))
- ..()
-
-/datum/chemical_reaction/slime/slimebork/proc/getbork()
- return get_random_food()
-
-/datum/chemical_reaction/slime/slimebork/drinks
- required_reagents = list(/datum/reagent/water = 1)
-
-/datum/chemical_reaction/slime/slimebork/drinks/getbork()
- return get_random_drink()
-
-//Blue
-/datum/chemical_reaction/slime/slimefrost
- results = list(/datum/reagent/consumable/frostoil = 10)
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/blue
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimestabilizer
- required_reagents = list(/datum/reagent/blood = 1)
- required_container = /obj/item/slime_extract/blue
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimestabilizer/on_reaction(datum/reagents/holder)
- new /obj/item/slimepotion/slime/stabilizer(get_turf(holder.my_atom))
- ..()
-
-/datum/chemical_reaction/slime/slimefoam
- required_reagents = list(/datum/reagent/water = 5)
- required_container = /obj/item/slime_extract/blue
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimefoam/on_reaction(datum/reagents/holder)
- holder.create_foam(/datum/effect_system/foam_spread,80, "[src] spews out foam!")
-
-//Dark Blue
-/datum/chemical_reaction/slime/slimefreeze
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/darkblue
- required_other = TRUE
- deletes_extract = FALSE
-
-/datum/chemical_reaction/slime/slimefreeze/on_reaction(datum/reagents/holder)
- var/turf/T = get_turf(holder.my_atom)
- T.visible_message("The slime extract starts to feel extremely cold!")
- addtimer(CALLBACK(src, PROC_REF(freeze), holder), 50)
- var/obj/item/slime_extract/M = holder.my_atom
- deltimer(M.qdel_timer)
- ..()
- M.qdel_timer = addtimer(CALLBACK(src, PROC_REF(delete_extract), holder), 55, TIMER_STOPPABLE)
-
-/datum/chemical_reaction/slime/slimefreeze/proc/freeze(datum/reagents/holder)
- if(holder && holder.my_atom)
- var/turf/open/T = get_turf(holder.my_atom)
- if(istype(T))
- T.atmos_spawn_air("n2=50;TEMP=2.7")
-
-/datum/chemical_reaction/slime/slimefireproof
- required_reagents = list(/datum/reagent/water = 1)
- required_container = /obj/item/slime_extract/darkblue
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimefireproof/on_reaction(datum/reagents/holder)
- new /obj/item/slimepotion/fireproof(get_turf(holder.my_atom))
- ..()
-
-//Orange
-/datum/chemical_reaction/slime/slimecasp
- results = list(/datum/reagent/consumable/capsaicin = 10)
- required_reagents = list(/datum/reagent/blood = 1)
- required_container = /obj/item/slime_extract/orange
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimefire
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/orange
- required_other = TRUE
- deletes_extract = FALSE
-
-/datum/chemical_reaction/slime/slimefire/on_reaction(datum/reagents/holder)
- var/turf/T = get_turf(holder.my_atom)
- T.visible_message("The slime extract begins to vibrate adorably!")
- addtimer(CALLBACK(src, PROC_REF(slime_burn), holder), 50)
- var/obj/item/slime_extract/M = holder.my_atom
- deltimer(M.qdel_timer)
- ..()
- M.qdel_timer = addtimer(CALLBACK(src, PROC_REF(delete_extract), holder), 55, TIMER_STOPPABLE)
-
-/datum/chemical_reaction/slime/slimefire/proc/slime_burn(datum/reagents/holder)
- if(holder && holder.my_atom)
- var/turf/open/T = get_turf(holder.my_atom)
- if(istype(T))
- T.atmos_spawn_air("plasma=50;TEMP=1000")
-
-
-/datum/chemical_reaction/slime/slimesmoke
- results = list(/datum/reagent/phosphorus = 10, /datum/reagent/potassium = 10, /datum/reagent/consumable/sugar = 10)
- required_reagents = list(/datum/reagent/water = 5)
- required_container = /obj/item/slime_extract/orange
- required_other = TRUE
-
-//Yellow
-/datum/chemical_reaction/slime/slimeoverload
- required_reagents = list(/datum/reagent/blood = 1)
- required_container = /obj/item/slime_extract/yellow
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimeoverload/on_reaction(datum/reagents/holder, created_volume)
- empulse(get_turf(holder.my_atom), 3, 7)
- ..()
-
-/datum/chemical_reaction/slime/slimecell
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/yellow
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimecell/on_reaction(datum/reagents/holder, created_volume)
- new /obj/item/stock_parts/cell/high/slime(get_turf(holder.my_atom))
- ..()
-
-/datum/chemical_reaction/slime/slimeglow
- required_reagents = list(/datum/reagent/water = 1)
- required_container = /obj/item/slime_extract/yellow
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimeglow/on_reaction(datum/reagents/holder)
- var/turf/T = get_turf(holder.my_atom)
- T.visible_message("The slime begins to emit a soft light. Squeezing it will cause it to grow brightly.")
- new /obj/item/flashlight/slime(T)
- ..()
-
-//Purple
-/datum/chemical_reaction/slime/slimepsteroid
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/purple
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimepsteroid/on_reaction(datum/reagents/holder)
- new /obj/item/slimepotion/slime/steroid(get_turf(holder.my_atom))
- ..()
-
-/datum/chemical_reaction/slime/slimeregen
- results = list(/datum/reagent/medicine/regen_jelly = 5)
- required_reagents = list(/datum/reagent/blood = 1)
- required_container = /obj/item/slime_extract/purple
- required_other = TRUE
-
-//Dark Purple
-/datum/chemical_reaction/slime/slimeplasma
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/darkpurple
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimeplasma/on_reaction(datum/reagents/holder)
- new /obj/item/stack/sheet/mineral/plasma(get_turf(holder.my_atom), 3)
- ..()
-
-//Red
-/datum/chemical_reaction/slime/slimemutator
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/red
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimemutator/on_reaction(datum/reagents/holder)
- new /obj/item/slimepotion/slime/mutator(get_turf(holder.my_atom))
- ..()
-
-/datum/chemical_reaction/slime/slimebloodlust
- required_reagents = list(/datum/reagent/blood = 1)
- required_container = /obj/item/slime_extract/red
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimebloodlust/on_reaction(datum/reagents/holder)
- for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(holder.my_atom), null))
- if(slime.docile) //Undoes docility, but doesn't make rabid.
- slime.visible_message("[slime] forgets its training, becoming wild once again!")
- slime.docile = FALSE
- slime.update_name()
- continue
- slime.rabid = 1
- slime.visible_message("The [slime] is driven into a frenzy!")
- ..()
-
-/datum/chemical_reaction/slime/slimespeed
- required_reagents = list(/datum/reagent/water = 1)
- required_container = /obj/item/slime_extract/red
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimespeed/on_reaction(datum/reagents/holder)
- new /obj/item/slimepotion/speed(get_turf(holder.my_atom))
- ..()
-
-//Pink
-/datum/chemical_reaction/slime/docility
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/pink
- required_other = TRUE
-
-/datum/chemical_reaction/slime/docility/on_reaction(datum/reagents/holder)
- new /obj/item/slimepotion/slime/docility(get_turf(holder.my_atom))
- ..()
-
-/datum/chemical_reaction/slime/gender
- required_reagents = list(/datum/reagent/blood = 1)
- required_container = /obj/item/slime_extract/pink
- required_other = TRUE
-
-/datum/chemical_reaction/slime/gender/on_reaction(datum/reagents/holder)
- new /obj/item/slimepotion/genderchange(get_turf(holder.my_atom))
- ..()
-
-//Black
-/datum/chemical_reaction/slime/slimemutate2
- results = list(/datum/reagent/aslimetoxin = 1)
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_other = TRUE
- required_container = /obj/item/slime_extract/black
-
-//Oil
-/datum/chemical_reaction/slime/slimeexplosion
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/oil
- required_other = TRUE
- deletes_extract = FALSE
-
-/datum/chemical_reaction/slime/slimeexplosion/on_reaction(datum/reagents/holder)
- var/turf/T = get_turf(holder.my_atom)
- var/lastkey = holder.my_atom.fingerprintslast
- var/touch_msg = "N/A"
- if(lastkey)
- var/mob/toucher = get_mob_by_key(lastkey)
- touch_msg = "[ADMIN_LOOKUPFLW(toucher)]."
- message_admins("Slime Explosion reaction started at [ADMIN_VERBOSEJMP(T)]. Last Fingerprint: [touch_msg]")
- log_game("Slime Explosion reaction started at [AREACOORD(T)]. Last Fingerprint: [lastkey ? lastkey : "N/A"].")
- T.visible_message("The slime extract begins to vibrate violently !")
- addtimer(CALLBACK(src, PROC_REF(boom), holder), 50)
- var/obj/item/slime_extract/M = holder.my_atom
- deltimer(M.qdel_timer)
- ..()
- M.qdel_timer = addtimer(CALLBACK(src, PROC_REF(delete_extract), holder), 55, TIMER_STOPPABLE)
-
-/datum/chemical_reaction/slime/slimeexplosion/proc/boom(datum/reagents/holder)
- if(holder && holder.my_atom)
- explosion(get_turf(holder.my_atom), 1 ,3, 6)
-
-
-/datum/chemical_reaction/slime/slimecornoil
- results = list(/datum/reagent/consumable/cornoil = 10)
- required_reagents = list(/datum/reagent/blood = 1)
- required_container = /obj/item/slime_extract/oil
- required_other = TRUE
-
-//Light Pink
-/datum/chemical_reaction/slime/slimepotion2
- required_container = /obj/item/slime_extract/lightpink
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimepotion2/on_reaction(datum/reagents/holder)
- new /obj/item/slimepotion/slime/sentience(get_turf(holder.my_atom))
- ..()
-
-/datum/chemical_reaction/slime/renaming
- required_container = /obj/item/slime_extract/lightpink
- required_reagents = list(/datum/reagent/water = 1)
- required_other = TRUE
-
-/datum/chemical_reaction/slime/renaming/on_reaction(datum/reagents/holder)
- new /obj/item/slimepotion/slime/renaming(holder.my_atom.drop_location())
- ..()
-
-
-//Adamantine
-/datum/chemical_reaction/slime/adamantine
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/adamantine
- required_other = TRUE
-
-/datum/chemical_reaction/slime/adamantine/on_reaction(datum/reagents/holder)
- new /obj/item/stack/sheet/mineral/hidden/hellstone(get_turf(holder.my_atom))
- ..()
-
-//Bluespace
-/datum/chemical_reaction/slime/slimefloor2
- required_reagents = list(/datum/reagent/blood = 1)
- required_container = /obj/item/slime_extract/bluespace
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimefloor2/on_reaction(datum/reagents/holder, created_volume)
- new /obj/item/stack/tile/bluespace(get_turf(holder.my_atom), 25)
- ..()
-
-
-/datum/chemical_reaction/slime/slimecrystal
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/bluespace
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimecrystal/on_reaction(datum/reagents/holder, created_volume)
- var/obj/item/stack/ore/bluespace_crystal/BC = new (get_turf(holder.my_atom))
- BC.visible_message("The [BC.name] appears out of thin air!")
- ..()
-
-/datum/chemical_reaction/slime/slimeradio
- required_reagents = list(/datum/reagent/water = 1)
- required_container = /obj/item/slime_extract/bluespace
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimeradio/on_reaction(datum/reagents/holder, created_volume)
- new /obj/item/slimepotion/slime/slimeradio(get_turf(holder.my_atom))
- ..()
-
-//Cerulean
-/datum/chemical_reaction/slime/slimepsteroid2
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/cerulean
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimepsteroid2/on_reaction(datum/reagents/holder)
- new /obj/item/slimepotion/enhancer(get_turf(holder.my_atom))
- ..()
-
-/datum/chemical_reaction/slime/slime_territory
- required_reagents = list(/datum/reagent/blood = 1)
- required_container = /obj/item/slime_extract/cerulean
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slime_territory/on_reaction(datum/reagents/holder)
- new /obj/item/areaeditor/blueprints/slime(get_turf(holder.my_atom))
- ..()
-
-//Sepia
-/datum/chemical_reaction/slime/slimestop
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/sepia
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimestop/on_reaction(datum/reagents/holder)
- addtimer(CALLBACK(src, PROC_REF(slime_stop), holder), 5 SECONDS)
-
-/datum/chemical_reaction/slime/slimestop/proc/slime_stop(datum/reagents/holder)
- var/obj/item/slime_extract/sepia/extract = holder.my_atom
- var/turf/T = get_turf(holder.my_atom)
- new /obj/effect/timestop(T, null, null, null)
- if(istype(extract))
- if(extract.Uses > 0)
- var/mob/lastheld = get_mob_by_key(holder.my_atom.fingerprintslast)
- if(lastheld && !lastheld.equip_to_slot_if_possible(extract, ITEM_SLOT_HANDS, disable_warning = TRUE))
- extract.forceMove(get_turf(lastheld))
- use_slime_core(holder)
-
-/datum/chemical_reaction/slime/slimecamera
- required_reagents = list(/datum/reagent/water = 1)
- required_container = /obj/item/slime_extract/sepia
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimecamera/on_reaction(datum/reagents/holder)
- new /obj/item/camera(get_turf(holder.my_atom))
- new /obj/item/camera_film(get_turf(holder.my_atom))
- ..()
-
-/datum/chemical_reaction/slime/slimefloor
- required_reagents = list(/datum/reagent/blood = 1)
- required_container = /obj/item/slime_extract/sepia
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimefloor/on_reaction(datum/reagents/holder)
- new /obj/item/stack/tile/sepia(get_turf(holder.my_atom), 25)
- ..()
-
-//Pyrite
-/datum/chemical_reaction/slime/slimepaint
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_container = /obj/item/slime_extract/pyrite
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimepaint/on_reaction(datum/reagents/holder)
- var/chosen = pick(subtypesof(/obj/item/paint))
- new chosen(get_turf(holder.my_atom))
- ..()
-
-/datum/chemical_reaction/slime/slimecrayon
- required_reagents = list(/datum/reagent/blood = 1)
- required_container = /obj/item/slime_extract/pyrite
- required_other = TRUE
-
-/datum/chemical_reaction/slime/slimecrayon/on_reaction(datum/reagents/holder)
- var/chosen = pick(difflist(subtypesof(/obj/item/toy/crayon),typesof(/obj/item/toy/crayon/spraycan)))
- new chosen(get_turf(holder.my_atom))
- ..()
-
-//Rainbow :o)
-/datum/chemical_reaction/slime/slimeRNG
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
- required_other = TRUE
- required_container = /obj/item/slime_extract/rainbow
-
-/datum/chemical_reaction/slime/slimeRNG/on_reaction(datum/reagents/holder, created_volume)
- if(created_volume >= 5)
- var/obj/item/grenade/clusterbuster/slime/S = new (get_turf(holder.my_atom))
- S.visible_message("Infused with plasma, the core begins to expand uncontrollably!")
- S.icon_state = "[S.base_state]_active"
- S.active = TRUE
- addtimer(CALLBACK(S, TYPE_PROC_REF(/obj/item/grenade, prime)), rand(15,60))
- else
- var/mob/living/simple_animal/slime/random/S = new (get_turf(holder.my_atom))
- S.visible_message("Infused with plasma, the core begins to quiver and grow, and a new baby slime emerges from it!")
- ..()
-
-/datum/chemical_reaction/slime/slimebomb
- required_reagents = list(/datum/reagent/toxin/slimejelly = 1)
- required_other = TRUE
- required_container = /obj/item/slime_extract/rainbow
-
-/datum/chemical_reaction/slime/slimebomb/on_reaction(datum/reagents/holder, created_volume)
- var/turf/T = get_turf(holder.my_atom)
- var/obj/item/grenade/clusterbuster/slime/volatile/S = new (T)
- S.visible_message("Infused with slime jelly, the core begins to expand uncontrollably!")
- S.icon_state = "[S.base_state]_active"
- S.active = TRUE
- addtimer(CALLBACK(S, TYPE_PROC_REF(/obj/item/grenade, prime)), rand(15,60))
- var/lastkey = holder.my_atom.fingerprintslast
- var/touch_msg = "N/A"
- if(lastkey)
- var/mob/toucher = get_mob_by_key(lastkey)
- touch_msg = "[ADMIN_LOOKUPFLW(toucher)]."
- message_admins("Brorble Brorble primed at [ADMIN_VERBOSEJMP(T)]. Last Fingerprint: [touch_msg]")
- log_game("Brorble Brorble primed at [AREACOORD(T)]. Last Fingerprint: [lastkey ? lastkey : "N/A"].")
- ..()
-
-/datum/chemical_reaction/slime/slime_transfer
- required_reagents = list(/datum/reagent/blood = 1)
- required_other = TRUE
- required_container = /obj/item/slime_extract/rainbow
-
-/datum/chemical_reaction/slime/slime_transfer/on_reaction(datum/reagents/holder)
- new /obj/item/slimepotion/transference(get_turf(holder.my_atom))
- ..()
-
-/datum/chemical_reaction/slime/flight_potion
- required_reagents = list(/datum/reagent/water/holywater = 5, /datum/reagent/uranium = 5)
- required_other = TRUE
- required_container = /obj/item/slime_extract/rainbow
-
-/datum/chemical_reaction/slime/flight_potion/on_reaction(datum/reagents/holder)
- new /obj/item/reagent_containers/glass/bottle/potion/flight(get_turf(holder.my_atom))
- ..()
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index df7949c9c654..80d636202f4c 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -39,6 +39,11 @@
desc = "A small bottle of morphine."
list_reagents = list(/datum/reagent/medicine/morphine = 30)
+/obj/item/reagent_containers/glass/bottle/painkiller_booze
+ name = "'painkiller' bottle"
+ desc = "A small bottle of an unmarked substance called 'painkiller.' Will this really work?"
+ list_reagents = list(/datum/reagent/consumable/ethanol/painkiller = 30)
+
/obj/item/reagent_containers/glass/bottle/chloralhydrate
name = "chloral hydrate bottle"
desc = "A small bottle of Choral Hydrate. Mickey's Favorite!"
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 78326279b6f9..8415c98e41e5 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -18,7 +18,7 @@
/obj/item/reagent_containers/hypospray
name = "hypospray"
- desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
+ desc = "The hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
icon = 'icons/obj/syringe.dmi'
item_state = "hypo"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
@@ -103,15 +103,6 @@
icon_state = "[base_icon_state][(reagents.total_volume > 0) ? null : 0]"
return ..()
-/obj/item/reagent_containers/hypospray/combat/heresypurge
- name = "holy water piercing injector"
- desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with 5 doses of a holy water and pacifier mixture. Not for use on your teammates."
- item_state = "holy_hypo"
- icon_state = "holy_hypo"
- volume = 250
- list_reagents = list(/datum/reagent/water/holywater = 150, /datum/reagent/peaceborg/tire = 50, /datum/reagent/peaceborg/confuse = 50)
- amount_per_transfer_from_this = 50
-
//MediPens
/obj/item/reagent_containers/hypospray/medipen
diff --git a/code/modules/reagents/reagent_containers/jug.dm b/code/modules/reagents/reagent_containers/jug.dm
index de1570a9ef5c..10baf946a089 100644
--- a/code/modules/reagents/reagent_containers/jug.dm
+++ b/code/modules/reagents/reagent_containers/jug.dm
@@ -1,7 +1,7 @@
/obj/item/reagent_containers/glass/chem_jug
name = "chemical jug"
desc = "A large jug used for storing bulk ammounts chemicals. Provided with a tamper seal which ensures that the contents are pure"
- icon = 'icons/obj/chemical/chem_jug.dmi'
+ icon = 'icons/obj/chemical/chem_jug.dmi' // the coloring of labels for elemental chemicals is based on the chemical group block coloring at https://pubchem.ncbi.nlm.nih.gov/periodic-table/ . Everything else is whatever.
icon_state = "chem_jug"
item_state = "sheet-plastic"
w_class = WEIGHT_CLASS_BULKY
@@ -80,36 +80,21 @@
/obj/item/reagent_containers/glass/chem_jug/open
cap_on = FALSE
-/obj/item/reagent_containers/glass/chem_jug/carbon
- name = "chemical jug (carbon)"
- icon_state = "chem_jug_carbon"
- list_reagents = list(/datum/reagent/carbon = 150)
-
-/obj/item/reagent_containers/glass/chem_jug/oxygen
- name = "chemical jug (oxygen)"
- icon_state = "chem_jug_oxygen"
- list_reagents = list(/datum/reagent/oxygen = 150)
-
-/obj/item/reagent_containers/glass/chem_jug/nitrogen
- name = "chemical jug (nitrogen)"
- icon_state = "chem_jug_nitrogen"
- list_reagents = list(/datum/reagent/nitrogen = 150)
-
-/obj/item/reagent_containers/glass/chem_jug/hydrogen
- name = "chemical jug (hydrogen)"
- icon_state = "chem_jug_hydrogen"
- list_reagents = list(/datum/reagent/hydrogen = 150)
-
-/obj/item/reagent_containers/glass/chem_jug/radium
- name = "chemical jug (radium)"
- icon_state = "chem_jug_radium"
- list_reagents = list(/datum/reagent/uranium/radium = 150)
-
/obj/item/reagent_containers/glass/chem_jug/aluminium
name = "chemical jug (aluminium)"
icon_state = "chem_jug_aluminium"
list_reagents = list(/datum/reagent/aluminium = 150)
+/obj/item/reagent_containers/glass/chem_jug/bromine
+ name = "chemical jug (bromine)"
+ icon_state = "chem_jug_bromine"
+ list_reagents = list(/datum/reagent/bromine = 150)
+
+/obj/item/reagent_containers/glass/chem_jug/carbon
+ name = "chemical jug (carbon)"
+ icon_state = "chem_jug_carbon"
+ list_reagents = list(/datum/reagent/carbon = 150)
+
/obj/item/reagent_containers/glass/chem_jug/chlorine
name = "chemical jug (chlorine)"
icon_state = "chem_jug_chlorine"
@@ -120,27 +105,67 @@
icon_state = "chem_jug_copper"
list_reagents = list(/datum/reagent/copper = 150)
-/obj/item/reagent_containers/glass/chem_jug/bromine
- name = "chemical jug (bromine)"
- icon_state = "chem_jug_bromine"
- list_reagents = list(/datum/reagent/bromine = 150)
+/obj/item/reagent_containers/glass/chem_jug/fluorine
+ name = "chemical jug (fluorine)"
+ icon_state = "chem_jug_fluorine"
+ list_reagents = list(/datum/reagent/fluorine = 150)
+
+/obj/item/reagent_containers/glass/chem_jug/hydrogen
+ name = "chemical jug (hydrogen)"
+ icon_state = "chem_jug_hydrogen"
+ list_reagents = list(/datum/reagent/hydrogen = 150)
/obj/item/reagent_containers/glass/chem_jug/iodine
name = "chemical jug (iodine)"
icon_state = "chem_jug_iodine"
list_reagents = list(/datum/reagent/iodine = 150)
+/obj/item/reagent_containers/glass/chem_jug/lithium
+ name = "chemical jug (lithium)"
+ icon_state = "chem_jug_lithium"
+ list_reagents = list(/datum/reagent/lithium = 150)
+
+/obj/item/reagent_containers/glass/chem_jug/mercury
+ name = "chemical jug (mercury)"
+ icon_state = "chem_jug_mercury"
+ list_reagents = list(/datum/reagent/mercury = 150)
+
+/obj/item/reagent_containers/glass/chem_jug/nitrogen
+ name = "chemical jug (nitrogen)"
+ icon_state = "chem_jug_nitrogen"
+ list_reagents = list(/datum/reagent/nitrogen = 150)
+
+/obj/item/reagent_containers/glass/chem_jug/oxygen
+ name = "chemical jug (oxygen)"
+ icon_state = "chem_jug_oxygen"
+ list_reagents = list(/datum/reagent/oxygen = 150)
+
+/obj/item/reagent_containers/glass/chem_jug/phosphorus
+ name = "chemical jug (phosphorus)"
+ icon_state = "chem_jug_phosphorus"
+ list_reagents = list(/datum/reagent/phosphorus = 150)
+
/obj/item/reagent_containers/glass/chem_jug/potassium
name = "chemical jug (potassium)"
icon_state = "chem_jug_potassium"
list_reagents = list(/datum/reagent/potassium = 150)
+/obj/item/reagent_containers/glass/chem_jug/radium
+ name = "chemical jug (radium)"
+ icon_state = "chem_jug_radium"
+ list_reagents = list(/datum/reagent/uranium/radium = 150)
+
+/obj/item/reagent_containers/glass/chem_jug/sodium
+ name = "chemical jug (sodium)"
+ icon_state = "chem_jug_sodium"
+ list_reagents = list(/datum/reagent/sodium = 150)
+
/obj/item/reagent_containers/glass/chem_jug/sulfur
name = "chemical jug (sulfur)"
icon_state = "chem_jug_sulfur"
list_reagents = list(/datum/reagent/sulfur = 150)
-/obj/item/reagent_containers/glass/chem_jug/thermite
+/obj/item/reagent_containers/glass/chem_jug/thermite // not giving this its own "elemental" jug sprite.
name = "chemical jug (thermite)"
list_reagents = list(/datum/reagent/thermite = 150)
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 9cac6c3a52a2..ba3cd6a540f1 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -96,7 +96,7 @@
name = "morphine pill"
desc = "Commonly used to treat insomnia."
icon_state = "pill8"
- list_reagents = list(/datum/reagent/medicine/morphine = 30)
+ list_reagents = list(/datum/reagent/medicine/morphine = 15)
rename_with_volume = TRUE
/obj/item/reagent_containers/pill/stimulant
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 54d2fc182398..dd8c6c24442b 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -188,6 +188,11 @@
anchored = TRUE
reagent_id = /datum/reagent/consumable/nutraslop
+/obj/structure/reagent_dispensers/servingdish/wrench_act(mob/living/user, obj/item/tool)
+ . = ..()
+ default_unfasten_wrench(user, tool)
+ return TRUE
+
/obj/structure/reagent_dispensers/plumbed
name = "stationairy water tank"
anchored = TRUE
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index b8b08486f20d..9b6a0629fa3e 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -365,7 +365,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/obj/item/conveyor_switch_construct/afterattack(atom/A, mob/user, proximity)
. = ..()
- if(!proximity || user.stat || !isfloorturf(A) || istype(A, /area/shuttle))
+ if(!proximity || user.stat || !isfloorturf(A))
return
var/found = 0
for(var/obj/machinery/conveyor/C in view())
@@ -397,7 +397,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/obj/item/stack/conveyor/afterattack(atom/A, mob/user, proximity)
. = ..()
- if(!proximity || user.stat || !isfloorturf(A) || istype(A, /area/shuttle))
+ if(!proximity || user.stat || !isfloorturf(A))
return
var/cdir = get_dir(A, user)
if(A == user.loc)
diff --git a/code/modules/requests/requests_manager.dm b/code/modules/requests/requests_manager.dm
index e33da846d4de..c8985058dac1 100644
--- a/code/modules/requests/requests_manager.dm
+++ b/code/modules/requests/requests_manager.dm
@@ -106,6 +106,9 @@ GLOBAL_DATUM_INIT(requests, /datum/request_manager, new)
*/
/datum/request_manager/proc/fax_request(client/requester, message, additional_info)
request_for_client(requester, REQUEST_FAX, message, additional_info)
+ for(var/client/admin in GLOB.admins)
+ if(admin.prefs.chat_toggles & CHAT_PRAYER && admin.prefs.toggles & SOUND_PRAYERS)
+ SEND_SOUND(admin, sound('sound/misc/mail.ogg'))
/**
* Creates a request and registers the request with all necessary internal tracking lists
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index f08143f7066e..c4058b9aa3c0 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -179,6 +179,17 @@ other types of metals and chemistry for reagents).
desc = "A design disk containing the pattern for a refill box of standard 9mm ammo, used in Commander pistols."
starting_blueprints = list(/datum/design/c9mmautolathe)
+/obj/item/disk/design_disk/ammo_c9mm/Initialize()
+ . = ..()
+ blueprints[1] = new /datum/design/c9mmautolathe()
+
+/obj/item/disk/design_disk/telecomms
+ name = "design disk - Telecomms parts"
+ desc = "A design disk containing blueprints for specialized telecommunications parts."
+ color = "#64A8D9"
+ max_blueprints = 7
+ starting_blueprints = list(/datum/design/subspace_ansible, /datum/design/hyperwave_filter, /datum/design/subspace_amplifier, /datum/design/subspace_treatment, /datum/design/subspace_analyzer, /datum/design/subspace_crystal, /datum/design/subspace_transmitter)
+
/obj/item/disk/design_disk/blanks
design_name = "Blank Ammo"
starting_blueprints = list(/datum/design/blank_shell)
diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm
index 8401d618aa01..7ba92c76ba26 100644
--- a/code/modules/research/designs/AI_module_designs.dm
+++ b/code/modules/research/designs/AI_module_designs.dm
@@ -10,60 +10,6 @@
category = list("AI Modules")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-/datum/design/board/safeguard_module
- name = "Module Design (Safeguard)"
- desc = "Allows for the construction of a Safeguard AI Module."
- id = "safeguard_module"
- materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000)
- build_path = /obj/item/aiModule/supplied/safeguard
- category = list("AI Modules")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/board/onehuman_module
- name = "Module Design (OneHuman)"
- desc = "Allows for the construction of a OneHuman AI Module."
- id = "onehuman_module"
- materials = list(/datum/material/glass = 1000, /datum/material/diamond = 6000, /datum/material/bluespace = 1000)
- build_path = /obj/item/aiModule/zeroth/oneHuman
- category = list("AI Modules")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/board/protectstation_module
- name = "Module Design (ProtectStation)"
- desc = "Allows for the construction of a ProtectStation AI Module."
- id = "protectstation_module"
- materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000)
- build_path = /obj/item/aiModule/supplied/protectStation
- category = list("AI Modules")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/board/quarantine_module
- name = "Module Design (Quarantine)"
- desc = "Allows for the construction of a Quarantine AI Module."
- id = "quarantine_module"
- materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000)
- build_path = /obj/item/aiModule/supplied/quarantine
- category = list("AI Modules")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/board/oxygen_module
- name = "Module Design (OxygenIsToxicToHumans)"
- desc = "Allows for the construction of a Safeguard AI Module."
- id = "oxygen_module"
- materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000)
- build_path = /obj/item/aiModule/supplied/oxygen
- category = list("AI Modules")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/board/freeform_module
- name = "Module Design (Freeform)"
- desc = "Allows for the construction of a Freeform AI Module."
- id = "freeform_module"
- materials = list(/datum/material/glass = 1000, /datum/material/gold = 10000, /datum/material/bluespace = 2000)//Custom inputs should be more expensive to get
- build_path = /obj/item/aiModule/supplied/freeform
- category = list("AI Modules")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
/datum/design/board/reset_module
name = "Module Design (Reset)"
desc = "Allows for the construction of a Reset AI Module."
@@ -91,66 +37,3 @@
category = list("AI Modules")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-/datum/design/board/freeformcore_module
- name = "AI Core Module (Freeform)"
- desc = "Allows for the construction of a Freeform AI Core Module."
- id = "freeformcore_module"
- materials = list(/datum/material/glass = 1000, /datum/material/diamond = 10000, /datum/material/bluespace = 2000)//Ditto
- build_path = /obj/item/aiModule/core/freeformcore
- category = list("AI Modules")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/board/asimov
- name = "Core Module Design (Asimov)"
- desc = "Allows for the construction of an Asimov AI Core Module."
- id = "asimov_module"
- materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000)
- build_path = /obj/item/aiModule/core/full/asimov
- category = list("AI Modules")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/board/paladin_module
- name = "Core Module Design (P.A.L.A.D.I.N.)"
- desc = "Allows for the construction of a P.A.L.A.D.I.N. AI Core Module."
- id = "paladin_module"
- build_type = IMPRINTER
- materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000)
- build_path = /obj/item/aiModule/core/full/paladin
- category = list("AI Modules")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/board/tyrant_module
- name = "Core Module Design (T.Y.R.A.N.T.)"
- desc = "Allows for the construction of a T.Y.R.A.N.T. AI Module."
- id = "tyrant_module"
- materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000)
- build_path = /obj/item/aiModule/core/full/tyrant
- category = list("AI Modules")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/board/overlord_module
- name = "Core Module Design (Overlord)"
- desc = "Allows for the construction of an Overlord AI Module."
- id = "overlord_module"
- materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000)
- build_path = /obj/item/aiModule/core/full/overlord
- category = list("AI Modules")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/board/corporate_module
- name = "Core Module Design (Corporate)"
- desc = "Allows for the construction of a Corporate AI Core Module."
- id = "corporate_module"
- materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000)
- build_path = /obj/item/aiModule/core/full/corp
- category = list("AI Modules")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/board/default_module
- name = "Core Module Design (Default)"
- desc = "Allows for the construction of a Default AI Core Module."
- id = "default_module"
- materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000)
- build_path = /obj/item/aiModule/core/full/custom
- category = list("AI Modules")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 0b679dfcc4bf..5ac2370dc694 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -761,7 +761,7 @@
id = "foam_dart"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 500)
- build_path = /obj/item/ammo_box/foambox
+ build_path = /obj/item/storage/box/ammo/foam_darts
category = list("initial", "Misc")
/datum/design/handcuffs
@@ -785,7 +785,7 @@
id = "c38_surplus"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/c38_box/surplus
+ build_path = /obj/item/storage/box/ammo/c38_surplus
category = list("initial", "Security", "Ammo")
/datum/design/beanbag_slug
@@ -817,7 +817,7 @@
id = "riot_darts"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 50000) //Comes with 40 darts
- build_path = /obj/item/ammo_box/foambox/riot
+ build_path = /obj/item/storage/box/ammo/foam_darts/riot
category = list("initial", "Security")
/datum/design/c10mm_surplus
@@ -825,7 +825,7 @@
id = "c10mm-surplus"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/c10mm/surplus
+ build_path = /obj/item/storage/box/ammo/c10mm_surplus
category = list("initial", "Security", "Ammo")
/datum/design/c45_surplus
@@ -833,7 +833,7 @@
id = "c45-surplus"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/c45/surplus
+ build_path = /obj/item/storage/box/ammo/c45_surplus
category = list("initial", "Security", "Ammo")
/datum/design/c9mm_surplus
@@ -841,7 +841,7 @@
id = "c9mm-surplus"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/c9mm/surplus
+ build_path = /obj/item/storage/box/ammo/c9mm_surplus
category = list("initial", "Security", "Ammo")
/datum/design/c556mmHITP_surplus
@@ -849,15 +849,7 @@
id = "c556mmHITP-surplus"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/c556mmHITP/surplus
- category = list("initial", "Security", "Ammo")
-
-/datum/design/generic_ammo_box
- name = "Generic Ammo Box"
- id = "ammo-generic"
- build_type = AUTOLATHE | PROTOLATHE
- materials = list(/datum/material/iron = 1500)
- build_path = /obj/item/ammo_box/generic
+ build_path = /obj/item/storage/box/ammo/c556mm_surplus
category = list("initial", "Security", "Ammo")
/datum/design/ammo_can
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index c33b2c4558d3..2cc0134cf8f6 100644
--- a/code/modules/research/designs/biogenerator_designs.dm
+++ b/code/modules/research/designs/biogenerator_designs.dm
@@ -199,7 +199,7 @@
id = "rngplant"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass= 2000)
- build_path = /obj/effect/spawner/lootdrop/seeded
+ build_path = /obj/effect/spawner/random/food_or_drink/seed
category = list("initial","LIFESEED_2.0")
/datum/design/genesis
diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
index 2ba8ef1e2d7a..6cd4b69f4062 100644
--- a/code/modules/research/designs/comp_board_designs.dm
+++ b/code/modules/research/designs/comp_board_designs.dm
@@ -38,14 +38,6 @@
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-/datum/design/board/xenobiocamera
- name = "Computer Design (Xenobiology Console)"
- desc = "Allows for the construction of circuit boards used to build xenobiology camera computers."
- id = "xenobioconsole"
- build_path = /obj/item/circuitboard/computer/xenobiology
- category = list("Computer Boards")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
/datum/design/board/aiupload
name = "Computer Design (AI Upload)"
desc = "Allows for the construction of circuit boards used to build an AI Upload Console."
@@ -190,14 +182,6 @@
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO
-/datum/design/board/rdconsole
- name = "Computer Design (R&D Console)"
- desc = "Allows for the construction of circuit boards used to build a new R&D console."
- id = "rdconsole"
- build_path = /obj/item/circuitboard/computer/rdconsole
- category = list("Computer Boards")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
/datum/design/board/bounty
name = "Computer Design (Bounty Console)"
desc = "Allows for the construction of circuit boards used to build a Bounty Console."
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index bbc83dd1e705..b910f6f008e8 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -85,7 +85,8 @@
desc = "The circuit board for a space heater."
id = "space_heater"
build_path = /obj/item/circuitboard/machine/space_heater
- category = list ("Engineering Machinery")
+ build_type = AUTOLATHE | IMPRINTER
+ category = list ("Engineering Machinery", "initial", "Equipment")
departmental_flags = ALL
/datum/design/board/teleport_station
@@ -332,15 +333,6 @@
build_path = /obj/item/circuitboard/machine/smartfridge
category = list ("Misc. Machinery")
-
-/datum/design/board/monkey_recycler
- name = "Machine Design (Monkey Recycler Board)"
- desc = "The circuit board for a monkey recycler."
- id = "monkey_recycler"
- build_path = /obj/item/circuitboard/machine/monkey_recycler
- category = list ("Misc. Machinery")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SERVICE
-
/datum/design/board/seed_extractor
name = "Machine Design (Seed Extractor Board)"
desc = "The circuit board for a seed extractor."
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 46dddeb0c586..cc45dd179877 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -670,15 +670,6 @@
construction_time = 300
category = list("Exosuit Equipment")
-/datum/design/mech_honker
- name = "HoNkER BlAsT 5000"
- id = "mech_honker"
- build_type = MECHFAB
- build_path = /obj/item/mecha_parts/mecha_equipment/weapon/honker
- materials = list(/datum/material/iron=20000,/datum/material/hellstone=10000)
- construction_time = 500
- category = list("Exosuit Equipment")
-
/datum/design/mech_punching_glove
name = "Oingo Boingo Punch-face"
id = "mech_punching_face"
diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm
index ba52f69c5502..6c7097b351a4 100644
--- a/code/modules/research/designs/stock_parts_designs.dm
+++ b/code/modules/research/designs/stock_parts_designs.dm
@@ -251,7 +251,7 @@
name = "Subspace Ansible"
desc = "A compact module capable of sensing extradimensional activity."
id = "s-ansible"
- build_type = PROTOLATHE
+ build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/iron = 100, /datum/material/silver = 100)
build_path = /obj/item/stock_parts/subspace/ansible
category = list("Stock Parts")
@@ -261,7 +261,7 @@
name = "Hyperwave Filter"
desc = "A tiny device capable of filtering and converting super-intense radiowaves."
id = "s-filter"
- build_type = PROTOLATHE
+ build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/iron = 100, /datum/material/silver = 100)
build_path = /obj/item/stock_parts/subspace/filter
category = list("Stock Parts")
@@ -271,7 +271,7 @@
name = "Subspace Amplifier"
desc = "A compact micro-machine capable of amplifying weak subspace transmissions."
id = "s-amplifier"
- build_type = PROTOLATHE
+ build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/iron = 100, /datum/material/gold = 100, /datum/material/uranium = 100)
build_path = /obj/item/stock_parts/subspace/amplifier
category = list("Stock Parts")
@@ -281,7 +281,7 @@
name = "Subspace Treatment Disk"
desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves."
id = "s-treatment"
- build_type = PROTOLATHE
+ build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/iron = 100, /datum/material/silver = 200)
build_path = /obj/item/stock_parts/subspace/treatment
category = list("Stock Parts")
@@ -291,7 +291,7 @@
name = "Subspace Analyzer"
desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
id = "s-analyzer"
- build_type = PROTOLATHE
+ build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/iron = 100, /datum/material/gold = 100)
build_path = /obj/item/stock_parts/subspace/analyzer
category = list("Stock Parts")
@@ -301,7 +301,7 @@
name = "Ansible Crystal"
desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
id = "s-crystal"
- build_type = PROTOLATHE
+ build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/glass = 800, /datum/material/silver = 100, /datum/material/gold = 100)
build_path = /obj/item/stock_parts/subspace/crystal
category = list("Stock Parts")
@@ -311,7 +311,7 @@
name = "Subspace Transmitter"
desc = "A large piece of equipment used to open a window into the subspace dimension."
id = "s-transmitter"
- build_type = PROTOLATHE
+ build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/glass = 100, /datum/material/silver = 100, /datum/material/uranium = 100)
build_path = /obj/item/stock_parts/subspace/transmitter
category = list("Stock Parts")
diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm
index 86a8b542712b..b57dca9d785b 100644
--- a/code/modules/research/designs/tool_designs.dm
+++ b/code/modules/research/designs/tool_designs.dm
@@ -32,16 +32,6 @@
category = list("Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_ENGINEERING
-/datum/design/exwelder
- name = "Experimental Welding Tool"
- desc = "An experimental welder capable of self-fuel generation."
- id = "exwelder"
- build_type = PROTOLATHE
- materials = list(/datum/material/iron = 1000, /datum/material/glass = 500, /datum/material/plasma = 1500, /datum/material/uranium = 200)
- build_path = /obj/item/weldingtool/experimental
- category = list("Tool Designs")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
-
/datum/design/rpd
name = "Rapid Pipe Dispenser (RPD)"
id = "rpd_loaded"
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 1c3edc8b7c32..f1b9a8c573c6 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -238,16 +238,6 @@
build_path = /obj/item/ammo_box/magazine/wt550m9/ap
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-/datum/design/mag_oldsmg/ic_mag
- name = "WT-550 Auto Gun Incendiary Magazine (4.6x30mm IC)"
- desc = "A 20 round armour piercing magazine for the out of date security WT-550 Auto Rifle"
- id = "mag_oldsmg_ic"
- materials = list(/datum/material/iron = 6000, /datum/material/silver = 600, /datum/material/glass = 1000)
- build_path = /obj/item/ammo_box/magazine/wt550m9/inc
- departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-
-//WS edit - free lethals
-
/datum/design/commanderammo
name = "Commander magazine (9mm)"
desc = "A single stack magazine chambered in 9mm for Commander sidearms."
@@ -288,8 +278,6 @@
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-//Shiptest edit - standard ammunition
-
/datum/design/buckshot_shell
name = "Buckshot Shell"
id = "buckshot_shell"
@@ -304,7 +292,7 @@
id = "c38"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/c38_box
+ build_path = /obj/item/storage/box/ammo/c38
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -313,7 +301,7 @@
id = "c9mm"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/c9mm
+ build_path = /obj/item/storage/box/ammo/c9mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -322,7 +310,7 @@
id = "c10mm"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/c10mm
+ build_path = /obj/item/storage/box/ammo/c10mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -331,7 +319,7 @@
id = "c45"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/c45
+ build_path = /obj/item/storage/box/ammo/c45
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -340,19 +328,17 @@
id = "c556mmHITP"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/c556mmHITP
+ build_path = /obj/item/storage/box/ammo/c556mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-// WS edit - not so free rubbershot
-
/datum/design/rubbershot9mm
name = "Rubbershot 9mm ammo box"
desc = "A box full of less-than-lethal 9mm ammunition."
id = "rubbershot9mm"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/c9mm/rubbershot
+ build_path = /obj/item/storage/box/ammo/c9mm_rubber
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -362,7 +348,7 @@
id = "rubbershot10mm"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/c10mm/rubbershot
+ build_path = /obj/item/storage/box/ammo/c10mm_rubber
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -372,7 +358,7 @@
id = "rubbershot45"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/c45/rubbershot
+ build_path = /obj/item/storage/box/ammo/c45_rubber
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_BALLISTICS
@@ -382,7 +368,7 @@
id = "rubbershot556mmHITP"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 18000)
- build_path = /obj/item/ammo_box/c556mmHITP/rubbershot
+ build_path = /obj/item/storage/box/ammo/c556mm_rubber
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -392,7 +378,7 @@
id = "ap9mm"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000, /datum/material/uranium = 1000)
- build_path = /obj/item/ammo_box/c9mm/ap
+ build_path = /obj/item/storage/box/ammo/c9mm_ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -402,7 +388,7 @@
id = "ap10mm"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000, /datum/material/uranium = 1000)
- build_path = /obj/item/ammo_box/c10mm/ap
+ build_path = /obj/item/storage/box/ammo/c10mm_ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -412,7 +398,7 @@
id = "ap45"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000, /datum/material/uranium = 1000)
- build_path = /obj/item/ammo_box/c45/ap
+ build_path = /obj/item/storage/box/ammo/c45_ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_BALLISTICS
@@ -422,7 +408,7 @@
id = "ap556mmHITP"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 18000, /datum/material/uranium = 1000)
- build_path = /obj/item/ammo_box/c556mmHITP/ap
+ build_path = /obj/item/storage/box/ammo/c556mm_ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -432,7 +418,7 @@
id = "hp9mm"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000, /datum/material/silver = 1000)
- build_path = /obj/item/ammo_box/c9mm/hp
+ build_path = /obj/item/storage/box/ammo/c9mm_hp
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -442,7 +428,7 @@
id = "hp10mm"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000, /datum/material/silver = 1000)
- build_path = /obj/item/ammo_box/c10mm/hp
+ build_path = /obj/item/storage/box/ammo/c10mm_hp
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -452,7 +438,7 @@
id = "hp45"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000, /datum/material/silver = 1000)
- build_path = /obj/item/ammo_box/c45/hp
+ build_path = /obj/item/storage/box/ammo/c45_hp
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_BALLISTICS
@@ -462,40 +448,10 @@
id = "hp556mmHITP"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 18000, /datum/material/silver = 1000)
- build_path = /obj/item/ammo_box/c556mmHITP/hp
- category = list("Ammo")
- departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-
-/datum/design/inc9mm
- name = "Incendiary 9mm ammo box"
- desc = "A box full of incendiary 9mm ammunition."
- id = "inc9mm"
- build_type = PROTOLATHE
- materials = list(/datum/material/iron = 15000, /datum/material/plasma = 5000)
- build_path = /obj/item/ammo_box/c9mm/fire
- category = list("Ammo")
- departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-
-/datum/design/inc10mm
- name = "Incendiary 10mm ammo box"
- desc = "A box full of incendiary 10mm ammunition."
- id = "inc10mm"
- build_type = PROTOLATHE
- materials = list(/datum/material/iron = 15000, /datum/material/plasma = 5000)
- build_path = /obj/item/ammo_box/c10mm/fire
+ build_path = /obj/item/storage/box/ammo/c556mm_hp
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
-/datum/design/inc45
- name = "Incendiary .45 ammo box"
- desc = "A box full of incendiary .45 ammunition."
- id = "inc45"
- build_type = PROTOLATHE
- materials = list(/datum/material/iron = 15000, /datum/material/plasma = 5000)
- build_path = /obj/item/ammo_box/c45/fire
- category = list("Ammo")
- departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_BALLISTICS
-
/datum/design/rubbershot
name = "Rubber Shot"
id = "rubber_shot"
@@ -737,5 +693,5 @@
id = "c9mmautolathe"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 15000)
- build_path = /obj/item/ammo_box/c9mm
+ build_path = /obj/item/storage/box/ammo/c9mm
category = list("Imported")
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index ce473ad739cb..62cd6f6bf8ef 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -82,7 +82,6 @@
/obj/item/grenade,
/obj/item/aicard,
/obj/item/storage/backpack/holding,
- /obj/item/slime_extract,
/obj/item/onetankbomb,
/obj/item/transfer_valve))
@@ -201,7 +200,7 @@
use_power(750)
if(dotype != FAIL)
var/list/nodes = techweb_item_boost_check(process)
- var/picked = pickweight(nodes) //This should work.
+ var/picked = pick_weight(nodes) //This should work.
if(linked_console)
linked_console.stored_research.boost_with_path(SSresearch.techweb_node_by_id(picked), process.type)
updateUsrDialog()
@@ -293,7 +292,7 @@
else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
var/savedName = "[exp_on]"
ejectItem(TRUE)
- var/newPath = text2path(pickweight(valid_items))
+ var/newPath = text2path(pick_weight(valid_items))
loaded_item = new newPath(src)
visible_message("[src] malfunctions, transforming [savedName] into [loaded_item]!")
investigate_log("Experimentor has transformed [savedName] into [loaded_item]", INVESTIGATE_EXPERIMENTOR)
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index c60264ae0e98..8caeb2763e5d 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -123,35 +123,6 @@ Nothing else in the console has ID requirements.
return ..()
/obj/machinery/computer/rdconsole/attackby(obj/item/D, mob/user, params)
- if(istype(D, /obj/item/slime_extract))
- var/obj/item/slime_extract/E = D
- // [CELADON-EDIT] - CELADON_FIXES - Попытка починить абуз
- // if(!slime_already_researched[E.type]) // CELADON-EDIT - ORIGINAL
- if(!GLOB.slime_already_researched[E.type])
- // [/CELADON-EDIT]
- if(!E.research)
- playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 3, -1)
- visible_message("[src] buzzes and displays a message: Invalid extract! (You shouldn't be seeing this. If you are, tell someone.)")
- return
- if(E.Uses <= 0)
- playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 3, -1)
- visible_message("[src] buzzes and displays a message: Extract consumed - no research available.")
- return
- else
- playsound(src, 'sound/machines/ping.ogg', 50, 3, -1)
- visible_message("[user] inserts [E] into a slot on the [src]!", "You insert [E] into a slot on the [src], producting [E.research] points from the extract's chemical makeup!")
- stored_research.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = E.research))
- // [CELADON-EDIT] - CELADON_FIXES - Попытка починить абуз
- // slime_already_researched[E.type] = TRUE // CELADON-EDIT - ORIGINAL
- GLOB.slime_already_researched[E.type] = TRUE
- // [/CELADON-EDIT]
- qdel(D)
- return
- else
- visible_message("[src] buzzes and displays a message: Slime extract already researched!")
- playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 3, -1)
- return
-
if(istype(D, /obj/item/seeds))
var/obj/item/seeds/E = D
// [CELADON-EDIT] - CELADON_FIXES - Попытка починить абуз
@@ -668,10 +639,10 @@ Nothing else in the console has ID requirements.
RDSCREEN_UI_DDISK_CHECK
var/list/l = list()
l += "Disk Operations: Clear DiskUpload AllEject Disk"
- for(var/i in 1 to d_disk.max_blueprints)
+ for(var/i in d_disk.blueprints)
l += ""
- if(d_disk.blueprints[i])
- var/datum/design/D = d_disk.blueprints[i]
+ if(istype(i, /datum/design))
+ var/datum/design/D = i
l += "[D.icon_html(usr)] [D.name]"
l += "Operations: Upload to database Clear Slot"
else
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index d97b19070d57..86d6b4164bb5 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -13,7 +13,7 @@
// Cargo Stuff
"c-reader", "desttagger", "salestagger", "handlabel", "packagewrap",
// Research Stuff
- "destructive_analyzer", "experimentor", "rdconsole", "rdserver", "design_disk", "tech_disk", "mechfab",
+ "destructive_analyzer", "experimentor", "rdserver", "design_disk", "tech_disk", "mechfab",
// Miscellaneous Stufff
"paystand", "space_heater", "bucket", "plastic_knife", "plastic_fork", "plastic_spoon", "fax",
// Security Stuff
@@ -119,7 +119,7 @@
display_name = "Biological Processing"
description = "From slimes to kitchens."
prereq_ids = list("biotech")
- design_ids = list("smartfridge", "gibber", "deepfryer", "monkey_recycler", "processor", "gibber", "microwave", "reagentgrinder", "dish_drive")
+ design_ids = list("smartfridge", "gibber", "deepfryer", "processor", "gibber", "microwave", "reagentgrinder", "dish_drive")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -230,7 +230,7 @@
display_name = "Basic Bluespace Theory"
description = "Basic studies into the mysterious alternate dimension known as bluespace."
prereq_ids = list("base")
- design_ids = list("beacon", "xenobioconsole", "telesci_gps", "bluespace_crystal")
+ design_ids = list("beacon", "telesci_gps", "bluespace_crystal")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -367,9 +367,7 @@
display_name = "Artificial Intelligence"
description = "AI unit research."
prereq_ids = list("adv_robotics")
- design_ids = list("aifixer", "aicore", "safeguard_module", "onehuman_module", "protectstation_module", "quarantine_module", "oxygen_module", "freeform_module",
- "reset_module", "purge_module", "remove_module", "freeformcore_module", "asimov_module", "paladin_module", "tyrant_module", "overlord_module", "corporate_module",
- "default_module", "borg_ai_control", "mecha_tracking_ai_control", "aiupload", "intellicard")
+ design_ids = list("aifixer", "aicore", "reset_module", "purge_module", "remove_module", "borg_ai_control", "mecha_tracking_ai_control", "aiupload", "intellicard")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -594,7 +592,7 @@
id = "exp_tools"
display_name = "Experimental Tools"
description = "Highly advanced tools."
- design_ids = list("exwelder", "jawsoflife", "handdrill", "laserscalpel", "mechanicalpinches", "searingtool")
+ design_ids = list("jawsoflife", "handdrill", "laserscalpel", "mechanicalpinches", "searingtool")
prereq_ids = list("adv_engi")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -704,7 +702,7 @@
display_name = "Ballistic Weaponry"
description = "This isn't research.. This is reverse-engineering!"
prereq_ids = list("weaponry")
- design_ids = list("mag_oldsmg", "mag_oldsmg_ap", "mag_oldsmg_ic", "shotgun_slug")
+ design_ids = list("mag_oldsmg", "mag_oldsmg_ap", "shotgun_slug")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -725,7 +723,7 @@
display_name = "Exotic Ammunition"
description = "They won't know what hit em."
prereq_ids = list("adv_weaponry", "medical_weapons")
- design_ids = list("techshotshell", "c38_hotshot", "c38_iceblox", "inc9mm", "inc10mm", "inc45", "incendiary_slug")
+ design_ids = list("techshotshell", "c38_hotshot", "c38_iceblox", "incendiary_slug")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
diff --git a/code/modules/research/xenobiology/crossbreeding/__corecross.dm b/code/modules/research/xenobiology/crossbreeding/__corecross.dm
deleted file mode 100644
index e2cfe4b40871..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/__corecross.dm
+++ /dev/null
@@ -1,193 +0,0 @@
-//////////////////////////////////////////////
-////////// SLIME CROSSBREEDS //////////
-//////////////////////////////////////////////
-// A system of combining two extract types. //
-// Performed by feeding a slime 10 of an //
-// extract color. //
-//////////////////////////////////////////////
-/*==========================================*\
-To add a crossbreed:
- The file name is automatically selected
- by the crossbreeding effect, which uses
- the format slimecross/[modifier]/[color].
-
- If a crossbreed doesn't exist, don't
- worry. If no file is found at that
- location, it will simple display that
- the crossbreed was too unstable.
-
- As a result, do not feel the need to
- try to add all of the crossbred
- effects at once, if you're here and
- trying to make a new slime type. Just
- get your slimetype in the codebase and
- get around to the crossbreeds eventually!
-\*==========================================*/
-
-/obj/item/slimecross //The base type for crossbred extracts. Mostly here for posterity, and to set base case things.
- name = "crossbred slime extract"
- desc = "An extremely potent slime extract, formed through crossbreeding."
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "base"
- var/colour = "null"
- var/effect = "null"
- var/effect_desc = "null"
- force = 0
- w_class = WEIGHT_CLASS_TINY
- throwforce = 0
- throw_speed = 3
- throw_range = 6
-
-/obj/item/slimecross/examine(mob/user)
- . = ..()
- if(effect_desc)
- . += " [effect_desc]"
-
-/obj/item/slimecross/Initialize()
- . = ..()
- name = effect + " " + colour + " extract"
- var/itemcolor = "#FFFFFF"
- switch(colour)
- if("orange")
- itemcolor = "#FFA500"
- if("purple")
- itemcolor = "#B19CD9"
- if("blue")
- itemcolor = "#ADD8E6"
- if("metal")
- itemcolor = "#7E7E7E"
- if("yellow")
- itemcolor = "#FFFF00"
- if("dark purple")
- itemcolor = "#551A8B"
- if("dark blue")
- itemcolor = "#0000FF"
- if("silver")
- itemcolor = "#D3D3D3"
- if("bluespace")
- itemcolor = "#32CD32"
- if("sepia")
- itemcolor = "#704214"
- if("cerulean")
- itemcolor = "#2956B2"
- if("pyrite")
- itemcolor = "#FAFAD2"
- if("red")
- itemcolor = "#FF0000"
- if("green")
- itemcolor = "#00FF00"
- if("pink")
- itemcolor = "#FF69B4"
- if("gold")
- itemcolor = "#FFD700"
- if("oil")
- itemcolor = "#505050"
- if("black")
- itemcolor = "#000000"
- if("light pink")
- itemcolor = "#FFB6C1"
- if("adamantine")
- itemcolor = "#008B8B"
- add_atom_colour(itemcolor, FIXED_COLOUR_PRIORITY)
-
-/obj/item/slimecrossbeaker //To be used as a result for extract reactions that make chemicals.
- name = "result extract"
- desc = "You shouldn't see this."
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "base"
- var/del_on_empty = TRUE
- var/list/list_reagents
-
-/obj/item/slimecrossbeaker/Initialize()
- . = ..()
- create_reagents(50, INJECTABLE | DRAWABLE)
- if(list_reagents)
- for(var/reagent in list_reagents)
- reagents.add_reagent(reagent, list_reagents[reagent])
- if(del_on_empty)
- START_PROCESSING(SSobj,src)
-
-/obj/item/slimecrossbeaker/Destroy()
- STOP_PROCESSING(SSobj,src)
- return ..()
-
-/obj/item/slimecrossbeaker/process()
- if(!reagents.total_volume)
- visible_message(" [src] has been drained completely, and melts away.")
- qdel(src)
-
-/obj/item/slimecrossbeaker/bloodpack //Pack of 50u blood. Deletes on empty.
- name = "blood extract"
- desc = "A sphere of liquid blood, somehow managing to stay together."
- color = "#FF0000"
- list_reagents = list(/datum/reagent/blood = 50)
-
-/obj/item/slimecrossbeaker/pax //5u synthpax.
- name = "peace-inducing extract"
- desc = "A small blob of synthetic pax."
- color = "#FFCCCC"
- list_reagents = list(/datum/reagent/pax/peaceborg = 5)
-
-/obj/item/slimecrossbeaker/omnizine //15u omnizine.
- name = "healing extract"
- desc = "A gelatinous extract of pure omnizine."
- color = "#FF00FF"
- list_reagents = list(/datum/reagent/medicine/omnizine = 15)
-
-/obj/item/slimecrossbeaker/autoinjector //As with the above, but automatically injects whomever it is used on with contents.
- var/ignore_flags = FALSE
- var/self_use_only = FALSE
-
-/obj/item/slimecrossbeaker/autoinjector/Initialize()
- . = ..()
- reagents.flags = DRAWABLE // Cannot be refilled, since it's basically an autoinjector!
-
-/obj/item/slimecrossbeaker/autoinjector/attack(mob/living/M, mob/user)
- if(!reagents.total_volume)
- to_chat(user, " [src] is empty!")
- return
- if(!iscarbon(M))
- return
- if(self_use_only && M != user)
- to_chat(user, " This can only be used on yourself.")
- return
- if(reagents.total_volume && (ignore_flags || M.can_inject(user, 1)))
- reagents.trans_to(M, reagents.total_volume, transfered_by = user)
- if(user != M)
- to_chat(M, " [user] presses [src] against you!")
- to_chat(user, " You press [src] against [M], injecting [M.p_them()].")
- else
- to_chat(user, " You press [src] against yourself, and it flattens against you!")
- else
- to_chat(user, " There's no place to stick [src]!")
-
-/obj/item/slimecrossbeaker/autoinjector/regenpack
- ignore_flags = TRUE //It is, after all, intended to heal.
- name = "mending solution"
- desc = "A strange glob of sweet-smelling semifluid, which seems to stick to skin rather easily."
- color = "#FF00FF"
- list_reagents = list(/datum/reagent/medicine/regen_jelly = 20)
-
-/obj/item/slimecrossbeaker/autoinjector/slimejelly //Primarily for slimepeople, but you do you.
- self_use_only = TRUE
- ignore_flags = TRUE
- name = "slime jelly bubble"
- desc = "A sphere of slime jelly. It seems to stick to your skin, but avoids other surfaces."
- color = "#00FF00"
- list_reagents = list(/datum/reagent/toxin/slimejelly = 50)
-
-/obj/item/slimecrossbeaker/autoinjector/peaceandlove
- name = "peaceful distillation"
- desc = "A light pink gooey sphere. Simply touching it makes you a little dizzy."
- color = "#DDAAAA"
- list_reagents = list(/datum/reagent/pax/peaceborg = 10, /datum/reagent/drug/space_drugs = 15) //Peace, dudes
-
-/obj/item/slimecrossbeaker/autoinjector/peaceandlove/Initialize()
- . = ..()
- reagents.flags = NONE // It won't be *that* easy to get your hands on pax.
-
-/obj/item/slimecrossbeaker/autoinjector/slimestimulant
- name = "invigorating gel"
- desc = "A bubbling purple mixture, designed to heal and boost movement."
- color = "#FF00FF"
- list_reagents = list(/datum/reagent/medicine/regen_jelly = 30, /datum/reagent/drug/methamphetamine = 9)
diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm
deleted file mode 100644
index 3d466983f430..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Slimecrossing Armor
- Armor added by the slimecrossing system.
- Collected here for clarity.
-*/
-
-//Rebreather mask - Chilling Blue
-/obj/item/clothing/mask/nobreath
- name = "rebreather mask"
- desc = "A transparent mask, resembling a conventional breath mask, but made of bluish slime. Seems to lack any air supply tube, though."
- icon_state = "slime"
- item_state = "slime"
- body_parts_covered = NONE
- w_class = WEIGHT_CLASS_SMALL
- gas_transfer_coefficient = 0
- permeability_coefficient = 0.5
- flags_cover = MASKCOVERSMOUTH
- resistance_flags = NONE
-
-/obj/item/clothing/mask/nobreath/equipped(mob/living/carbon/human/user, slot)
- . = ..()
- if(slot == ITEM_SLOT_MASK)
- ADD_TRAIT(user, TRAIT_NOBREATH, "breathmask_[REF(src)]")
- user.failed_last_breath = FALSE
- user.clear_alert("not_enough_oxy")
- user.apply_status_effect(/datum/status_effect/rebreathing)
-
-/obj/item/clothing/mask/nobreath/dropped(mob/living/carbon/human/user)
- ..()
- REMOVE_TRAIT(user, TRAIT_NOBREATH, "breathmask_[REF(src)]")
- user.remove_status_effect(/datum/status_effect/rebreathing)
-
-/obj/item/clothing/head/peaceflower
- name = "heroine bud"
- desc = "An extremely addictive flower, full of peace magic."
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "peaceflower"
- item_state = "peaceflower"
- slot_flags = ITEM_SLOT_HEAD
- body_parts_covered = NONE
- force = 0
- throwforce = 0
- w_class = WEIGHT_CLASS_TINY
- throw_speed = 1
- throw_range = 3
-
-/obj/item/clothing/head/peaceflower/equipped(mob/living/carbon/human/user, slot)
- . = ..()
- if(slot == ITEM_SLOT_HEAD)
- ADD_TRAIT(user, TRAIT_PACIFISM, "peaceflower_[REF(src)]")
-
-/obj/item/clothing/head/peaceflower/dropped(mob/living/carbon/human/user)
- ..()
- REMOVE_TRAIT(user, TRAIT_PACIFISM, "peaceflower_[REF(src)]")
-
-/obj/item/clothing/head/peaceflower/attack_hand(mob/user)
- if(iscarbon(user))
- var/mob/living/carbon/C = user
- if(src == C.head)
- to_chat(user, " You feel at peace. Why would you want anything else?")
- return
- return ..()
-
-/obj/item/clothing/suit/armor/heavy/adamantine
- name = "adamantine armor"
- desc = "A full suit of adamantine plate armor. Impressively resistant to damage, but weighs about as much as you do."
- icon_state = "adamsuit"
- item_state = "adamsuit"
- flags_inv = NONE
- obj_flags = IMMUTABLE_SLOW
- slowdown = 4
- var/hit_reflect_chance = 40
-
-/obj/item/clothing/suit/armor/heavy/adamantine/IsReflect(def_zone)
- if(def_zone in list(BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) && prob(hit_reflect_chance))
- return TRUE
- else
- return FALSE
diff --git a/code/modules/research/xenobiology/crossbreeding/_misc.dm b/code/modules/research/xenobiology/crossbreeding/_misc.dm
deleted file mode 100644
index 2af2ecf64689..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/_misc.dm
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
-Slimecrossing Items
- General items added by the slimecrossing system.
- Collected here for clarity.
-*/
-
-//Rewind camera - I'm already Burning Sepia
-/obj/item/camera/rewind
- name = "sepia-tinted camera"
- desc = "They say a picture is like a moment stopped in time."
- pictures_left = 1
- pictures_max = 1
- can_customise = FALSE
- default_picture_name = "A nostalgic picture"
- var/used = FALSE
-
-/datum/saved_bodypart
- var/obj/item/bodypart/old_part
- var/bodypart_type
- var/brute_dam
- var/burn_dam
- var/stamina_dam
-
-/datum/saved_bodypart/New(obj/item/bodypart/part)
- old_part = part
- bodypart_type = part.type
- brute_dam = part.brute_dam
- burn_dam = part.burn_dam
- stamina_dam = part.stamina_dam
-
-/mob/living/carbon/proc/apply_saved_bodyparts(list/datum/saved_bodypart/parts)
- var/list/dont_chop = list()
- for(var/zone in parts)
- var/datum/saved_bodypart/saved_part = parts[zone]
- var/obj/item/bodypart/already = get_bodypart(zone)
- if(QDELETED(saved_part.old_part))
- saved_part.old_part = new saved_part.bodypart_type
- if(!already || already != saved_part.old_part)
- saved_part.old_part.replace_limb(src, TRUE)
- saved_part.old_part.heal_damage(INFINITY, INFINITY, INFINITY, null, FALSE)
- saved_part.old_part.receive_damage(saved_part.brute_dam, saved_part.burn_dam, saved_part.stamina_dam)
- dont_chop[zone] = TRUE
- for(var/obj/item/bodypart/BP as anything in bodyparts)
- if(dont_chop[BP.body_zone])
- continue
- BP.drop_limb(TRUE)
-
-/mob/living/carbon/proc/save_bodyparts()
- var/list/datum/saved_bodypart/ret = list()
- for(var/_part in bodyparts)
- var/obj/item/bodypart/part = _part
- var/datum/saved_bodypart/saved_part = new(part)
-
- ret[part.body_zone] = saved_part
- return ret
-
-/obj/item/camera/rewind/afterattack(atom/target, mob/user, flag)
- if(!on || !pictures_left || !isturf(target.loc))
- return
- if(!used)//selfie time
- if(user == target)
- to_chat(user, " You take a selfie!")
- else
- to_chat(user, " You take a photo with [target]!")
- to_chat(target, " [user] takes a photo with you!")
- to_chat(target, " You'll remember this moment forever!")
-
- used = TRUE
- target.AddComponent(/datum/component/dejavu, 2)
- .=..()
-
-/obj/item/camera/rewind/loot
- pictures_left = 5
- pictures_max = 5
-
-//Timefreeze camera - Old Burning Sepia result. Kept in case admins want to spawn it
-/obj/item/camera/timefreeze
- name = "sepia-tinted camera"
- desc = "They say a picture is like a moment stopped in time."
- pictures_left = 1
- pictures_max = 1
- var/used = FALSE
-
-/obj/item/camera/timefreeze/afterattack(atom/target, mob/user, flag)
- if(!on || !pictures_left || !isturf(target.loc))
- return
- if(!used) //refilling the film does not refill the timestop
- new /obj/effect/timestop(get_turf(target), 2, 50, list(user))
- used = TRUE
- desc = "This camera has seen better days."
- . = ..()
-
-
-//Hypercharged slime cell - Charged Yellow
-/obj/item/stock_parts/cell/high/slime/hypercharged
- name = "hypercharged slime core"
- desc = "A charged yellow slime extract, infused with even more plasma. It almost hurts to touch."
- rating = 7 //Roughly 1.5 times the original.
- maxcharge = 20000 //2 times the normal one.
- chargerate = 2250 //1.5 times the normal rate.
-
-//Barrier cube - Chilling Grey
-/obj/item/barriercube
- name = "barrier cube"
- desc = "A compressed cube of slime. When squeezed, it grows to massive size!"
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "barriercube"
- w_class = WEIGHT_CLASS_TINY
-
-/obj/item/barriercube/attack_self(mob/user)
- if(locate(/obj/structure/barricade/slime) in get_turf(loc))
- to_chat(user, " You can't fit more than one barrier in the same space!")
- return
- to_chat(user, " You squeeze [src].")
- var/obj/B = new /obj/structure/barricade/slime(get_turf(loc))
- B.visible_message(" [src] suddenly grows into a large, gelatinous barrier!")
- qdel(src)
-
-//Slime barricade - Chilling Grey
-/obj/structure/barricade/slime
- name = "gelatinous barrier"
- desc = "A huge chunk of grey slime. Bullets might get stuck in it."
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "slimebarrier"
- proj_pass_rate = 40
- max_integrity = 60
-
-//Melting Gel Wall - Chilling Metal
-/obj/effect/forcefield/slimewall
- name = "solidified gel"
- desc = "A mass of solidified slime gel - completely impenetrable, but it's melting away!"
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "slimebarrier_thick"
- CanAtmosPass = ATMOS_PASS_NO
- opacity = TRUE
- timeleft = 100
-
-//Rainbow barrier - Chilling Rainbow
-/obj/effect/forcefield/slimewall/rainbow
- name = "rainbow barrier"
- desc = "Despite others' urgings, you probably shouldn't taste this."
- icon_state = "rainbowbarrier"
-
-//Ration pack - Chilling Silver
-/obj/item/reagent_containers/food/snacks/rationpack
- name = "ration pack"
- desc = "A square bar that sadly looks like chocolate, packaged in a nondescript grey wrapper. Has saved soldiers' lives before - usually by stopping bullets."
- icon_state = "rationpack"
- bitesize = 3
- junkiness = 15
- filling_color = "#964B00"
- tastes = list("cardboard" = 3, "sadness" = 3)
- foodtype = null //Don't ask what went into them. You're better off not knowing.
- list_reagents = list(/datum/reagent/consumable/nutriment/stabilized = 10, /datum/reagent/consumable/nutriment = 2) //Won't make you fat. Will make you question your sanity.
-
-/obj/item/reagent_containers/food/snacks/rationpack/checkLiked(fraction, mob/M) //Nobody likes rationpacks. Nobody.
- if(last_check_time + 50 < world.time)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H.mind && !HAS_TRAIT(H, TRAIT_AGEUSIA))
- to_chat(H," That didn't taste very good...") //No disgust, though. It's just not good tasting.
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food)
- last_check_time = world.time
- return
- ..()
-
-//Ice stasis block - Chilling Dark Blue
-/obj/structure/ice_stasis
- name = "ice block"
- desc = "A massive block of ice. You can see something vaguely humanoid inside."
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "frozen"
- density = TRUE
- max_integrity = 100
- armor = list("melee" = 30, "bullet" = 50, "laser" = -50, "energy" = -50, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = -80, "acid" = 30)
-
-/obj/structure/ice_stasis/Initialize()
- . = ..()
- playsound(src, 'sound/magic/ethereal_exit.ogg', 50, TRUE)
-
-/obj/structure/ice_stasis/Destroy()
- for(var/atom/movable/M in contents)
- M.forceMove(loc)
- playsound(src, 'sound/effects/glassbr3.ogg', 50, TRUE)
- return ..()
-
-//Gold capture device - Chilling Gold
-/obj/item/capturedevice
- name = "gold capture device"
- desc = "Bluespace technology packed into a roughly egg-shaped device, used to store nonhuman creatures. Can't catch them all, though - it only fits one."
- w_class = WEIGHT_CLASS_SMALL
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "capturedevice"
-
-/obj/item/capturedevice/attack(mob/living/M, mob/user)
- if(length(contents))
- to_chat(user, " The device already has something inside.")
- return
- if(!isanimal(M))
- to_chat(user, " The capture device only works on simple creatures.")
- return
- if(M.mind)
- to_chat(user, " You offer the device to [M].")
- if(alert(M, "Would you like to enter [user]'s capture device?", "Gold Capture Device", "Yes", "No") == "Yes")
- if(user.canUseTopic(src, BE_CLOSE) && user.canUseTopic(M, BE_CLOSE))
- to_chat(user, " You store [M] in the capture device.")
- to_chat(M, " The world warps around you, and you're suddenly in an endless void, with a window to the outside floating in front of you.")
- store(M, user)
- else
- to_chat(user, " You were too far away from [M].")
- to_chat(M, " You were too far away from [user].")
- else
- to_chat(user, " [M] refused to enter the device.")
- return
- else
- if(istype(M, /mob/living/simple_animal/hostile) && !("neutral" in M.faction))
- to_chat(user, " This creature is too aggressive to capture.")
- return
- to_chat(user, " You store [M] in the capture device.")
- store(M)
-
-/obj/item/capturedevice/attack_self(mob/user)
- if(contents.len)
- to_chat(user, " You open the capture device!")
- release()
- else
- to_chat(user, " The device is empty...")
-
-/obj/item/capturedevice/proc/store(mob/living/M)
- M.forceMove(src)
-
-/obj/item/capturedevice/proc/release()
- for(var/atom/movable/M in contents)
- M.forceMove(get_turf(loc))
diff --git a/code/modules/research/xenobiology/crossbreeding/_mobs.dm b/code/modules/research/xenobiology/crossbreeding/_mobs.dm
deleted file mode 100644
index 0d155f2f90f7..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/_mobs.dm
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Slimecrossing Mobs
- Mobs and effects added by the slimecrossing system.
- Collected here for clarity.
-*/
-
-//Slime transformation power - Burning Black
-/obj/effect/proc_holder/spell/targeted/shapeshift/slimeform
- name = "Slime Transformation"
- desc = "Transform from a human to a slime, or back again!"
- action_icon_state = "transformslime"
- cooldown_min = 0
- charge_max = 0
- invocation_type = "none"
- shapeshift_type = /mob/living/simple_animal/slime/transformedslime
- convert_damage = TRUE
- convert_damage_type = CLONE
- var/remove_on_restore = FALSE
-
-/obj/effect/proc_holder/spell/targeted/shapeshift/slimeform/Restore(mob/living/M)
- if(remove_on_restore)
- if(M.mind)
- M.mind.RemoveSpell(src)
- ..()
-
-//Transformed slime - Burning Black
-/mob/living/simple_animal/slime/transformedslime
-
-/mob/living/simple_animal/slime/transformedslime/Reproduce() //Just in case.
- to_chat(src, " I can't reproduce...")
- return
-
-//Slime corgi - Chilling Pink
-/mob/living/simple_animal/pet/dog/corgi/puppy/slime
- name = "\improper slime corgi puppy"
- real_name = "slime corgi puppy"
- desc = "An unbearably cute pink slime corgi puppy."
- icon_state = "slime_puppy"
- icon_living = "slime_puppy"
- icon_dead = "slime_puppy_dead"
- nofur = TRUE
- gold_core_spawnable = NO_SPAWN
- speak_emote = list("blorbles", "bubbles", "borks")
- emote_hear = list("bubbles!", "splorts.", "splops!")
- emote_see = list("gets goop everywhere.", "flops.", "jiggles!")
diff --git a/code/modules/research/xenobiology/crossbreeding/_potions.dm b/code/modules/research/xenobiology/crossbreeding/_potions.dm
deleted file mode 100644
index fc9d9ef06c6a..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/_potions.dm
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-Slimecrossing Potions
- Potions added by the slimecrossing system.
- Collected here for clarity.
-*/
-
-//Extract cloner - Charged Grey
-/obj/item/slimepotion/extract_cloner
- name = "extract cloning potion"
- desc = "An more powerful version of the extract enhancer potion, capable of cloning regular slime extracts."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potpurple"
-
-/obj/item/slimepotion/extract_cloner/afterattack(obj/item/target, mob/user , proximity)
- if(!proximity)
- return
- if(istype(target, /obj/item/reagent_containers))
- return ..(target, user, proximity)
- if(istype(target, /obj/item/slimecross))
- to_chat(user, " [target] is too complex for the potion to clone!")
- return
- if(!istype(target, /obj/item/slime_extract))
- return
- var/obj/item/slime_extract/S = target
- if(S.recurring)
- to_chat(user, " [target] is too complex for the potion to clone!")
- return
- var/path = S.type
- var/obj/item/slime_extract/C = new path(get_turf(target))
- C.Uses = S.Uses
- to_chat(user, " You pour the potion onto [target], and the fluid solidifies into a copy of it!")
- qdel(src)
- return
-
-//Peace potion - Charged Light Pink
-/obj/item/slimepotion/peacepotion
- name = "pacification potion"
- desc = "A light pink solution of chemicals, smelling like liquid peace. And mercury salts."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potlightpink"
-
-/obj/item/slimepotion/peacepotion/attack(mob/living/M, mob/user)
- if(!isliving(M) || M.stat == DEAD)
- to_chat(user, " [src] only works on the living.")
- return ..()
- if(istype(M, /mob/living/simple_animal/hostile/megafauna))
- to_chat(user, " [src] does not work on beings of pure evil!")
- return ..()
- if(M != user)
- M.visible_message(" [user] starts to feed [M] [src]!",
- " [user] starts to feed you [src]!")
- else
- M.visible_message(" [user] starts to drink [src]!",
- " You start to drink [src]!")
-
- if(!do_after(user, 100, target = M))
- return
- if(M != user)
- to_chat(user, " You feed [M] [src]!")
- else
- to_chat(user, " You drink [src]!")
- if(isanimal(M))
- ADD_TRAIT(M, TRAIT_PACIFISM, MAGIC_TRAIT)
- else if(iscarbon(M))
- var/mob/living/carbon/C = M
- C.gain_trauma(/datum/brain_trauma/severe/pacifism, TRAUMA_RESILIENCE_SURGERY)
- qdel(src)
-
-//Love potion - Charged Pink
-/obj/item/slimepotion/lovepotion
- name = "love potion"
- desc = "A pink chemical mix thought to inspire feelings of love."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potpink"
-
-/obj/item/slimepotion/lovepotion/attack(mob/living/M, mob/user)
- if(!isliving(M) || M.stat == DEAD)
- to_chat(user, " The love potion only works on living things, sicko!")
- return ..()
- if(istype(M, /mob/living/simple_animal/hostile/megafauna))
- to_chat(user, " The love potion does not work on beings of pure evil!")
- return ..()
- if(user == M)
- to_chat(user, " You can't drink the love potion. What are you, a narcissist?")
- return ..()
- if(M.has_status_effect(STATUS_EFFECT_INLOVE))
- to_chat(user, " [M] is already lovestruck!")
- return ..()
-
- M.visible_message(" [user] starts to feed [M] a love potion!",
- " [user] starts to feed you a love potion!")
-
- if(!do_after(user, 50, target = M))
- return
- to_chat(user, " You feed [M] the love potion!")
- to_chat(M, " You develop feelings for [user], and anyone [user.p_they()] like.")
- if(M.mind)
- M.mind.store_memory("You are in love with [user].")
- M.faction |= "[REF(user)]"
- M.apply_status_effect(STATUS_EFFECT_INLOVE, user)
- qdel(src)
-
-//Pressure potion - Charged Dark Blue
-/obj/item/slimepotion/spaceproof
- name = "slime pressurization potion"
- desc = "A potent chemical sealant that will render any article of clothing airtight. Has two uses."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potblue"
- var/uses = 2
-
-/obj/item/slimepotion/spaceproof/afterattack(obj/item/clothing/C, mob/user, proximity)
- . = ..()
- if(!uses)
- qdel(src)
- return
- if(!proximity)
- return
- if(!istype(C))
- to_chat(user, " The potion can only be used on clothing!")
- return
- if(C.min_cold_protection_temperature == SPACE_SUIT_MIN_TEMP_PROTECT && C.clothing_flags & STOPSPRESSUREDAMAGE)
- to_chat(user, " The [C] is already pressure-resistant!")
- return ..()
- to_chat(user, " You slather the blue gunk over the [C], making it airtight.")
- C.name = "pressure-resistant [C.name]"
- C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
- C.add_atom_colour("#000080", FIXED_COLOUR_PRIORITY)
- C.min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
- C.cold_protection = C.body_parts_covered
- C.clothing_flags |= STOPSPRESSUREDAMAGE
- uses--
- if(!uses)
- qdel(src)
-
-//Enhancer potion - Charged Cerulean
-/obj/item/slimepotion/enhancer/max
- name = "extract maximizer"
- desc = "An extremely potent chemical mix that will maximize a slime extract's uses."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potpurple"
-
-//Lavaproofing potion - Charged Red
-/obj/item/slimepotion/lavaproof
- name = "slime lavaproofing potion"
- desc = "A strange, reddish goo said to repel lava as if it were water, without reducing flammability. Has two uses."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potred"
- resistance_flags = LAVA_PROOF | FIRE_PROOF
- var/uses = 2
-
-/obj/item/slimepotion/lavaproof/afterattack(obj/item/C, mob/user, proximity)
- . = ..()
- if(!uses)
- qdel(src)
- return ..()
- if(!proximity)
- return ..()
- if(!istype(C))
- to_chat(user, " You can't coat this with lavaproofing fluid!")
- return ..()
- to_chat(user, " You slather the red gunk over the [C], making it lavaproof.")
- C.name = "lavaproof [C.name]"
- C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
- C.add_atom_colour("#800000", FIXED_COLOUR_PRIORITY)
- C.resistance_flags |= LAVA_PROOF
- if (istype(C, /obj/item/clothing))
- var/obj/item/clothing/CL = C
- CL.clothing_flags |= LAVAPROTECT
- uses--
- if(!uses)
- qdel(src)
-
-//Revival potion - Charged Grey
-/obj/item/slimepotion/slime_reviver
- name = "slime revival potion"
- desc = "Infused with plasma and compressed gel, this brings dead slimes back to life."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potsilver"
-
-/obj/item/slimepotion/slime_reviver/attack(mob/living/simple_animal/slime/M, mob/user)
- if(!isslime(M))
- to_chat(user, " The potion only works on slimes!")
- return ..()
- if(M.stat != DEAD)
- to_chat(user, " The slime is still alive!")
- return
- if(M.maxHealth <= 0)
- to_chat(user, " The slime is too unstable to return!")
- M.revive(full_heal = TRUE, admin_revive = FALSE)
- M.set_stat(CONSCIOUS)
- M.visible_message(" [M] is filled with renewed vigor and blinks awake!")
- M.maxHealth -= 10 //Revival isn't healthy.
- M.health -= 10
- M.regenerate_icons()
- qdel(src)
-
-//Stabilizer potion - Charged Blue
-/obj/item/slimepotion/slime/chargedstabilizer
- name = "slime omnistabilizer"
- desc = "An extremely potent chemical mix that will stop a slime from mutating completely."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potcyan"
-
-/obj/item/slimepotion/slime/chargedstabilizer/attack(mob/living/simple_animal/slime/M, mob/user)
- if(!isslime(M))
- to_chat(user, " The stabilizer only works on slimes!")
- return ..()
- if(M.stat)
- to_chat(user, " The slime is dead!")
- return
- if(M.mutation_chance == 0)
- to_chat(user, " The slime already has no chance of mutating!")
- return
-
- to_chat(user, " You feed the slime the omnistabilizer. It will not mutate this cycle!")
- M.mutation_chance = 0
- qdel(src)
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
deleted file mode 100644
index 651eb2fece14..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ /dev/null
@@ -1,971 +0,0 @@
-/atom/movable/screen/alert/status_effect/rainbow_protection
- name = "Rainbow Protection"
- desc = "You are defended from harm, but so are those you might seek to injure!"
- icon_state = "slime_rainbowshield"
-
-/datum/status_effect/rainbow_protection
- id = "rainbow_protection"
- duration = 100
- alert_type = /atom/movable/screen/alert/status_effect/rainbow_protection
- var/originalcolor
-
-/datum/status_effect/rainbow_protection/on_apply()
- owner.status_flags |= GODMODE
- ADD_TRAIT(owner, TRAIT_PACIFISM, /datum/status_effect/rainbow_protection)
- owner.visible_message(" [owner] shines with a brilliant rainbow light.",
- " You feel protected by an unknown force!")
- originalcolor = owner.color
- return ..()
-
-/datum/status_effect/rainbow_protection/tick()
- owner.color = rgb(rand(0,255),rand(0,255),rand(0,255))
- return ..()
-
-/datum/status_effect/rainbow_protection/on_remove()
- owner.status_flags &= ~GODMODE
- owner.color = originalcolor
- REMOVE_TRAIT(owner, TRAIT_PACIFISM, /datum/status_effect/rainbow_protection)
- owner.visible_message(" [owner] stops glowing, the rainbow light fading away.",
- " You no longer feel protected...")
-
-/atom/movable/screen/alert/status_effect/slimeskin
- name = "Adamantine Slimeskin"
- desc = "You are covered in a thick, non-neutonian gel."
- icon_state = "slime_stoneskin"
-
-/datum/status_effect/slimeskin
- id = "slimeskin"
- duration = 300
- alert_type = /atom/movable/screen/alert/status_effect/slimeskin
- var/originalcolor
-
-/datum/status_effect/slimeskin/on_apply()
- originalcolor = owner.color
- owner.color = "#3070CC"
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- H.physiology.damage_resistance += 10
- owner.visible_message(" [owner] is suddenly covered in a strange, blue-ish gel!",
- " You are covered in a thick, rubbery gel.")
- return ..()
-
-/datum/status_effect/slimeskin/on_remove()
- owner.color = originalcolor
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- H.physiology.damage_resistance -= 10
- owner.visible_message(" [owner]'s gel coating liquefies and dissolves away.",
- " Your gel second-skin dissolves!")
-
-/datum/status_effect/slimerecall
- id = "slime_recall"
- duration = -1 //Will be removed by the extract.
- alert_type = null
- var/interrupted = FALSE
- var/mob/target
- var/icon/bluespace
-
-/datum/status_effect/slimerecall/on_apply()
- RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(resistField))
- to_chat(owner, " You feel a sudden tug from an unknown force, and feel a pull to bluespace!")
- to_chat(owner, " Resist if you wish avoid the force!")
- bluespace = icon('icons/effects/effects.dmi',"chronofield")
- owner.add_overlay(bluespace)
- return ..()
-
-/datum/status_effect/slimerecall/proc/resistField()
- interrupted = TRUE
- owner.remove_status_effect(src)
-/datum/status_effect/slimerecall/on_remove()
- UnregisterSignal(owner, COMSIG_LIVING_RESIST)
- owner.cut_overlay(bluespace)
- if(interrupted || !ismob(target))
- to_chat(owner, " The bluespace tug fades away, and you feel that the force has passed you by.")
- return
- owner.visible_message(" [owner] disappears in a flurry of sparks!",
- " The unknown force snatches briefly you from reality, and deposits you next to [target]!")
- do_sparks(3, TRUE, owner)
- owner.forceMove(target.loc)
-
-/atom/movable/screen/alert/status_effect/freon/stasis
- desc = "You're frozen inside of a protective ice cube! While inside, you can't do anything, but are immune to harm! Resist to get out."
-
-/datum/status_effect/frozenstasis
- id = "slime_frozen"
- status_type = STATUS_EFFECT_UNIQUE
- duration = -1 //Will remove self when block breaks.
- alert_type = /atom/movable/screen/alert/status_effect/freon/stasis
- var/obj/structure/ice_stasis/cube
-
-/datum/status_effect/frozenstasis/on_apply()
- RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(breakCube))
- cube = new /obj/structure/ice_stasis(get_turf(owner))
- owner.forceMove(cube)
- owner.status_flags |= GODMODE
- return ..()
-
-/datum/status_effect/frozenstasis/tick()
- if(!cube || owner.loc != cube)
- owner.remove_status_effect(src)
-
-/datum/status_effect/frozenstasis/proc/breakCube()
- owner.remove_status_effect(src)
-
-/datum/status_effect/frozenstasis/on_remove()
- if(cube)
- qdel(cube)
- owner.status_flags &= ~GODMODE
- UnregisterSignal(owner, COMSIG_LIVING_RESIST)
-
-/datum/status_effect/slime_clone
- id = "slime_cloned"
- status_type = STATUS_EFFECT_UNIQUE
- duration = -1
- alert_type = null
- var/mob/living/clone
- var/datum/mind/originalmind //For when the clone gibs.
-
-/datum/status_effect/slime_clone/on_apply()
- var/typepath = owner.type
- clone = new typepath(owner.loc)
- var/mob/living/carbon/O = owner
- var/mob/living/carbon/C = clone
- if(istype(C) && istype(O))
- C.real_name = O.real_name
- O.dna.transfer_identity(C)
- C.updateappearance(mutcolor_update=1)
- if(owner.mind)
- originalmind = owner.mind
- owner.mind.transfer_to(clone)
- clone.apply_status_effect(/datum/status_effect/slime_clone_decay)
- return ..()
-
-/datum/status_effect/slime_clone/tick()
- if(!istype(clone) || clone.stat != CONSCIOUS)
- owner.remove_status_effect(src)
-
-/datum/status_effect/slime_clone/on_remove()
- if(clone && clone.mind && owner)
- clone.mind.transfer_to(owner)
- else
- if(owner && originalmind)
- originalmind.transfer_to(owner)
- if(originalmind.key)
- owner.ckey = originalmind.key
- if(clone)
- clone.unequip_everything()
- qdel(clone)
-
-/atom/movable/screen/alert/status_effect/clone_decay
- name = "Clone Decay"
- desc = "You are simply a construct, and cannot maintain this form forever. You will be returned to your original body if you should fall."
- icon_state = "slime_clonedecay"
-
-/datum/status_effect/slime_clone_decay
- id = "slime_clonedecay"
- status_type = STATUS_EFFECT_UNIQUE
- duration = -1
- alert_type = /atom/movable/screen/alert/status_effect/clone_decay
-
-/datum/status_effect/slime_clone_decay/tick()
- owner.adjustToxLoss(1, 0)
- owner.adjustOxyLoss(1, 0)
- owner.adjustBruteLoss(1, 0)
- owner.adjustFireLoss(1, 0)
- owner.color = "#007BA7"
-
-/atom/movable/screen/alert/status_effect/bloodchill
- name = "Bloodchilled"
- desc = "You feel a shiver down your spine after getting hit with a glob of cold blood. You'll move slower and get frostbite for a while!"
- icon_state = "bloodchill"
-
-/datum/status_effect/bloodchill
- id = "bloodchill"
- duration = 100
- alert_type = /atom/movable/screen/alert/status_effect/bloodchill
-
-/datum/status_effect/bloodchill/on_apply()
- owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/bloodchill)
- return ..()
-
-/datum/status_effect/bloodchill/tick()
- if(prob(50))
- owner.adjustFireLoss(2)
-
-/datum/status_effect/bloodchill/on_remove()
- owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/bloodchill)
-
-/datum/status_effect/bonechill
- id = "bonechill"
- duration = 80
- alert_type = /atom/movable/screen/alert/status_effect/bonechill
-
-/datum/status_effect/bonechill/on_apply()
- owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/bonechill)
- return ..()
-
-/datum/status_effect/bonechill/tick()
- if(prob(50))
- owner.adjustFireLoss(1)
- owner.Jitter(3)
- owner.adjust_bodytemperature(-10)
-
-/datum/status_effect/bonechill/on_remove()
- owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/bonechill)
-/atom/movable/screen/alert/status_effect/bonechill
- name = "Bonechilled"
- desc = "You feel a shiver down your spine after hearing the haunting noise of bone rattling. You'll move slower and get frostbite for a while!"
- icon_state = "bloodchill"
-
-/datum/status_effect/rebreathing
- id = "rebreathing"
- duration = -1
- alert_type = null
-
-/datum/status_effect/rebreathing/tick()
- owner.adjustOxyLoss(-6, 0) //Just a bit more than normal breathing.
-
-///////////////////////////////////////////////////////
-//////////////////CONSUMING EXTRACTS///////////////////
-///////////////////////////////////////////////////////
-
-/datum/status_effect/firecookie
- id = "firecookie"
- status_type = STATUS_EFFECT_REPLACE
- alert_type = null
- duration = 100
-
-/datum/status_effect/firecookie/on_apply()
- ADD_TRAIT(owner, TRAIT_RESISTCOLD,"firecookie")
- owner.adjust_bodytemperature(110)
- return ..()
-
-/datum/status_effect/firecookie/on_remove()
- REMOVE_TRAIT(owner, TRAIT_RESISTCOLD,"firecookie")
-
-/datum/status_effect/watercookie
- id = "watercookie"
- status_type = STATUS_EFFECT_REPLACE
- alert_type = null
- duration = 100
-
-/datum/status_effect/watercookie/on_apply()
- ADD_TRAIT(owner, TRAIT_NOSLIPWATER,"watercookie")
- return ..()
-
-/datum/status_effect/watercookie/tick()
- for(var/turf/open/T in range(get_turf(owner),1))
- T.MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = 5)
-
-/datum/status_effect/watercookie/on_remove()
- REMOVE_TRAIT(owner, TRAIT_NOSLIPWATER,"watercookie")
-
-/datum/status_effect/metalcookie
- id = "metalcookie"
- status_type = STATUS_EFFECT_REPLACE
- alert_type = null
- duration = 100
-
-/datum/status_effect/metalcookie/on_apply()
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- H.physiology.brute_mod *= 0.9
- return ..()
-
-/datum/status_effect/metalcookie/on_remove()
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- H.physiology.brute_mod /= 0.9
-
-/datum/status_effect/sparkcookie
- id = "sparkcookie"
- status_type = STATUS_EFFECT_REPLACE
- alert_type = null
- duration = 300
- var/original_coeff
-
-/datum/status_effect/sparkcookie/on_apply()
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- original_coeff = H.physiology.siemens_coeff
- H.physiology.siemens_coeff = 0
- return ..()
-
-/datum/status_effect/sparkcookie/on_remove()
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- H.physiology.siemens_coeff = original_coeff
-
-/datum/status_effect/toxincookie
- id = "toxincookie"
- status_type = STATUS_EFFECT_REPLACE
- alert_type = null
- duration = 600
-
-/datum/status_effect/toxincookie/on_apply()
- ADD_TRAIT(owner, TRAIT_TOXINLOVER,"toxincookie")
- return ..()
-
-/datum/status_effect/toxincookie/on_remove()
- REMOVE_TRAIT(owner, TRAIT_TOXINLOVER,"toxincookie")
-
-/datum/status_effect/timecookie
- id = "timecookie"
- status_type = STATUS_EFFECT_REPLACE
- alert_type = null
- duration = 600
-
-/datum/status_effect/timecookie/on_apply()
- if(ishuman(owner))
- var/mob/living/carbon/human/H
- H.physiology.do_after_speed *= 0.95
- return ..()
-
-/datum/status_effect/timecookie/on_remove()
- if(ishuman(owner))
- var/mob/living/carbon/human/H
- H.physiology.do_after_speed /= 0.95
-
-/datum/status_effect/lovecookie
- id = "lovecookie"
- status_type = STATUS_EFFECT_REPLACE
- alert_type = null
- duration = 300
-
-/datum/status_effect/lovecookie/tick()
- if(owner.stat != CONSCIOUS)
- return
- if(iscarbon(owner))
- var/mob/living/carbon/C = owner
- if(C.handcuffed)
- return
- var/list/huggables = list()
- for(var/mob/living/carbon/L in range(get_turf(owner),1))
- if(L != owner)
- huggables += L
- if(length(huggables))
- var/mob/living/carbon/hugged = pick(huggables)
- owner.visible_message(" [owner] hugs [hugged]!", " You hug [hugged]!")
-
-/datum/status_effect/tarcookie
- id = "tarcookie"
- status_type = STATUS_EFFECT_REPLACE
- alert_type = null
- duration = 100
-
-/datum/status_effect/tarcookie/tick()
- for(var/mob/living/carbon/human/L in range(get_turf(owner),1))
- if(L != owner)
- L.apply_status_effect(/datum/status_effect/tarfoot)
-
-/datum/status_effect/tarfoot
- id = "tarfoot"
- status_type = STATUS_EFFECT_REPLACE
- alert_type = null
- duration = 30
-
-/datum/status_effect/tarfoot/on_apply()
- owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/tarfoot)
- return ..()
-
-/datum/status_effect/tarfoot/on_remove()
- owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/tarfoot)
-
-/datum/status_effect/spookcookie
- id = "spookcookie"
- status_type = STATUS_EFFECT_REPLACE
- alert_type = null
- duration = 300
-
-/datum/status_effect/spookcookie/on_apply()
- var/image/I = image(icon = 'icons/mob/simple_human.dmi', icon_state = "skeleton", layer = ABOVE_MOB_LAYER, loc = owner)
- I.override = 1
- owner.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/everyone, "spookyscary", I)
- return ..()
-
-/datum/status_effect/spookcookie/on_remove()
- owner.remove_alt_appearance("spookyscary")
-
-/datum/status_effect/peacecookie
- id = "peacecookie"
- status_type = STATUS_EFFECT_REPLACE
- alert_type = null
- duration = 100
-
-/datum/status_effect/peacecookie/tick()
- for(var/mob/living/L in range(get_turf(owner),1))
- L.apply_status_effect(/datum/status_effect/plur)
-
-/datum/status_effect/plur
- id = "plur"
- status_type = STATUS_EFFECT_REPLACE
- alert_type = null
- duration = 30
-
-/datum/status_effect/plur/on_apply()
- ADD_TRAIT(owner, TRAIT_PACIFISM, "peacecookie")
- return ..()
-
-/datum/status_effect/plur/on_remove()
- REMOVE_TRAIT(owner, TRAIT_PACIFISM, "peacecookie")
-
-/datum/status_effect/adamantinecookie
- id = "adamantinecookie"
- status_type = STATUS_EFFECT_REPLACE
- alert_type = null
- duration = 100
-
-/datum/status_effect/adamantinecookie/on_apply()
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- H.physiology.burn_mod *= 0.9
- return ..()
-
-/datum/status_effect/adamantinecookie/on_remove()
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- H.physiology.burn_mod /= 0.9
-
-///////////////////////////////////////////////////////
-//////////////////STABILIZED EXTRACTS//////////////////
-///////////////////////////////////////////////////////
-
-/datum/status_effect/stabilized //The base stabilized extract effect, has no effect of its' own.
- id = "stabilizedbase"
- duration = -1
- alert_type = null
- var/obj/item/slimecross/stabilized/linked_extract
- var/colour = "null"
-
-/datum/status_effect/stabilized/tick()
- if(!linked_extract || !linked_extract.loc) //Sanity checking
- qdel(src)
- return
- if(linked_extract && linked_extract.loc != owner && linked_extract.loc.loc != owner)
- linked_extract.linked_effect = null
- if(!QDELETED(linked_extract))
- linked_extract.owner = null
- START_PROCESSING(SSobj,linked_extract)
- qdel(src)
- return ..()
-
-/datum/status_effect/stabilized/null //This shouldn't ever happen, but just in case.
- id = "stabilizednull"
-
-
-//Stabilized effects start below.
-/datum/status_effect/stabilized/grey
- id = "stabilizedgrey"
- colour = "grey"
-
-/datum/status_effect/stabilized/grey/tick()
- for(var/mob/living/simple_animal/slime/S in range(1, get_turf(owner)))
- if(!(owner in S.Friends))
- to_chat(owner, " [linked_extract] pulses gently as it communicates with [S].")
- S.set_friendship(owner, 1)
- return ..()
-
-/datum/status_effect/stabilized/orange
- id = "stabilizedorange"
- colour = "orange"
-
-/datum/status_effect/stabilized/orange/tick()
- var/body_temperature_difference = owner.get_body_temp_normal(apply_change=FALSE) - owner.bodytemperature
- owner.adjust_bodytemperature(min(5,body_temperature_difference))
- return ..()
-
-/datum/status_effect/stabilized/purple
- id = "stabilizedpurple"
- colour = "purple"
-
-/datum/status_effect/stabilized/purple/tick()
- var/is_healing = FALSE
- if(owner.getBruteLoss() > 0)
- owner.adjustBruteLoss(-0.2)
- is_healing = TRUE
- if(owner.getFireLoss() > 0)
- owner.adjustFireLoss(-0.2)
- is_healing = TRUE
- if(owner.getToxLoss() > 0)
- owner.adjustToxLoss(-0.2, forced = TRUE) //Slimepeople should also get healed.
- is_healing = TRUE
- if(is_healing)
- examine_text = " SUBJECTPRONOUN is regenerating slowly, purplish goo filling in small injuries!"
- new /obj/effect/temp_visual/heal(get_turf(owner), "#FF0000")
- else
- examine_text = null
- ..()
-
-/datum/status_effect/stabilized/blue
- id = "stabilizedblue"
- colour = "blue"
-
-/datum/status_effect/stabilized/blue/on_apply()
- ADD_TRAIT(owner, TRAIT_NOSLIPWATER, "slimestatus")
- return ..()
-
-/datum/status_effect/stabilized/blue/on_remove()
- REMOVE_TRAIT(owner, TRAIT_NOSLIPWATER, "slimestatus")
-
-/datum/status_effect/stabilized/metal
- id = "stabilizedmetal"
- colour = "metal"
- var/cooldown = 30
- var/max_cooldown = 30
-
-/datum/status_effect/stabilized/metal/tick()
- if(cooldown > 0)
- cooldown--
- else
- cooldown = max_cooldown
- var/list/sheets = list()
- for(var/obj/item/stack/sheet/S in owner.GetAllContents())
- if(S.amount < S.max_amount)
- sheets += S
-
- if(sheets.len > 0)
- var/obj/item/stack/sheet/S = pick(sheets)
- S.amount++
- to_chat(owner, " [linked_extract] adds a layer of slime to [S], which metamorphosizes into another sheet of material!")
- return ..()
-
-
-/datum/status_effect/stabilized/yellow
- id = "stabilizedyellow"
- colour = "yellow"
- var/cooldown = 10
- var/max_cooldown = 10
- examine_text = " Nearby electronics seem just a little more charged wherever SUBJECTPRONOUN goes."
-
-/datum/status_effect/stabilized/yellow/tick()
- if(cooldown > 0)
- cooldown--
- return ..()
- cooldown = max_cooldown
- var/list/batteries = list()
- for(var/obj/item/stock_parts/cell/C in owner.GetAllContents())
- if(C.charge < C.maxcharge)
- batteries += C
- if(batteries.len)
- var/obj/item/stock_parts/cell/ToCharge = pick(batteries)
- ToCharge.charge += min(ToCharge.maxcharge - ToCharge.charge, ToCharge.maxcharge/10) //10% of the cell, or to maximum.
- to_chat(owner, " [linked_extract] discharges some energy into a device you have.")
- return ..()
-
-/obj/item/hothands
- name = "burning fingertips"
- desc = "You shouldn't see this."
-
-/obj/item/hothands/get_temperature()
- return 290 //Below what's required to ignite plasma.
-
-/datum/status_effect/stabilized/darkpurple
- id = "stabilizeddarkpurple"
- colour = "dark purple"
- var/obj/item/hothands/fire
- examine_text = " Their fingertips burn brightly!"
-
-/datum/status_effect/stabilized/darkpurple/on_apply()
- ADD_TRAIT(owner, TRAIT_RESISTHEATHANDS, "slimestatus")
- fire = new(owner)
- return ..()
-
-/datum/status_effect/stabilized/darkpurple/tick()
- var/obj/item/I = owner.get_active_held_item()
- var/obj/item/reagent_containers/food/snacks/F = I
- if(istype(F))
- if(F.cooked_type)
- to_chat(owner, " [linked_extract] flares up brightly, and your hands alone are enough cook [F]!")
- var/obj/item/result = F.microwave_act()
- if(istype(result))
- owner.put_in_hands(result)
- else
- I.attackby(fire, owner)
- return ..()
-
-/datum/status_effect/stabilized/darkpurple/on_remove()
- REMOVE_TRAIT(owner, TRAIT_RESISTHEATHANDS, "slimestatus")
- qdel(fire)
-
-/datum/status_effect/stabilized/darkblue
- id = "stabilizeddarkblue"
- colour = "dark blue"
-
-/datum/status_effect/stabilized/darkblue/tick()
- if(owner.fire_stacks > 0 && prob(80))
- owner.fire_stacks--
- if(owner.fire_stacks <= 0)
- to_chat(owner, " [linked_extract] coats you in a watery goo, extinguishing the flames.")
- var/obj/O = owner.get_active_held_item()
- if(O)
- O.extinguish() //All shamelessly copied from water's expose_obj, since I didn't seem to be able to get it here for some reason.
- O.acid_level = 0
- // Monkey cube
- if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
- to_chat(owner, " [linked_extract] kept your hands wet! It makes [O] expand!")
- var/obj/item/reagent_containers/food/snacks/monkeycube/cube = O
- cube.Expand()
-
- // Dehydrated carp
- else if(istype(O, /obj/item/toy/plush/carpplushie/dehy_carp))
- to_chat(owner, " [linked_extract] kept your hands wet! It makes [O] expand!")
- var/obj/item/toy/plush/carpplushie/dehy_carp/dehy = O
- dehy.Swell() // Makes a carp
-
- else if(istype(O, /obj/item/stack/sheet/hairlesshide))
- to_chat(owner, " [linked_extract] kept your hands wet! It wets [O]!")
- var/obj/item/stack/sheet/hairlesshide/HH = O
- new /obj/item/stack/sheet/wethide(get_turf(HH), HH.amount)
- qdel(HH)
- ..()
-
-/datum/status_effect/stabilized/silver
- id = "stabilizedsilver"
- colour = "silver"
-
-/datum/status_effect/stabilized/silver/on_apply()
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- H.physiology.hunger_mod *= 0.8 //20% buff
- return ..()
-
-/datum/status_effect/stabilized/silver/on_remove()
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- H.physiology.hunger_mod /= 0.8
-
-//Bluespace has an icon because it's kinda active.
-/atom/movable/screen/alert/status_effect/bluespaceslime
- name = "Stabilized Bluespace Extract"
- desc = "You shouldn't see this, since we set it to change automatically!"
- icon_state = "slime_bluespace_on"
-
-/datum/status_effect/bluespacestabilization
- id = "stabilizedbluespacecooldown"
- duration = 1200
- alert_type = null
-
-/datum/status_effect/stabilized/bluespace
- id = "stabilizedbluespace"
- colour = "bluespace"
- alert_type = /atom/movable/screen/alert/status_effect/bluespaceslime
- var/healthcheck
-
-/datum/status_effect/stabilized/bluespace/tick()
- if(owner.has_status_effect(/datum/status_effect/bluespacestabilization))
- linked_alert.desc = "The stabilized bluespace extract is still aligning you with the bluespace axis."
- linked_alert.icon_state = "slime_bluespace_off"
- return ..()
- else
- linked_alert.desc = "The stabilized bluespace extract will try to redirect you from harm!"
- linked_alert.icon_state = "slime_bluespace_on"
-
- if(healthcheck && (healthcheck - owner.health) > 5)
- owner.visible_message(" [linked_extract] notices the sudden change in [owner]'s physical health, and activates!")
- do_sparks(5,FALSE,owner)
- var/F = find_safe_turf(zlevels = owner.z, extended_safety_checks = TRUE)
- var/range = 0
- if(!F)
- F = get_turf(owner)
- range = 50
- if(do_teleport(owner, F, range, channel = TELEPORT_CHANNEL_BLUESPACE))
- to_chat(owner, " [linked_extract] will take some time to re-align you on the bluespace axis.")
- do_sparks(5,FALSE,owner)
- owner.apply_status_effect(/datum/status_effect/bluespacestabilization)
- healthcheck = owner.health
- return ..()
-
-/datum/status_effect/stabilized/sepia
- id = "stabilizedsepia"
- colour = "sepia"
- var/mod = 0
-
-/datum/status_effect/stabilized/sepia/tick()
- if(prob(50) && mod > -1)
- mod--
- owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/status_effect/sepia, multiplicative_slowdown = -0.5)
- else if(mod < 1)
- mod++
- // yeah a value of 0 does nothing but replacing the trait in place is cheaper than removing and adding repeatedly
- owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/status_effect/sepia, multiplicative_slowdown = 0)
- return ..()
-
-/datum/status_effect/stabilized/sepia/on_remove()
- owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/sepia)
-
-/datum/status_effect/stabilized/cerulean
- id = "stabilizedcerulean"
- colour = "cerulean"
- var/mob/living/clone
-
-/datum/status_effect/stabilized/cerulean/on_apply()
- var/typepath = owner.type
- clone = new typepath(owner.loc)
- var/mob/living/carbon/O = owner
- var/mob/living/carbon/C = clone
- if(istype(C) && istype(O))
- C.real_name = O.real_name
- O.dna.transfer_identity(C)
- C.updateappearance(mutcolor_update=1)
- return ..()
-
-/datum/status_effect/stabilized/cerulean/tick()
- if(owner.stat == DEAD)
- if(clone && clone.stat != DEAD)
- owner.visible_message(" [owner] blazes with brilliant light, [linked_extract] whisking [owner.p_their()] soul away.",
- " You feel a warm glow from [linked_extract], and you open your eyes... elsewhere.")
- if(owner.mind)
- owner.mind.transfer_to(clone)
- clone = null
- qdel(linked_extract)
- if(!clone || clone.stat == DEAD)
- to_chat(owner, " [linked_extract] desperately tries to move your soul to a living body, but can't find one!")
- qdel(linked_extract)
- ..()
-
-/datum/status_effect/stabilized/cerulean/on_remove()
- if(clone)
- clone.visible_message(" [clone] dissolves into a puddle of goo!")
- clone.unequip_everything()
- qdel(clone)
-
-/datum/status_effect/stabilized/pyrite
- id = "stabilizedpyrite"
- colour = "pyrite"
- var/originalcolor
-
-/datum/status_effect/stabilized/pyrite/on_apply()
- originalcolor = owner.color
- return ..()
-
-/datum/status_effect/stabilized/pyrite/tick()
- owner.color = rgb(rand(0,255),rand(0,255),rand(0,255))
- return ..()
-
-/datum/status_effect/stabilized/pyrite/on_remove()
- owner.color = originalcolor
-
-/datum/status_effect/stabilized/red
- id = "stabilizedred"
- colour = "red"
-
-/datum/status_effect/stabilized/red/on_apply()
- . = ..()
- owner.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/equipment_speedmod)
-
-/datum/status_effect/stabilized/red/on_remove()
- owner.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/equipment_speedmod)
- return ..()
-
-/datum/status_effect/stabilized/green
- id = "stabilizedgreen"
- colour = "green"
- var/datum/dna/originalDNA
- var/originalname
-
-/datum/status_effect/stabilized/green/on_apply()
- to_chat(owner, " You feel different...")
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- originalDNA = new H.dna.type
- originalname = H.real_name
- H.dna.copy_dna(originalDNA)
- randomize_human(H)
- return ..()
-
-/datum/status_effect/stabilized/green/tick() //Only occasionally give examiners a warning.
- if(prob(50))
- examine_text = " SUBJECTPRONOUN looks a bit green and gooey..."
- else
- examine_text = null
- return ..()
-
-/datum/status_effect/stabilized/green/on_remove()
- to_chat(owner, " You feel more like yourself.")
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- originalDNA.transfer_identity(H)
- H.real_name = originalname
- H.updateappearance(mutcolor_update=1)
-
-/datum/status_effect/brokenpeace
- id = "brokenpeace"
- duration = 1200
- alert_type = null
-
-/datum/status_effect/pinkdamagetracker
- id = "pinkdamagetracker"
- duration = -1
- alert_type = null
- var/damage = 0
- var/lasthealth
-
-/datum/status_effect/pinkdamagetracker/tick()
- if((lasthealth - owner.health) > 0)
- damage += (lasthealth - owner.health)
- lasthealth = owner.health
-
-/datum/status_effect/stabilized/pink
- id = "stabilizedpink"
- colour = "pink"
- var/list/mobs = list()
- var/faction_name
-
-/datum/status_effect/stabilized/pink/on_apply()
- faction_name = owner.real_name
- return ..()
-
-/datum/status_effect/stabilized/pink/tick()
- for(var/mob/living/simple_animal/M in view(7,get_turf(owner)))
- if(!(M in mobs))
- mobs += M
- M.apply_status_effect(/datum/status_effect/pinkdamagetracker)
- M.faction |= faction_name
- for(var/mob/living/simple_animal/M in mobs)
- if(!(M in view(7,get_turf(owner))))
- M.faction -= faction_name
- M.remove_status_effect(/datum/status_effect/pinkdamagetracker)
- mobs -= M
- var/datum/status_effect/pinkdamagetracker/C = M.has_status_effect(/datum/status_effect/pinkdamagetracker)
- if(istype(C) && C.damage > 0)
- C.damage = 0
- owner.apply_status_effect(/datum/status_effect/brokenpeace)
- var/HasFaction = FALSE
- for(var/i in owner.faction)
- if(i == faction_name)
- HasFaction = TRUE
-
- if(HasFaction && owner.has_status_effect(/datum/status_effect/brokenpeace))
- owner.faction -= faction_name
- to_chat(owner, " The peace has been broken! Hostile creatures will now react to you!")
- if(!HasFaction && !owner.has_status_effect(/datum/status_effect/brokenpeace))
- to_chat(owner, " [linked_extract] pulses, generating a fragile aura of peace.")
- owner.faction |= faction_name
- return ..()
-
-/datum/status_effect/stabilized/pink/on_remove()
- for(var/mob/living/simple_animal/M in mobs)
- M.faction -= faction_name
- M.remove_status_effect(/datum/status_effect/pinkdamagetracker)
- for(var/i in owner.faction)
- if(i == faction_name)
- owner.faction -= faction_name
-
-/datum/status_effect/stabilized/oil
- id = "stabilizedoil"
- colour = "oil"
- examine_text = " SUBJECTPRONOUN smells of sulfer and oil!"
-
-/datum/status_effect/stabilized/oil/tick()
- if(owner.stat == DEAD)
- explosion(get_turf(owner),1,2,4,flame_range = 5)
- return ..()
-
-/datum/status_effect/stabilized/black
- id = "stabilizedblack"
- colour = "black"
- var/messagedelivered = FALSE
- var/heal_amount = 1
-
-/datum/status_effect/stabilized/black/tick()
- if(owner.pulling && isliving(owner.pulling) && owner.grab_state == GRAB_KILL)
- var/mob/living/M = owner.pulling
- if(M.stat == DEAD)
- return
- if(!messagedelivered)
- to_chat(owner," You feel your hands melt around [M]'s neck and start to drain [M.p_them()] of life.")
- to_chat(owner.pulling, " [owner]'s hands melt around your neck, and you can feel your life starting to drain away!")
- messagedelivered = TRUE
- examine_text = " SUBJECTPRONOUN is draining health from [owner.pulling]!"
- var/list/healing_types = list()
- if(owner.getBruteLoss() > 0)
- healing_types += BRUTE
- if(owner.getFireLoss() > 0)
- healing_types += BURN
- if(owner.getToxLoss() > 0)
- healing_types += TOX
- if(owner.getCloneLoss() > 0)
- healing_types += CLONE
-
- owner.apply_damage_type(-heal_amount, damagetype=pick(healing_types))
- owner.adjust_nutrition(3)
- M.adjustCloneLoss(heal_amount * 1.2) //This way, two people can't just convert each other's damage away.
- else
- messagedelivered = FALSE
- examine_text = null
- return ..()
-
-/datum/status_effect/stabilized/lightpink
- id = "stabilizedlightpink"
- colour = "light pink"
-
-/datum/status_effect/stabilized/lightpink/on_apply()
- owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/lightpink)
- return ..()
-
-/datum/status_effect/stabilized/lightpink/tick()
- for(var/mob/living/carbon/human/H in range(1, get_turf(owner)))
- if(H != owner && H.stat != DEAD && H.health <= 0 && !H.reagents.has_reagent(/datum/reagent/medicine/epinephrine))
- to_chat(owner, "[linked_extract] pulses in sync with [H]'s heartbeat, trying to keep [H.p_them()] alive.")
- H.reagents.add_reagent(/datum/reagent/medicine/epinephrine,5)
- return ..()
-
-/datum/status_effect/stabilized/lightpink/on_remove()
- owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/lightpink)
-
-/datum/status_effect/stabilized/adamantine
- id = "stabilizedadamantine"
- colour = "adamantine"
- examine_text = " SUBJECTPRONOUN has a strange metallic coating on their skin."
-
-/datum/status_effect/stabilized/gold
- id = "stabilizedgold"
- colour = "gold"
- var/mob/living/simple_animal/familiar
-
-/datum/status_effect/stabilized/gold/tick()
- var/obj/item/slimecross/stabilized/gold/linked = linked_extract
- if(QDELETED(familiar))
- familiar = new linked.mob_type(get_turf(owner.loc))
- familiar.name = linked.mob_name
- familiar.del_on_death = TRUE
- familiar.copy_languages(owner, LANGUAGE_MASTER)
- if(linked.saved_mind)
- linked.saved_mind.transfer_to(familiar)
- familiar.update_atom_languages()
- familiar.ckey = linked.saved_mind.key
- else
- if(familiar.mind)
- linked.saved_mind = familiar.mind
- return ..()
-
-/datum/status_effect/stabilized/gold/on_remove()
- if(familiar)
- qdel(familiar)
-
-/datum/status_effect/stabilized/adamantine/on_apply()
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- H.physiology.damage_resistance += 5
- return ..()
-
-/datum/status_effect/stabilized/adamantine/on_remove()
- if(ishuman(owner))
- var/mob/living/carbon/human/H = owner
- H.physiology.damage_resistance -= 5
-
-/datum/status_effect/stabilized/rainbow
- id = "stabilizedrainbow"
- colour = "rainbow"
-
-/datum/status_effect/stabilized/rainbow/tick()
- if(owner.health <= 0)
- var/obj/item/slimecross/stabilized/rainbow/X = linked_extract
- if(istype(X))
- if(X.regencore)
- X.regencore.afterattack(owner,owner,TRUE)
- X.regencore = null
- owner.visible_message(" [owner] flashes a rainbow of colors, and [owner.p_their()] skin is coated in a milky regenerative goo!")
- qdel(src)
- qdel(linked_extract)
- return ..()
diff --git a/code/modules/research/xenobiology/crossbreeding/_weapons.dm b/code/modules/research/xenobiology/crossbreeding/_weapons.dm
deleted file mode 100644
index 3f80f17e8a32..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/_weapons.dm
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Slimecrossing Weapons
- Weapons added by the slimecrossing system.
- Collected here for clarity.
-*/
-
-//Boneblade - Burning Green
-/obj/item/melee/arm_blade/slime
- name = "slimy boneblade"
- desc = "What remains of the bones in your arm. Incredibly sharp, and painful for both you and your opponents."
- force = 22.5
- force_string = "painful"
-
-/obj/item/melee/arm_blade/slime/attack(mob/living/L, mob/user)
- . = ..()
- if(prob(20))
- user.emote("scream")
-
-//Adamantine shield - Chilling Adamantine
-/obj/item/shield/adamantineshield
- name = "adamantine shield"
- desc = "A gigantic shield made of solid adamantium."
- icon = 'icons/obj/slimecrossing.dmi'
- icon_state = "adamshield"
- item_state = "adamshield"
- w_class = WEIGHT_CLASS_HUGE
- armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
- slot_flags = ITEM_SLOT_BACK
- block_chance = 50
- force = 0
- throw_range = 1 //How far do you think you're gonna throw a solid crystalline shield...?
- throw_speed = 2
- attack_verb = list("bashed","pounded","slammed")
- item_flags = SLOWS_WHILE_IN_HAND
-
-/obj/item/shield/adamantineshield/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/two_handed, require_twohands=TRUE, force_wielded=15)
diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm
deleted file mode 100644
index 26c151e42316..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/burning.dm
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
-Burning extracts:
- Have a unique, primarily offensive effect when
- filled with 10u plasma and activated in-hand.
-*/
-/obj/item/slimecross/burning
- name = "burning extract"
- desc = "It's boiling over with barely-contained energy."
- effect = "burning"
- icon_state = "burning"
-
-/obj/item/slimecross/burning/Initialize()
- . = ..()
- create_reagents(10, INJECTABLE | DRAWABLE)
-
-/obj/item/slimecross/burning/attack_self(mob/user)
- if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10))
- to_chat(user, " This extract needs to be full of plasma to activate!")
- return
- reagents.remove_reagent(/datum/reagent/toxin/plasma,10)
- to_chat(user, " You squeeze the extract, and it absorbs the plasma!")
- playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE)
- playsound(src, 'sound/magic/fireball.ogg', 50, TRUE)
- do_effect(user)
-
-/obj/item/slimecross/burning/proc/do_effect(mob/user) //If, for whatever reason, you don't want to delete the extract, don't do ..()
- qdel(src)
- return
-
-/obj/item/slimecross/burning/grey
- colour = "grey"
- effect_desc = "Creates a hungry and speedy slime that will love you forever."
-
-/obj/item/slimecross/burning/grey/do_effect(mob/user)
- var/mob/living/simple_animal/slime/S = new(get_turf(user),"grey")
- S.visible_message(" A baby slime emerges from [src], and it nuzzles [user] before burbling hungrily!")
- S.set_friendship(user, 20) //Gas, gas, gas
- S.bodytemperature = T0C + 400 //We gonna step on the gas.
- S.set_nutrition(S.get_hunger_nutrition()) //Tonight, we fight!
- ..()
-
-/obj/item/slimecross/burning/orange
- colour = "orange"
- effect_desc = "Expels pepperspray in a radius when activated."
-
-/obj/item/slimecross/burning/orange/do_effect(mob/user)
- user.visible_message(" [src] boils over with a caustic gas!")
- var/datum/reagents/R = new/datum/reagents(100)
- R.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 100)
-
- var/datum/effect_system/smoke_spread/chem/smoke = new
- smoke.set_up(R, 7, get_turf(user))
- smoke.start()
- ..()
-
-/obj/item/slimecross/burning/purple
- colour = "purple"
- effect_desc = "Creates a clump of invigorating gel, it has healing properties and makes you feel good."
-
-/obj/item/slimecross/burning/purple/do_effect(mob/user)
- user.visible_message(" [src] fills with a bubbling liquid!")
- new /obj/item/slimecrossbeaker/autoinjector/slimestimulant(get_turf(user))
- ..()
-
-/obj/item/slimecross/burning/blue
- colour = "blue"
- effect_desc = "Freezes the floor around you and chills nearby people."
-
-/obj/item/slimecross/burning/blue/do_effect(mob/user)
- user.visible_message(" [src] flash-freezes the area!")
- for(var/turf/open/T in range(3, get_turf(user)))
- T.MakeSlippery(TURF_WET_PERMAFROST, min_wet_time = 10, wet_time_to_add = 5)
- for(var/mob/living/carbon/M in range(5, get_turf(user)))
- if(M != user && iscarbon(M))
- var/mob/living/carbon/C = M
- M.bodytemperature = C.dna.species.bodytemp_cold_damage_limit + 10 //Not quite cold enough to hurt.
- to_chat(M, " You feel a chill run down your spine, and the floor feels a bit slippery with frost...")
- ..()
-
-/obj/item/slimecross/burning/metal
- colour = "metal"
- effect_desc = "Instantly destroys walls around you."
-
-/obj/item/slimecross/burning/metal/do_effect(mob/user)
- for(var/turf/closed/wall/W in range(1,get_turf(user)))
- W.dismantle_wall(devastated = TRUE)
- playsound(W, 'sound/effects/break_stone.ogg', 50, TRUE)
- user.visible_message(" [src] pulses violently, and shatters the walls around it!")
- ..()
-
-/obj/item/slimecross/burning/yellow
- colour = "yellow"
- effect_desc = "Electrocutes people near you."
-
-/obj/item/slimecross/burning/yellow/do_effect(mob/user)
- user.visible_message(" [src] explodes into an electrical field!")
- playsound(get_turf(src), 'sound/weapons/zapbang.ogg', 50, TRUE)
- for(var/mob/living/M in range(4,get_turf(user)))
- if(M != user)
- var/mob/living/carbon/C = M
- if(istype(C))
- C.electrocute_act(25,src)
- else
- M.adjustFireLoss(25)
- to_chat(M, " You feel a sharp electrical pulse!")
- ..()
-
-/obj/item/slimecross/burning/darkpurple
- colour = "dark purple"
- effect_desc = "Creates a cloud of plasma."
-
-/obj/item/slimecross/burning/darkpurple/do_effect(mob/user)
- user.visible_message(" [src] sublimates into a cloud of plasma!")
- var/turf/T = get_turf(user)
- T.atmos_spawn_air("plasma=60")
- ..()
-
-/obj/item/slimecross/burning/darkblue
- colour = "dark blue"
- effect_desc = "Expels a burst of chilling smoke while also filling you with cryoxadone."
-
-/obj/item/slimecross/burning/darkblue/do_effect(mob/user)
- user.visible_message(" [src] releases a burst of chilling smoke!")
- var/datum/reagents/R = new/datum/reagents(100)
- R.add_reagent(/datum/reagent/consumable/frostoil, 40)
- user.reagents.add_reagent(/datum/reagent/medicine/cryoxadone,10)
- var/datum/effect_system/smoke_spread/chem/smoke = new
- smoke.set_up(R, 7, get_turf(user))
- smoke.start()
- ..()
-
-/obj/item/slimecross/burning/silver
- colour = "silver"
- effect_desc = "Creates a few pieces of slime jelly laced food."
-
-/obj/item/slimecross/burning/silver/do_effect(mob/user)
- var/amount = rand(3,6)
- var/list/turfs = list()
- for(var/turf/open/T in range(1,get_turf(user)))
- turfs += T
- for(var/i = 0, i < amount, i++)
- var/path = get_random_food()
- var/obj/item/O = new path(pick(turfs))
- O.reagents.add_reagent(/datum/reagent/toxin/slimejelly,5) //Oh god it burns
- if(prob(50))
- O.desc += " It smells strange..."
- user.visible_message(" [src] produces a few pieces of food!")
- ..()
-
-/obj/item/slimecross/burning/bluespace
- colour = "bluespace"
- effect_desc = "Teleports anyone directly next to you."
-
-/obj/item/slimecross/burning/bluespace/do_effect(mob/user)
- user.visible_message(" [src] sparks, and lets off a shockwave of bluespace energy!")
- for(var/mob/living/L in range(1, get_turf(user)))
- if(L != user)
- do_teleport(L, get_turf(L), 6, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) //Somewhere between the effectiveness of fake and real BS crystal
- new /obj/effect/particle_effect/sparks(get_turf(L))
- playsound(get_turf(L), "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- ..()
-
-/obj/item/slimecross/burning/sepia
- colour = "sepia"
- effect_desc = "Turns into a special camera that rewinds time when used."
-
-/obj/item/slimecross/burning/sepia/do_effect(mob/user)
- user.visible_message(" [src] shapes itself into a camera!")
- new /obj/item/camera/rewind(get_turf(user))
- ..()
-
-/obj/item/slimecross/burning/cerulean
- colour = "cerulean"
- effect_desc = "Produces an extract cloning potion, which copies an extract, as well as its extra uses."
-
-/obj/item/slimecross/burning/cerulean/do_effect(mob/user)
- user.visible_message(" [src] produces a potion!")
- new /obj/item/slimepotion/extract_cloner(get_turf(user))
- ..()
-
-/obj/item/slimecross/burning/pyrite
- colour = "pyrite"
- effect_desc = "Shatters all lights in the current room."
-
-/obj/item/slimecross/burning/pyrite/do_effect(mob/user)
- user.visible_message(" [src] releases a colorful wave of energy, which shatters the lights!")
- var/area/A = get_area(user.loc)
- for(var/obj/machinery/light/L in A) //Shamelessly copied from the APC effect.
- L.on = TRUE
- L.break_light_tube()
- L.on = FALSE
- stoplag()
- ..()
-
-/obj/item/slimecross/burning/red
- colour = "red"
- effect_desc = "Makes nearby slimes rabid, and they'll also attack their friends."
-
-/obj/item/slimecross/burning/red/do_effect(mob/user)
- user.visible_message(" [src] pulses a hazy red aura for a moment, which wraps around [user]!")
- for(var/mob/living/simple_animal/slime/S in view(7, get_turf(user)))
- if(user in S.Friends)
- var/friendliness = S.Friends[user]
- S.clear_friends()
- S.set_friendship(user, friendliness)
- else
- S.clear_friends()
- S.rabid = 1
- S.visible_message(" The [S] is driven into a dangerous frenzy!")
- ..()
-
-/obj/item/slimecross/burning/green
- colour = "green"
- effect_desc = "The user gets a dull arm blade in the hand it is used in."
-
-/obj/item/slimecross/burning/green/do_effect(mob/user)
- var/which_hand = "l_hand"
- if(!(user.active_hand_index % 2))
- which_hand = "r_hand"
- var/mob/living/L = user
- if(!istype(user))
- return
- var/obj/item/held = L.get_active_held_item() //This should be itself, but just in case...
- L.dropItemToGround(held)
- var/obj/item/melee/arm_blade/slime/blade = new(user)
- if(!L.put_in_hands(blade))
- qdel(blade)
- user.visible_message(" [src] melts onto [user]'s arm, boiling the flesh horribly!")
- else
- user.visible_message(" [src] sublimates the flesh around [user]'s arm, transforming the bone into a gruesome blade!")
- user.emote("scream")
- L.apply_damage(30,BURN,which_hand)
- ..()
-
-/obj/item/slimecross/burning/pink
- colour = "pink"
- effect_desc = "Creates a beaker of synthpax."
-
-/obj/item/slimecross/burning/pink/do_effect(mob/user)
- user.visible_message(" [src] shrinks into a small, gel-filled pellet!")
- new /obj/item/slimecrossbeaker/pax(get_turf(user))
- ..()
-
-/obj/item/slimecross/burning/gold
- colour = "gold"
- effect_desc = "Creates a gank squad of monsters that are friendly to the user."
-
-/obj/item/slimecross/burning/gold/do_effect(mob/user)
- user.visible_message(" [src] shudders violently, and summons an army for [user]!")
- for(var/i in 1 to 3) //Less than gold normally does, since it's safer and faster.
- var/mob/living/simple_animal/S = create_random_mob(get_turf(user), HOSTILE_SPAWN)
- S.faction |= "[REF(user)]"
- if(prob(50))
- for(var/j = 1, j <= rand(1, 3), j++)
- step(S, pick(NORTH,SOUTH,EAST,WEST))
- ..()
-
-/obj/item/slimecross/burning/oil
- colour = "oil"
- effect_desc = "Creates an explosion after a few seconds."
-
-/obj/item/slimecross/burning/oil/do_effect(mob/user)
- user.visible_message(" [user] activates [src]. It's going to explode!", " You activate [src]. It crackles in anticipation")
- addtimer(CALLBACK(src, PROC_REF(boom)), 50)
-
-/obj/item/slimecross/burning/oil/proc/boom()
- var/turf/T = get_turf(src)
- playsound(T, 'sound/effects/explosion2.ogg', 200, TRUE)
- for(var/mob/living/M in range(2, T))
- new /obj/effect/temp_visual/explosion(get_turf(M))
- M.ex_act(EXPLODE_HEAVY)
- qdel(src)
-
-/obj/item/slimecross/burning/black
- colour = "black"
- effect_desc = "Transforms the user into a slime. They can transform back at will and do not lose any items."
-
-/obj/item/slimecross/burning/black/do_effect(mob/user)
- var/mob/living/L = user
- if(!istype(L))
- return
- user.visible_message(" [src] absorbs [user], transforming [user.p_them()] into a slime!")
- var/obj/effect/proc_holder/spell/targeted/shapeshift/slimeform/S = new()
- S.remove_on_restore = TRUE
- user.mind.AddSpell(S)
- S.cast(list(user),user)
- ..()
-
-/obj/item/slimecross/burning/lightpink
- colour = "light pink"
- effect_desc = "Paxes everyone in sight."
-
-/obj/item/slimecross/burning/lightpink/do_effect(mob/user)
- user.visible_message(" [src] lets off a hypnotizing pink glow!")
- for(var/mob/living/carbon/C in view(7, get_turf(user)))
- C.reagents.add_reagent(/datum/reagent/pax,5)
- ..()
-
-/obj/item/slimecross/burning/adamantine
- colour = "adamantine"
- effect_desc = "Creates a mighty adamantine shield."
-
-/obj/item/slimecross/burning/adamantine/do_effect(mob/user)
- user.visible_message(" [src] crystallizes into a large shield!")
- new /obj/item/shield/adamantineshield(get_turf(user))
- ..()
-
diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm
deleted file mode 100644
index f01b148d4d5e..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/charged.dm
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
-Charged extracts:
- Have a unique, effect when filled with
- 10u plasma and activated in-hand, related to their
- normal extract effect.
-*/
-/obj/item/slimecross/charged
- name = "charged extract"
- desc = "It sparks with electric power."
- effect = "charged"
- icon_state = "charged"
-
-/obj/item/slimecross/charged/Initialize()
- . = ..()
- create_reagents(10, INJECTABLE | DRAWABLE)
-
-/obj/item/slimecross/charged/attack_self(mob/user)
- if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10))
- to_chat(user, " This extract needs to be full of plasma to activate!")
- return
- reagents.remove_reagent(/datum/reagent/toxin/plasma,10)
- to_chat(user, " You squeeze the extract, and it absorbs the plasma!")
- playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE)
- playsound(src, 'sound/effects/light_flicker.ogg', 50, TRUE)
- do_effect(user)
-
-/obj/item/slimecross/charged/proc/do_effect(mob/user) //If, for whatever reason, you don't want to delete the extract, don't do ..()
- qdel(src)
- return
-
-/obj/item/slimecross/charged/grey
- colour = "grey"
- effect_desc = "Produces a slime reviver potion, which revives dead slimes."
-
-/obj/item/slimecross/charged/grey/do_effect(mob/user)
- new /obj/item/slimepotion/slime_reviver(get_turf(user))
- user.visible_message(" [src] distills into a potion!")
- ..()
-
-/obj/item/slimecross/charged/orange
- colour = "orange"
- effect_desc = "Instantly makes a large burst of flame for a moment."
-
-/obj/item/slimecross/charged/orange/do_effect(mob/user)
- for(var/turf/turf in range(5,get_turf(user)))
- if(!locate(/obj/effect/hotspot) in turf)
- new /obj/effect/hotspot(turf)
- ..()
-
-/obj/item/slimecross/charged/purple
- colour = "purple"
- effect_desc = "Creates a packet of omnizine."
-
-/obj/item/slimecross/charged/purple/do_effect(mob/user)
- new /obj/item/slimecrossbeaker/omnizine(get_turf(user))
- user.visible_message(" [src] sparks, and floods with a regenerative solution!")
- ..()
-
-/obj/item/slimecross/charged/blue
- colour = "blue"
- effect_desc = "Creates a potion that neuters the mutation chance of a slime, which passes on to new generations."
-
-/obj/item/slimecross/charged/blue/do_effect(mob/user)
- new /obj/item/slimepotion/slime/chargedstabilizer(get_turf(user))
- user.visible_message(" [src] distills into a potion!")
- ..()
-
-/obj/item/slimecross/charged/metal
- colour = "metal"
- effect_desc = "Produces a bunch of metal and plasteel."
-
-/obj/item/slimecross/charged/metal/do_effect(mob/user)
- new /obj/item/stack/sheet/metal(get_turf(user), 25)
- new /obj/item/stack/sheet/plasteel(get_turf(user), 10)
- user.visible_message(" [src] grows into a plethora of metals!")
- ..()
-
-/obj/item/slimecross/charged/yellow
- colour = "yellow"
- effect_desc = "Creates a hypercharged slime cell battery, which has high capacity and recharges constantly at a very fast rate."
-
-/obj/item/slimecross/charged/yellow/do_effect(mob/user)
- new /obj/item/stock_parts/cell/high/slime/hypercharged(get_turf(user))
- user.visible_message(" [src] sparks violently, and swells with electric power!")
- ..()
-
-/obj/item/slimecross/charged/darkpurple
- colour = "dark purple"
- effect_desc = "Creates several sheets of plasma."
-
-/obj/item/slimecross/charged/darkpurple/do_effect(mob/user)
- new /obj/item/stack/sheet/mineral/plasma(get_turf(user), 10)
- user.visible_message(" [src] produces a large amount of plasma!")
- ..()
-
-/obj/item/slimecross/charged/darkblue
- colour = "dark blue"
- effect_desc = "Produces a pressure proofing potion."
-
-/obj/item/slimecross/charged/darkblue/do_effect(mob/user)
- new /obj/item/slimepotion/spaceproof(get_turf(user))
- user.visible_message(" [src] distills into a potion!")
- ..()
-
-/obj/item/slimecross/charged/silver
- colour = "silver"
- effect_desc = "Creates a slime cake and some drinks."
-
-/obj/item/slimecross/charged/silver/do_effect(mob/user)
- new /obj/item/food/cake/slimecake(get_turf(user))
- for(var/i in 1 to 10)
- var/drink_type = get_random_drink()
- new drink_type(get_turf(user))
- user.visible_message(" [src] produces a party's worth of cake and drinks!")
- ..()
-
-/obj/item/slimecross/charged/bluespace
- colour = "bluespace"
- effect_desc = "Makes a bluespace polycrystal."
-
-/obj/item/slimecross/charged/bluespace/do_effect(mob/user)
- new /obj/item/stack/sheet/bluespace_crystal(get_turf(user), 10)
- user.visible_message(" [src] produces several sheets of polycrystal!")
- ..()
-
-/obj/item/slimecross/charged/sepia
- colour = "sepia"
- effect_desc = "Creates a camera obscura."
-
-/obj/item/slimecross/charged/sepia/do_effect(mob/user)
- new /obj/item/camera/spooky(get_turf(user))
- user.visible_message(" [src] flickers in a strange, ethereal manner, and produces a camera!")
- ..()
-
-/obj/item/slimecross/charged/cerulean
- colour = "cerulean"
- effect_desc = "Creates an extract enhancer, giving whatever it's used on five more uses."
-
-/obj/item/slimecross/charged/cerulean/do_effect(mob/user)
- new /obj/item/slimepotion/enhancer/max(get_turf(user))
- user.visible_message(" [src] distills into a potion!")
- ..()
-
-/obj/item/slimecross/charged/pyrite
- colour = "pyrite"
- effect_desc = "Creates bananium. Oh no."
-
-/obj/item/slimecross/charged/pyrite/do_effect(mob/user)
- new /obj/item/stack/sheet/mineral/hidden/hellstone(get_turf(user), 10)
- user.visible_message(" [src] solidifies with a horrifying banana stench!")
- ..()
-
-/obj/item/slimecross/charged/red
- colour = "red"
- effect_desc = "Produces a lavaproofing potion"
-
-/obj/item/slimecross/charged/red/do_effect(mob/user)
- new /obj/item/slimepotion/lavaproof(get_turf(user))
- user.visible_message(" [src] distills into a potion!")
- ..()
-
-/obj/item/slimecross/charged/green
- colour = "green"
- effect_desc = "Lets you choose what slime species you want to be."
-
-/obj/item/slimecross/charged/green/do_effect(mob/user)
- var/mob/living/carbon/human/H = user
- if(!istype(H))
- to_chat(user, " You must be a humanoid to use this!")
- return
- var/racechoice = input(H, "Choose your slime subspecies.", "Slime Selection") as null|anything in sortList(subtypesof(/datum/species/jelly), /proc/cmp_typepaths_asc)
- if(!racechoice)
- to_chat(user, " You decide not to become a slime for now.")
- return
- if(!user.canUseTopic(src, BE_CLOSE))
- return
- H.set_species(racechoice, icon_update=1)
- H.visible_message(" [H] suddenly shifts form as [src] dissolves into [H.p_their()] skin!")
- ..()
-
-/obj/item/slimecross/charged/pink
- colour = "pink"
- effect_desc = "Produces a... lovepotion... no ERP."
-
-/obj/item/slimecross/charged/pink/do_effect(mob/user)
- new /obj/item/slimepotion/lovepotion(get_turf(user))
- user.visible_message(" [src] distills into a potion!")
- ..()
-
-/obj/item/slimecross/charged/gold
- colour = "gold"
- effect_desc = "Slowly spawns 10 hostile monsters."
- var/max_spawn = 10
- var/spawned = 0
-
-/obj/item/slimecross/charged/gold/do_effect(mob/user)
- user.visible_message(" [src] starts shuddering violently!")
- addtimer(CALLBACK(src, PROC_REF(startTimer)), 50)
-
-/obj/item/slimecross/charged/gold/proc/startTimer()
- START_PROCESSING(SSobj, src)
-
-/obj/item/slimecross/charged/gold/process()
- visible_message(" [src] lets off a spark, and produces a living creature!")
- new /obj/effect/particle_effect/sparks(get_turf(src))
- playsound(get_turf(src), "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- create_random_mob(get_turf(src), HOSTILE_SPAWN)
- spawned++
- if(spawned >= max_spawn)
- visible_message(" [src] collapses into a puddle of goo.")
- qdel(src)
-
-/obj/item/slimecross/charged/gold/Destroy()
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/item/slimecross/charged/oil
- colour = "oil"
- effect_desc = "Creates an explosion after a few seconds."
-
-/obj/item/slimecross/charged/oil/do_effect(mob/user)
- user.visible_message(" [src] begins to shake with rapidly increasing force!")
- addtimer(CALLBACK(src, PROC_REF(boom)), 50)
-
-/obj/item/slimecross/charged/oil/proc/boom()
- explosion(get_turf(src), 2, 3, 4) //Much smaller effect than normal oils, but devastatingly strong where it does hit.
- qdel(src)
-
-/obj/item/slimecross/charged/black
- colour = "black"
- effect_desc = "Randomizes the user's species."
-
-/obj/item/slimecross/charged/black/do_effect(mob/user)
- var/mob/living/carbon/human/H = user
- if(!istype(H))
- to_chat(user, " You have to be able to have a species to get your species changed.")
- return
- var/list/allowed_species = list()
- for(var/stype in subtypesof(/datum/species))
- var/datum/species/X = stype
- if(initial(X.changesource_flags) & SLIME_EXTRACT)
- allowed_species += stype
-
- var/datum/species/changed = pick(allowed_species)
- if(changed)
- H.set_species(changed, icon_update = 1)
- to_chat(H, " You feel very different!")
- ..()
-
-/obj/item/slimecross/charged/lightpink
- colour = "light pink"
- effect_desc = "Produces a pacification potion, which works on monsters and humanoids."
-
-/obj/item/slimecross/charged/lightpink/do_effect(mob/user)
- new /obj/item/slimepotion/peacepotion(get_turf(user))
- user.visible_message(" [src] distills into a potion!")
- ..()
-
-/obj/item/slimecross/charged/adamantine
- colour = "adamantine"
- effect_desc = "Does nothing. Sorry :)"
-
-/obj/item/slimecross/charged/rainbow
- colour = "rainbow"
- effect_desc = "Produces three living slimes of random colors."
-
-/obj/item/slimecross/charged/rainbow/do_effect(mob/user)
- user.visible_message(" [src] swells and splits into three new slimes!")
- for(var/i in 1 to 3)
- var/mob/living/simple_animal/slime/S = new(get_turf(user))
- S.random_colour()
- ..()
diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm
deleted file mode 100644
index 4a13f5d0c425..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/chilling.dm
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
-Chilling extracts:
- Have a unique, primarily defensive effect when
- filled with 10u plasma and activated in-hand.
-*/
-/obj/item/slimecross/chilling
- name = "chilling extract"
- desc = "It's cold to the touch, as if frozen solid."
- effect = "chilling"
- icon_state = "chilling"
-
-/obj/item/slimecross/chilling/Initialize()
- . = ..()
- create_reagents(10, INJECTABLE | DRAWABLE)
-
-/obj/item/slimecross/chilling/attack_self(mob/user)
- if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10))
- to_chat(user, " This extract needs to be full of plasma to activate!")
- return
- reagents.remove_reagent(/datum/reagent/toxin/plasma,10)
- to_chat(user, " You squeeze the extract, and it absorbs the plasma!")
- playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE)
- playsound(src, 'sound/effects/glassbr1.ogg', 50, TRUE)
- do_effect(user)
-
-/obj/item/slimecross/chilling/proc/do_effect(mob/user) //If, for whatever reason, you don't want to delete the extract, don't do ..()
- qdel(src)
- return
-
-/obj/item/slimecross/chilling/grey
- colour = "grey"
- effect_desc = "Creates some slime barrier cubes. When used they create slimy barricades."
-
-/obj/item/slimecross/chilling/grey/do_effect(mob/user)
- user.visible_message(" [src] produces a few small, grey cubes")
- for(var/i in 1 to 3)
- new /obj/item/barriercube(get_turf(user))
- ..()
-
-/obj/item/slimecross/chilling/orange
- colour = "orange"
- effect_desc = "Creates a ring of fire one tile away from the user."
-
-/obj/item/slimecross/chilling/orange/do_effect(mob/user)
- user.visible_message(" [src] shatters, and lets out a jet of heat!")
- for(var/turf/T in orange(get_turf(user),2))
- if(get_dist(get_turf(user), T) > 1)
- new /obj/effect/hotspot(T)
- ..()
-
-/obj/item/slimecross/chilling/purple
- colour = "purple"
- effect_desc = "Injects everyone in the area with some regenerative jelly."
-
-/obj/item/slimecross/chilling/purple/do_effect(mob/user)
- var/area/A = get_area(get_turf(user))
- if(A.outdoors)
- to_chat(user, " [src] can't affect such a large area.")
- return
- user.visible_message(" [src] shatters, and a healing aura fills the room briefly.")
- for(var/mob/living/carbon/C in A)
- C.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10)
- ..()
-
-/obj/item/slimecross/chilling/blue
- colour = "blue"
- effect_desc = "Creates a rebreather, a tankless mask."
-
-/obj/item/slimecross/chilling/blue/do_effect(mob/user)
- user.visible_message(" [src] cracks, and spills out a liquid goo, which reforms into a mask!")
- new /obj/item/clothing/mask/nobreath(get_turf(user))
- ..()
-
-/obj/item/slimecross/chilling/metal
- colour = "metal"
- effect_desc = "Temporarily surrounds the user with unbreakable walls."
-
-/obj/item/slimecross/chilling/metal/do_effect(mob/user)
- user.visible_message(" [src] melts like quicksilver, and surrounds [user] in a wall!")
- for(var/turf/T in orange(get_turf(user),1))
- if(get_dist(get_turf(user), T) > 0)
- new /obj/effect/forcefield/slimewall(T)
- ..()
-
-/obj/item/slimecross/chilling/yellow
- colour = "yellow"
- effect_desc = "Recharges the room's APC by 50%."
-
-/obj/item/slimecross/chilling/yellow/do_effect(mob/user)
- var/area/A = get_area(get_turf(user))
- user.visible_message(" [src] shatters, and a the air suddenly feels charged for a moment.")
- for(var/obj/machinery/power/apc/C in A)
- if(C.cell)
- C.cell.charge = min(C.cell.charge + C.cell.maxcharge/2, C.cell.maxcharge)
- ..()
-
-/obj/item/slimecross/chilling/darkpurple
- colour = "dark purple"
- effect_desc = "Removes all plasma gas in the area."
-
-/obj/item/slimecross/chilling/darkpurple/do_effect(mob/user)
- var/area/A = get_area(get_turf(user))
- if(A.outdoors)
- to_chat(user, " [src] can't affect such a large area.")
- return
- var/filtered = FALSE
- for(var/turf/open/T in A)
- var/datum/gas_mixture/G = T.air
- if(istype(G))
- G.set_moles(GAS_PLASMA, 0)
- filtered = TRUE
- T.air_update_turf()
- if(filtered)
- user.visible_message(" Cracks spread throughout [src], and some air is sucked in!")
- else
- user.visible_message(" [src] cracks, but nothing happens.")
- ..()
-
-/obj/item/slimecross/chilling/darkblue
- colour = "dark blue"
- effect_desc = "Seals the user in a protective block of ice."
-
-/obj/item/slimecross/chilling/darkblue/do_effect(mob/user)
- if(isliving(user))
- user.visible_message(" [src] freezes over [user]'s entire body!")
- var/mob/living/M = user
- M.apply_status_effect(/datum/status_effect/frozenstasis)
- ..()
-
-/obj/item/slimecross/chilling/silver
- colour = "silver"
- effect_desc = "Creates several ration packs."
-
-/obj/item/slimecross/chilling/silver/do_effect(mob/user)
- user.visible_message(" [src] crumbles into icy powder, leaving behind several emergency food supplies!")
- var/amount = rand(5, 10)
- for(var/i in 1 to amount)
- new /obj/item/reagent_containers/food/snacks/rationpack(get_turf(user))
- ..()
-
-/obj/item/slimecross/chilling/bluespace
- colour = "bluespace"
- effect_desc = "Touching people with this extract adds them to a list, when it is activated it teleports everyone on that list to the user."
- var/list/allies = list()
- var/active = FALSE
-
-/obj/item/slimecross/chilling/bluespace/afterattack(atom/target, mob/user, proximity)
- if(!proximity || !isliving(target) || active)
- return
- if(target in allies)
- allies -= target
- to_chat(user, " You unlink [src] with [target].")
- else
- allies |= target
- to_chat(user, " You link [src] with [target].")
- return
-
-/obj/item/slimecross/chilling/bluespace/do_effect(mob/user)
- if(allies.len <= 0)
- to_chat(user, " [src] is not linked to anyone!")
- return
- to_chat(user, " You feel [src] pulse as it begins charging bluespace energies...")
- active = TRUE
- for(var/mob/living/M in allies)
- var/datum/status_effect/slimerecall/S = M.apply_status_effect(/datum/status_effect/slimerecall)
- S.target = user
- if(do_after(user, 100, target=src))
- to_chat(user, " [src] shatters as it tears a hole in reality, snatching the linked individuals from the void!")
- for(var/mob/living/M in allies)
- var/datum/status_effect/slimerecall/S = M.has_status_effect(/datum/status_effect/slimerecall)
- M.remove_status_effect(S)
- else
- to_chat(user, " [src] falls dark, dissolving into nothing as the energies fade away.")
- for(var/mob/living/M in allies)
- var/datum/status_effect/slimerecall/S = M.has_status_effect(/datum/status_effect/slimerecall)
- if(istype(S))
- S.interrupted = TRUE
- M.remove_status_effect(S)
- ..()
-
-/obj/item/slimecross/chilling/sepia
- colour = "sepia"
- effect_desc = "Touching someone with it adds/removes them from a list. Activating the extract stops time for 7 seconds, and everyone on the list is immune, except the user."
- var/list/allies = list()
-
-/obj/item/slimecross/chilling/sepia/afterattack(atom/target, mob/user, proximity)
- if(!proximity || !isliving(target))
- return
- if(target in allies)
- allies -= target
- to_chat(user, " You unlink [src] with [target].")
- else
- allies |= target
- to_chat(user, " You link [src] with [target].")
- return
-
-/obj/item/slimecross/chilling/sepia/do_effect(mob/user)
- user.visible_message(" [src] shatters, freezing time itself!")
- allies -= user //support class
- new /obj/effect/timestop(get_turf(user), 2, 70, allies)
- ..()
-
-/obj/item/slimecross/chilling/cerulean
- colour = "cerulean"
- effect_desc = "Creates a flimsy copy of the user, that they control."
-
-/obj/item/slimecross/chilling/cerulean/do_effect(mob/user)
- if(isliving(user))
- user.visible_message(" [src] creaks and shifts into a clone of [user]!")
- var/mob/living/M = user
- M.apply_status_effect(/datum/status_effect/slime_clone)
- ..()
-
-/obj/item/slimecross/chilling/pyrite
- colour = "pyrite"
- effect_desc = "Creates a pair of Prism Glasses, which allow the wearer to place colored light crystals."
-
-/obj/item/slimecross/chilling/pyrite/do_effect(mob/user)
- // [CELADON-EDIT] - CELADON_RETURN_CONTENT - Вот тебе и ЛОЛ
- // user.visible_message(" [src] does nothing sorry lol!") // CELADON-EDIT - ORIGINAL
- user.visible_message(" [src] crystallizes into a pair of spectacles!")
- new /obj/item/clothing/glasses/prism_glasses(get_turf(user))
- // [/CELADON-EDIT]
- ..()
-
-/obj/item/slimecross/chilling/red
- colour = "red"
- effect_desc = "Pacifies every slime in your vacinity."
-
-/obj/item/slimecross/chilling/red/do_effect(mob/user)
- var/slimesfound = FALSE
- for(var/mob/living/simple_animal/slime/S in view(get_turf(user), 7))
- slimesfound = TRUE
- S.docile = TRUE
- if(slimesfound)
- user.visible_message(" [src] lets out a peaceful ring as it shatters, and nearby slimes seem calm.")
- else
- user.visible_message(" [src] lets out a peaceful ring as it shatters, but nothing happens...")
- ..()
-
-/obj/item/slimecross/chilling/pink
- colour = "pink"
- effect_desc = "Creates a slime corgi puppy."
-
-/obj/item/slimecross/chilling/pink/do_effect(mob/user)
- user.visible_message(" [src] cracks like an egg, and an adorable puppy comes tumbling out!")
- new /mob/living/simple_animal/pet/dog/corgi/puppy/slime(get_turf(user))
- ..()
-
-/obj/item/slimecross/chilling/gold
- colour = "gold"
- effect_desc = "Produces a golden capture device"
-
-/obj/item/slimecross/chilling/gold/do_effect(mob/user)
- user.visible_message(" [src] lets off golden light as it melts and reforms into an egg-like device!")
- new /obj/item/capturedevice(get_turf(user))
- ..()
-
-/obj/item/slimecross/chilling/oil
- colour = "oil"
- effect_desc = "It creates a weak, but wide-ranged explosion."
-
-/obj/item/slimecross/chilling/oil/do_effect(mob/user)
- user.visible_message(" [src] begins to shake with muted intensity!")
- addtimer(CALLBACK(src, PROC_REF(boom)), 50)
-
-/obj/item/slimecross/chilling/oil/proc/boom()
- explosion(get_turf(src), -1, -1, 10, 0) //Large radius, but mostly light damage, and no flash.
- qdel(src)
-
-/obj/item/slimecross/chilling/black
- colour = "black"
- effect_desc = "Does nothing. :)"
-
-/obj/item/slimecross/chilling/lightpink
- colour = "light pink"
- effect_desc = "Creates a Heroine Bud, a special flower that pacifies whoever wears it on their head. They will not be able to take it off without help."
-
-/obj/item/slimecross/chilling/lightpink/do_effect(mob/user)
- user.visible_message(" [src] blooms into a beautiful flower!")
- new /obj/item/clothing/head/peaceflower(get_turf(user))
- ..()
-
-/obj/item/slimecross/chilling/adamantine
- colour = "adamantine"
- effect_desc = "Solidifies into a set of adamantine armor."
-
-/obj/item/slimecross/chilling/adamantine/do_effect(mob/user)
- user.visible_message(" [src] creaks and breaks as it shifts into a heavy set of armor!")
- new /obj/item/clothing/suit/armor/heavy/adamantine(get_turf(user))
- ..()
-
-/obj/item/slimecross/chilling/rainbow
- colour = "rainbow"
- effect_desc = "Makes an unpassable wall in every door in the area."
-
-/obj/item/slimecross/chilling/rainbow/do_effect(mob/user)
- var/area/area = get_area(user)
- if(area.outdoors)
- to_chat(user, " [src] can't affect such a large area.")
- return
- user.visible_message(" [src] reflects an array of dazzling colors and light, energy rushing to nearby doors!")
- for(var/obj/machinery/door/airlock/door in area)
- new /obj/effect/forcefield/slimewall/rainbow(door.loc)
- return ..()
diff --git a/code/modules/research/xenobiology/crossbreeding/consuming.dm b/code/modules/research/xenobiology/crossbreeding/consuming.dm
deleted file mode 100644
index f2a162af3aac..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/consuming.dm
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
-Consuming extracts:
- Can eat food items.
- After consuming enough, produces special cookies.
-*/
-/obj/item/slimecross/consuming
- name = "consuming extract"
- desc = "It hungers... for more." //My slimecross has finally decided to eat... my buffet!
- icon_state = "consuming"
- effect = "consuming"
- var/nutriment_eaten = 0
- var/nutriment_required = 10
- var/cooldown = 600 //1 minute.
- var/last_produced = 0
- var/cookies = 5 //Number of cookies to spawn
- var/cookietype = /obj/item/slime_cookie
-
-/obj/item/slimecross/consuming/attackby(obj/item/O, mob/user)
- if(istype(O,/obj/item/reagent_containers/food/snacks))
- if(last_produced + cooldown > world.time)
- to_chat(user, " [src] is still digesting after its last meal!")
- return
- var/datum/reagent/N = O.reagents.has_reagent(/datum/reagent/consumable/nutriment)
- if(N)
- nutriment_eaten += N.volume
- to_chat(user, " [src] opens up and swallows [O] whole!")
- qdel(O)
- playsound(src, 'sound/items/eatfood.ogg', 20, TRUE)
- else
- to_chat(user, " [src] burbles unhappily at the offering.")
- if(nutriment_eaten >= nutriment_required)
- nutriment_eaten = 0
- user.visible_message(" [src] swells up and produces a small pile of cookies!")
- playsound(src, 'sound/effects/splat.ogg', 40, TRUE)
- last_produced = world.time
- for(var/i in 1 to cookies)
- var/obj/item/S = spawncookie()
- S.pixel_x = base_pixel_x + rand(-5, 5)
- S.pixel_y = base_pixel_y + rand(-5, 5)
- return
- ..()
-
-/obj/item/slimecross/consuming/proc/spawncookie()
- return new cookietype(get_turf(src))
-
-/obj/item/slime_cookie //While this technically acts like food, it's so removed from it that I made it its' own type.
- name = "error cookie"
- desc = "A weird slime cookie. You shouldn't see this."
- icon = 'icons/obj/food/slimecookies.dmi'
- var/taste = "error"
- var/nutrition = 5
- icon_state = "base"
- force = 0
- w_class = WEIGHT_CLASS_TINY
- throwforce = 0
- throw_speed = 3
- throw_range = 6
-
-/obj/item/slime_cookie/proc/do_effect(mob/living/M, mob/user)
- return
-
-/obj/item/slime_cookie/attack(mob/living/M, mob/user)
- var/fed = FALSE
- if(M == user)
- M.visible_message(" [user] eats [src]!", " You eat [src].")
- fed = TRUE
- else
- M.visible_message(" [user] tries to force [M] to eat [src]!", " [user] tries to force you to eat [src]!")
- if(do_after(user, 20, target = M))
- fed = TRUE
- M.visible_message(" [user] forces [M] to eat [src]!", " [user] forces you to eat [src].")
- if(fed)
- var/mob/living/carbon/human/H = M
-
- if(!istype(H) || !HAS_TRAIT(H, TRAIT_AGEUSIA))
- to_chat(M, " Tastes like [taste].")
- playsound(get_turf(M), 'sound/items/eatfood.ogg', 20, TRUE)
- if(nutrition)
- M.reagents.add_reagent(/datum/reagent/consumable/nutriment,nutrition)
- do_effect(M, user)
- qdel(src)
- return
- ..()
-
-/obj/item/slimecross/consuming/grey
- colour = "grey"
- effect_desc = "Creates a slime cookie."
- cookietype = /obj/item/slime_cookie/grey
-
-/obj/item/slime_cookie/grey
- name = "slime cookie"
- desc = "A grey-ish transparent cookie. Nutritious, probably."
- icon_state = "grey"
- taste = "goo"
- nutrition = 15
-
-/obj/item/slimecross/consuming/orange
- colour = "orange"
- effect_desc = "Creates a slime cookie that heats the target up and grants cold immunity for a short time."
- cookietype = /obj/item/slime_cookie/orange
-
-/obj/item/slime_cookie/orange
- name = "fiery cookie"
- desc = "A orange cookie with a fiery pattern. Feels warm."
- icon_state = "orange"
- taste = "cinnamon and burning"
-
-/obj/item/slime_cookie/orange/do_effect(mob/living/M, mob/user)
- M.apply_status_effect(/datum/status_effect/firecookie)
-
-/obj/item/slimecross/consuming/purple
- colour = "purple"
- effect_desc = "Creates a slime cookie that heals the target from every type of damage."
- cookietype = /obj/item/slime_cookie/purple
-
-/obj/item/slime_cookie/purple
- name = "health cookie"
- desc = "A purple cookie with a cross pattern. Soothing."
- icon_state = "purple"
- taste = "fruit jam and cough medicine"
-
-/obj/item/slime_cookie/purple/do_effect(mob/living/M, mob/user)
- M.adjustBruteLoss(-5)
- M.adjustFireLoss(-5)
- M.adjustToxLoss(-5, forced=1) //To heal slimepeople.
- M.adjustOxyLoss(-5)
- M.adjustCloneLoss(-5)
- M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -5)
-
-/obj/item/slimecross/consuming/blue
- colour = "blue"
- effect_desc = "Creates a slime cookie that wets the floor around you and makes you immune to water based slipping for a short time."
- cookietype = /obj/item/slime_cookie/blue
-
-/obj/item/slime_cookie/blue
- name = "water cookie"
- desc = "A transparent blue cookie. Constantly dripping wet."
- icon_state = "blue"
- taste = /datum/reagent/water
-
-/obj/item/slime_cookie/blue/do_effect(mob/living/M, mob/user)
- M.apply_status_effect(/datum/status_effect/watercookie)
-
-/obj/item/slimecross/consuming/metal
- colour = "metal"
- effect_desc = "Creates a slime cookie that increases the target's resistance to brute damage."
- cookietype = /obj/item/slime_cookie/metal
-
-/obj/item/slime_cookie/metal
- name = "metallic cookie"
- desc = "A shiny grey cookie. Hard to the touch."
- icon_state = "metal"
- taste = /datum/reagent/copper
-
-/obj/item/slime_cookie/metal/do_effect(mob/living/M, mob/user)
- M.apply_status_effect(/datum/status_effect/metalcookie)
-
-/obj/item/slimecross/consuming/yellow
- colour = "yellow"
- effect_desc = "Creates a slime cookie that makes the target immune to electricity for a short time."
- cookietype = /obj/item/slime_cookie/yellow
-
-/obj/item/slime_cookie/yellow
- name = "sparking cookie"
- desc = "A yellow cookie with a lightning pattern. Has a rubbery texture."
- icon_state = "yellow"
- taste = "lemon cake and rubber gloves"
-
-/obj/item/slime_cookie/yellow/do_effect(mob/living/M, mob/user)
- M.apply_status_effect(/datum/status_effect/sparkcookie)
-
-/obj/item/slimecross/consuming/darkpurple
- colour = "dark purple"
- effect_desc = "Creates a slime cookie that reverses how the target's body treats toxins."
- cookietype = /obj/item/slime_cookie/darkpurple
-
-/obj/item/slime_cookie/darkpurple
- name = "toxic cookie"
- desc = "A dark purple cookie, stinking of plasma."
- icon_state = "darkpurple"
- taste = "slime jelly and toxins"
-
-/obj/item/slime_cookie/darkpurple/do_effect(mob/living/M, mob/user)
- M.apply_status_effect(/datum/status_effect/toxincookie)
-
-/obj/item/slimecross/consuming/darkblue
- colour = "dark blue"
- effect_desc = "Creates a slime cookie that chills the target and extinguishes them."
- cookietype = /obj/item/slime_cookie/darkblue
-
-/obj/item/slime_cookie/darkblue
- name = "frosty cookie"
- desc = "A dark blue cookie with a snowflake pattern. Feels cold."
- icon_state = "darkblue"
- taste = "mint and bitter cold"
-
-/obj/item/slime_cookie/darkblue/do_effect(mob/living/M, mob/user)
- M.adjust_bodytemperature(-110)
- M.ExtinguishMob()
-
-/obj/item/slimecross/consuming/silver
- colour = "silver"
- effect_desc = "Creates a slime cookie that never gets the target fat."
- cookietype = /obj/item/slime_cookie/silver
-
-/obj/item/slime_cookie/silver
- name = "waybread cookie"
- desc = "A warm, crispy cookie, sparkling silver in the light. Smells wonderful."
- icon_state = "silver"
- taste = "masterful elven baking"
- nutrition = 0 //We don't want normal nutriment
-
-/obj/item/slime_cookie/silver/do_effect(mob/living/M, mob/user)
- M.reagents.add_reagent(/datum/reagent/consumable/nutriment/stabilized,10)
-
-/obj/item/slimecross/consuming/bluespace
- colour = "bluespace"
- effect_desc = "Creates a slime cookie that teleports the target to a random place in the area."
- cookietype = /obj/item/slime_cookie/bluespace
-
-/obj/item/slime_cookie/bluespace
- name = "space cookie"
- desc = "A white cookie with green icing. Surprisingly hard to hold."
- icon_state = "bluespace"
- taste = "sugar and starlight"
-
-/obj/item/slime_cookie/bluespace/do_effect(mob/living/M, mob/user)
- var/list/L = get_area_turfs(get_area(M))
- var/turf/target
- while (L.len && !target)
- var/I = rand(1, L.len)
- var/turf/T = L[I]
- if (is_centcom_level(T))
- L.Cut(I,I+1)
- continue
- if(!T.density)
- var/clear = TRUE
- for(var/obj/O in T)
- if(O.density)
- clear = FALSE
- break
- if(clear)
- target = T
- if (!target)
- L.Cut(I,I+1)
-
- if(target)
- do_teleport(M, target, 0, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
- new /obj/effect/particle_effect/sparks(get_turf(M))
- playsound(get_turf(M), "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
-
-/obj/item/slimecross/consuming/sepia
- colour = "sepia"
- effect_desc = "Creates a slime cookie that makes the target do things slightly faster."
- cookietype = /obj/item/slime_cookie/sepia
-
-/obj/item/slime_cookie/sepia
- name = "time cookie"
- desc = "A light brown cookie with a clock pattern. Takes some time to chew."
- icon_state = "sepia"
- taste = "brown sugar and a metronome"
-
-/obj/item/slime_cookie/sepia/do_effect(mob/living/M, mob/user)
- M.apply_status_effect(/datum/status_effect/timecookie)
-
-/obj/item/slimecross/consuming/cerulean
- colour = "cerulean"
- effect_desc = "Creates a slime cookie that has a chance to make another once you eat it."
- cookietype = /obj/item/slime_cookie/cerulean
- cookies = 3 //You're gonna get more.
-
-/obj/item/slime_cookie/cerulean
- name = "duplicookie"
- desc = "A cerulean cookie with strange proportions. It feels like it could break apart easily."
- icon_state = "cerulean"
- taste = "a sugar cookie"
-
-/obj/item/slime_cookie/cerulean/do_effect(mob/living/M, mob/user)
- if(prob(50))
- to_chat(M, " A piece of [src] breaks off while you chew, and falls to the ground.")
- var/obj/item/slime_cookie/cerulean/C = new(get_turf(M))
- C.taste = taste + " and a sugar cookie"
-
-/obj/item/slimecross/consuming/pyrite
- colour = "pyrite"
- effect_desc = "Creates a slime cookie that randomly colors the target."
- cookietype = /obj/item/slime_cookie/pyrite
-
-/obj/item/slime_cookie/pyrite
- name = "color cookie"
- desc = "A yellow cookie with rainbow-colored icing. Reflects the light strangely."
- icon_state = "pyrite"
- taste = "vanilla and " //Randomly selected color dye.
- var/colour = "#FFFFFF"
-
-/obj/item/slime_cookie/pyrite/Initialize()
- . = ..()
- var/tastemessage = "paint remover"
- switch(rand(1,7))
- if(1)
- tastemessage = "red dye"
- colour = "#FF0000"
- if(2)
- tastemessage = "orange dye"
- colour = "#FFA500"
- if(3)
- tastemessage = "yellow dye"
- colour = "#FFFF00"
- if(4)
- tastemessage = "green dye"
- colour = "#00FF00"
- if(5)
- tastemessage = "blue dye"
- colour = "#0000FF"
- if(6)
- tastemessage = "indigo dye"
- colour = "#4B0082"
- if(7)
- tastemessage = "violet dye"
- colour = "#FF00FF"
- taste += tastemessage
-
-/obj/item/slime_cookie/pyrite/do_effect(mob/living/M, mob/user)
- M.add_atom_colour(colour,WASHABLE_COLOUR_PRIORITY)
-
-/obj/item/slimecross/consuming/red
- colour = "red"
- effect_desc = "Creates a slime cookie that creates a spatter of blood on the floor, while also restoring some of the target's blood."
- cookietype = /obj/item/slime_cookie/red
-
-/obj/item/slime_cookie/red
- name = "blood cookie"
- desc = "A red cookie, oozing a thick red fluid. Vampires might enjoy it."
- icon_state = "red"
- taste = "red velvet and iron"
-
-/obj/item/slime_cookie/red/do_effect(mob/living/M, mob/user)
- new /obj/effect/decal/cleanable/blood(get_turf(M))
- playsound(get_turf(M), 'sound/effects/splat.ogg', 10, TRUE)
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- C.blood_volume += 25 //Half a vampire drain.
-
-/obj/item/slimecross/consuming/green
- colour = "green"
- effect_desc = "Creates a slime cookie that is absolutely disgusting, makes the target vomit, however all reagent in their body are also removed."
- cookietype = /obj/item/slime_cookie/green
-
-/obj/item/slime_cookie/green
- name = "gross cookie"
- desc = "A disgusting green cookie, seeping with pus. You kind of feel ill just looking at it."
- icon_state = "green"
- taste = "the contents of your stomach"
-
-/obj/item/slime_cookie/green/do_effect(mob/living/M, mob/user)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- H.vomit(25)
- M.reagents.remove_all()
-
-/obj/item/slimecross/consuming/pink
- colour = "pink"
- effect_desc = "Creates a slime cookie that makes the target want to spread the love."
- cookietype = /obj/item/slime_cookie/pink
-
-/obj/item/slime_cookie/pink
- name = "love cookie"
- desc = "A pink cookie with an icing heart. D'aww."
- icon_state = "pink"
- taste = "love and hugs"
-
-/obj/item/slime_cookie/pink/do_effect(mob/living/M, mob/user)
- M.apply_status_effect(/datum/status_effect/lovecookie)
-
-/obj/item/slimecross/consuming/gold
- colour = "gold"
- effect_desc = "Creates a slime cookie that has a gold coin inside."
- cookietype = /obj/item/slime_cookie/gold
-
-/obj/item/slime_cookie/gold
- name = "gilded cookie"
- desc = "A buttery golden cookie, closer to a bread than anything. May good fortune find you."
- icon_state = "gold"
- taste = "sweet cornbread and wealth"
-
-/obj/item/slime_cookie/gold/do_effect(mob/living/M, mob/user)
- var/obj/item/held = M.get_active_held_item() //This should be itself, but just in case...
- M.dropItemToGround(held)
- var/newcoin = /obj/item/coin/gold
- var/obj/item/coin/C = new newcoin(get_turf(M))
- playsound(get_turf(C), 'sound/items/coinflip.ogg', 50, TRUE)
- M.put_in_hand(C)
-
-/obj/item/slimecross/consuming/oil
- colour = "oil"
- effect_desc = "Creates a slime cookie that slows anyone next to the user."
- cookietype = /obj/item/slime_cookie/oil
-
-/obj/item/slime_cookie/oil
- name = "tar cookie"
- desc = "An oily black cookie, which sticks to your hands. Smells like chocolate."
- icon_state = "oil"
- taste = "rich molten chocolate and tar"
-
-/obj/item/slime_cookie/oil/do_effect(mob/living/M, mob/user)
- M.apply_status_effect(/datum/status_effect/tarcookie)
-
-/obj/item/slimecross/consuming/black
- colour = "black"
- effect_desc = "Creates a slime cookie that makes the target look like a spooky skeleton for a little bit."
- cookietype = /obj/item/slime_cookie/black
-
-/obj/item/slime_cookie/black
- name = "spooky cookie"
- desc = "A pitch black cookie with an icing ghost on the front. Spooky!"
- icon_state = "black"
- taste = "ghosts and stuff"
-
-/obj/item/slime_cookie/black/do_effect(mob/living/M, mob/user)
- M.apply_status_effect(/datum/status_effect/spookcookie)
-
-/obj/item/slimecross/consuming/lightpink
- colour = "light pink"
- effect_desc = "Creates a slime cookie that makes the target, and anyone next to the target, pacifistic for a small amount of time."
- cookietype = /obj/item/slime_cookie/lightpink
-
-/obj/item/slime_cookie/lightpink
- name = "peace cookie"
- desc = "A light pink cookie with a peace symbol in the icing. Lovely!"
- icon_state = "lightpink"
- taste = "strawberry icing and P.L.U.R" //Literal candy raver.
-
-/obj/item/slime_cookie/lightpink/do_effect(mob/living/M, mob/user)
- M.apply_status_effect(/datum/status_effect/peacecookie)
-
-/obj/item/slimecross/consuming/adamantine
- colour = "adamantine"
- effect_desc = "Creates a slime cookie that increases the target's resistance to burn damage."
- cookietype = /obj/item/slime_cookie/adamantine
-
-/obj/item/slime_cookie/adamantine
- name = "crystal cookie"
- desc = "A translucent rock candy in the shape of a cookie. Surprisingly chewy."
- icon_state = "adamantine"
- taste = "crystalline sugar and metal"
-
-/obj/item/slime_cookie/adamantine/do_effect(mob/living/M, mob/user)
- M.apply_status_effect(/datum/status_effect/adamantinecookie)
-
-/obj/item/slimecross/consuming/rainbow
- colour = "rainbow"
- effect_desc = "Creates a slime cookie that has the effect of a random cookie."
-
-/obj/item/slimecross/consuming/rainbow/spawncookie()
- var/cookie_type = pick(subtypesof(/obj/item/slime_cookie))
- var/obj/item/slime_cookie/S = new cookie_type(get_turf(src))
- S.name = "rainbow cookie"
- S.desc = "A beautiful rainbow cookie, constantly shifting colors in the light."
- S.icon_state = "rainbow"
- return S
diff --git a/code/modules/research/xenobiology/crossbreeding/industrial.dm b/code/modules/research/xenobiology/crossbreeding/industrial.dm
deleted file mode 100644
index da9387883f0c..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/industrial.dm
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-Industrial extracts:
- Slowly consume plasma, produce items with it.
-*/
-/obj/item/slimecross/industrial
- name = "industrial extract"
- desc = "A gel-like, sturdy extract, fond of plasma and industry."
- effect = "industrial"
- icon_state = "industrial_still"
- var/plasmarequired = 2 //Units of plasma required to be consumed to produce item.
- var/itempath = /obj/item //The item produced by the extract.
- var/plasmaabsorbed = 0 //Units of plasma aborbed by the extract already. Absorbs at a rate of 2u/obj tick.
- var/itemamount = 1 //How many items to spawn
-
-/obj/item/slimecross/industrial/examine(mob/user)
- . = ..()
- . += "It currently has [plasmaabsorbed] units of plasma floating inside the outer shell, out of [plasmarequired] units."
-
-/obj/item/slimecross/industrial/proc/do_after_spawn(obj/item/spawned)
- return
-
-/obj/item/slimecross/industrial/Initialize()
- . = ..()
- create_reagents(100, INJECTABLE | DRAWABLE)
- START_PROCESSING(SSobj,src)
-
-/obj/item/slimecross/industrial/Destroy()
- STOP_PROCESSING(SSobj,src)
- return ..()
-
-/obj/item/slimecross/industrial/process()
- var/IsWorking = FALSE
- if(reagents.has_reagent(/datum/reagent/toxin/plasma,amount = 2) && plasmarequired > 1) //Can absorb as much as 2
- IsWorking = TRUE
- reagents.remove_reagent(/datum/reagent/toxin/plasma,2)
- plasmaabsorbed += 2
- else if(reagents.has_reagent(/datum/reagent/toxin/plasma,amount = 1)) //Can absorb as little as 1
- IsWorking = TRUE
- reagents.remove_reagent(/datum/reagent/toxin/plasma,1)
- plasmaabsorbed += 1
-
- if(plasmaabsorbed >= plasmarequired)
- playsound(src, 'sound/effects/attackblob.ogg', 50, TRUE)
- plasmaabsorbed -= plasmarequired
- for(var/i = 0, i < itemamount, i++)
- do_after_spawn(new itempath(get_turf(src)))
- else if(IsWorking)
- playsound(src, 'sound/effects/bubbles.ogg', 5, TRUE)
- if(IsWorking)
- icon_state = "industrial"
- else
- icon_state = "industrial_still"
-
-/obj/item/slimecross/industrial/grey
- colour = "grey"
- effect_desc = "Produces monkey cubes."
- itempath = /obj/item/reagent_containers/food/snacks/monkeycube
- itemamount = 5
-
-/obj/item/slimecross/industrial/orange
- colour = "orange"
- effect_desc = "Produces slime zippo lighters."
- plasmarequired = 6
- itempath = /obj/item/lighter/slime
-
-/obj/item/slimecross/industrial/purple
- colour = "purple"
- effect_desc = "Produces autoinjectors with regen jelly inside."
- plasmarequired = 5
- itempath = /obj/item/slimecrossbeaker/autoinjector/regenpack
-
-/obj/item/slimecross/industrial/blue
- colour = "blue"
- effect_desc = "Produces full fire extinguishers."
- plasmarequired = 10
- itempath = /obj/item/extinguisher
-
-/obj/item/slimecross/industrial/metal
- colour = "metal"
- effect_desc = "Produces metal sheets."
- plasmarequired = 3
- itempath = /obj/item/stack/sheet/metal/ten
-
-/obj/item/slimecross/industrial/yellow
- colour = "yellow"
- effect_desc = "Produces high capacity power cells, which are not fully charged on creation."
- plasmarequired = 5
- itempath = /obj/item/stock_parts/cell/high
-
-/obj/item/slimecross/industrial/yellow/do_after_spawn(obj/item/spawned)
- var/obj/item/stock_parts/cell/high/C = spawned
- if(istype(C))
- C.charge = rand(0,C.maxcharge/2)
-
-/obj/item/slimecross/industrial/darkpurple
- colour = "dark purple"
- effect_desc = "Produces plasma... for plasma."
- plasmarequired = 10
- itempath = /obj/item/stack/sheet/mineral/plasma
-
-/obj/item/slimecross/industrial/darkblue
- colour = "dark blue"
- effect_desc = "Produces one-use fireproofing potions."
- plasmarequired = 6
- itempath = /obj/item/slimepotion/fireproof
-
-/obj/item/slimecross/industrial/darkblue/do_after_spawn(obj/item/spawned)
- var/obj/item/slimepotion/fireproof/potion = spawned
- if(istype(potion))
- potion.uses = 1
-
-/obj/item/slimecross/industrial/silver
- colour = "silver"
- effect_desc = "Produces random food and drink items."
- plasmarequired = 1
- //Item picked below.
-
-/obj/item/slimecross/industrial/silver/process()
- itempath = pick(list(get_random_food(), get_random_drink()))
- ..()
-
-/obj/item/slimecross/industrial/bluespace
- colour = "bluespace"
- effect_desc = "Produces synthetic bluespace crystals."
- plasmarequired = 7
- itempath = /obj/item/stack/ore/bluespace_crystal/artificial
-
-/obj/item/slimecross/industrial/sepia
- colour = "sepia"
- effect_desc = "Produces cameras."
- plasmarequired = 2
- itempath = /obj/item/camera
-
-/obj/item/slimecross/industrial/cerulean
- colour = "cerulean"
- effect_desc = "Produces normal slime extract enhancers."
- plasmarequired = 5
- itempath = /obj/item/slimepotion/enhancer
-
-/obj/item/slimecross/industrial/pyrite
- colour = "pyrite"
- effect_desc = "Produces cans of spraypaint."
- plasmarequired = 2
- itempath = /obj/item/toy/crayon/spraycan
-
-/obj/item/slimecross/industrial/red
- colour = "red"
- effect_desc = "Produces blood orbs."
- plasmarequired = 5
- itempath = /obj/item/slimecrossbeaker/bloodpack
-
-/obj/item/slimecross/industrial/green
- colour = "green"
- effect_desc = "Produces self-use-only slime jelly autoinjectors."
- plasmarequired = 7
- itempath = /obj/item/slimecrossbeaker/autoinjector/slimejelly
-
-/obj/item/slimecross/industrial/pink
- colour = "pink"
- effect_desc = "Produces synthpax and space drug autoinjectors."
- plasmarequired = 6
- itempath = /obj/item/slimecrossbeaker/autoinjector/peaceandlove
-
-/obj/item/slimecross/industrial/gold
- colour = "gold"
- effect_desc = "Produces random coins."
- plasmarequired = 10
-
-/obj/item/slimecross/industrial/gold/process()
- itempath = pick(/obj/item/coin/silver, /obj/item/coin/iron, /obj/item/coin/gold, /obj/item/coin/diamond, /obj/item/coin/plasma, /obj/item/coin/uranium)
- ..()
-
-/obj/item/slimecross/industrial/oil
- colour = "oil"
- effect_desc = "Produces IEDs."
- plasmarequired = 4
- itempath = /obj/item/grenade/iedcasing/spawned
-
-/obj/item/slimecross/industrial/black //What does this have to do with black slimes? No clue! Fun, though
- colour = "black"
- effect_desc = "Produces slime brand regenerative cigarettes."
- plasmarequired = 6
- itempath = /obj/item/storage/fancy/cigarettes/cigpack_xeno
-
-/obj/item/slimecross/industrial/lightpink
- colour = "light pink"
- effect_desc = "Produces heart shaped boxes that have candies in them."
- plasmarequired = 3
- itempath = /obj/item/storage/fancy/heart_box
-
-/obj/item/slimecross/industrial/rainbow
- colour = "rainbow"
- effect_desc = "Produces random slime extracts."
- plasmarequired = 5
- //Item picked below.
-
-/obj/item/slimecross/industrial/rainbow/process()
- itempath = pick(subtypesof(/obj/item/slime_extract))
- ..()
diff --git a/code/modules/research/xenobiology/crossbreeding/mutative.dm b/code/modules/research/xenobiology/crossbreeding/mutative.dm
deleted file mode 100644
index 6b58a7aa0c93..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/mutative.dm
+++ /dev/null
@@ -1,32 +0,0 @@
-/obj/item/slimecross/mutative
- name = "mutative extract"
- desc = "It's softly pulsing with mutagenic energy."
- effect = "mutative"
- icon_state = "mutative"
-
-/obj/item/slimecross/mutative/Initialize()
- . = ..()
- create_reagents(10, INJECTABLE | DRAWABLE)
-
-/obj/item/slimecross/mutative/attack_self(mob/user)
- if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10))
- to_chat(user, " This extract needs to be full of plasma to activate!")
- return
- reagents.remove_reagent(/datum/reagent/toxin/plasma,10)
- to_chat(user, " You squeeze the extract, and it absorbs the plasma!")
- playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE)
- playsound(src, 'sound/magic/fireball.ogg', 50, TRUE)
- do_effect(user)
-
-/obj/item/slimecross/mutative/proc/do_effect(mob/user) //If, for whatever reason, you don't want to delete the extract, don't do ..()
- qdel(src)
- return
-
-/obj/item/slimecross/mutative/rainbow
- colour = "rainbow"
- effect_desc = "Hardens into a shard of slimy crystal. Prick yourself with it to bring forth a Slime Guardian."
-
-/obj/item/slimecross/mutative/rainbow/do_effect(mob/user)
- user.visible_message(" [src] collapses in a chromatic flash, transforming into jagged crystal!")
- new /obj/item/guardiancreator/slime(get_turf(user))
- ..()
diff --git a/code/modules/research/xenobiology/crossbreeding/prismatic.dm b/code/modules/research/xenobiology/crossbreeding/prismatic.dm
deleted file mode 100644
index 9cfc4542d526..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/prismatic.dm
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-Prismatic extracts:
- Becomes an infinite-use paintbrush.
-*/
-/obj/item/slimecross/prismatic
- name = "prismatic extract"
- desc = "It's constantly wet with a semi-transparent, colored goo."
- effect = "prismatic"
- effect_desc = "When used it paints whatever it hits."
- icon_state = "prismatic"
- var/paintcolor = "#FFFFFF"
-
-/obj/item/slimecross/prismatic/afterattack(turf/target, mob/user, proximity)
- if(!proximity)
- return
- if(!istype(target) || isspaceturf(target))
- return
- target.add_atom_colour(paintcolor, WASHABLE_COLOUR_PRIORITY)
- playsound(target, 'sound/effects/slosh.ogg', 20, TRUE)
-
-/obj/item/slimecross/prismatic/grey/
- colour = "grey"
- desc = "It's constantly wet with a pungent-smelling, clear chemical."
-
-/obj/item/slimecross/prismatic/grey/afterattack(turf/target, mob/user, proximity)
- . = ..()
- if(!proximity)
- return
- if(istype(target) && target.color != initial(target.color))
- target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
- playsound(target, 'sound/effects/slosh.ogg', 20, TRUE)
-
-/obj/item/slimecross/prismatic/orange
- paintcolor = "#FFA500"
- colour = "orange"
-
-/obj/item/slimecross/prismatic/purple
- paintcolor = "#B19CD9"
- colour = "purple"
-
-/obj/item/slimecross/prismatic/blue
- paintcolor = "#ADD8E6"
- colour = "blue"
-
-/obj/item/slimecross/prismatic/metal
- paintcolor = "#7E7E7E"
- colour = "metal"
-
-/obj/item/slimecross/prismatic/yellow
- paintcolor = "#FFFF00"
- colour = "yellow"
-
-/obj/item/slimecross/prismatic/darkpurple
- paintcolor = "#551A8B"
- colour = "dark purple"
-
-/obj/item/slimecross/prismatic/darkblue
- paintcolor = "#0000FF"
- colour = "dark blue"
-
-/obj/item/slimecross/prismatic/silver
- paintcolor = "#D3D3D3"
- colour = "silver"
-
-/obj/item/slimecross/prismatic/bluespace
- paintcolor = "#32CD32"
- colour = "bluespace"
-
-/obj/item/slimecross/prismatic/sepia
- paintcolor = "#704214"
- colour = "sepia"
-
-/obj/item/slimecross/prismatic/cerulean
- paintcolor = "#2956B2"
- colour = "cerulean"
-
-/obj/item/slimecross/prismatic/pyrite
- paintcolor = "#FAFAD2"
- colour = "pyrite"
-
-/obj/item/slimecross/prismatic/red
- paintcolor = "#FF0000"
- colour = "red"
-
-/obj/item/slimecross/prismatic/green
- paintcolor = "#00FF00"
- colour = "green"
-
-/obj/item/slimecross/prismatic/pink
- paintcolor = "#FF69B4"
- colour = "pink"
-
-/obj/item/slimecross/prismatic/gold
- paintcolor = "#FFD700"
- colour = "gold"
-
-/obj/item/slimecross/prismatic/oil
- paintcolor = "#505050"
- colour = "oil"
-
-/obj/item/slimecross/prismatic/black
- paintcolor = "#000000"
- colour = "black"
-
-/obj/item/slimecross/prismatic/lightpink
- paintcolor = "#FFB6C1"
- colour = "light pink"
-
-/obj/item/slimecross/prismatic/adamantine
- paintcolor = "#008B8B"
- colour = "adamantine"
-
-/obj/item/slimecross/prismatic/rainbow
- paintcolor = "#FFFFFF"
- colour = "rainbow"
-
-/obj/item/slimecross/prismatic/rainbow/attack_self(mob/user)
- var/newcolor = input(user, "Choose the slime color:", "Color change",paintcolor) as color|null
- if(user.get_active_held_item() != src || user.stat != CONSCIOUS || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
- return
- if(!newcolor)
- return
- paintcolor = newcolor
- return
diff --git a/code/modules/research/xenobiology/crossbreeding/recurring.dm b/code/modules/research/xenobiology/crossbreeding/recurring.dm
deleted file mode 100644
index 4a094744f7f8..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/recurring.dm
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-Recurring extracts:
- Generates a new charge every few seconds.
- If depleted of its' last charge, stops working.
-*/
-/obj/item/slimecross/recurring
- name = "recurring extract"
- desc = "A tiny, glowing core, wrapped in several layers of goo."
- effect = "recurring"
- icon_state = "recurring"
- var/extract_type
- var/obj/item/slime_extract/extract
- var/cooldown = 0
- var/max_cooldown = 5 //In sets of 2 seconds.
-
-/obj/item/slimecross/recurring/Initialize()
- . = ..()
- extract = new extract_type(src.loc)
- visible_message(" [src] wraps a layer of goo around itself!")
- extract.name = name
- extract.desc = desc
- extract.icon = icon
- extract.icon_state = icon_state
- extract.color = color
- extract.recurring = TRUE
- src.forceMove(extract)
- START_PROCESSING(SSobj,src)
-
-/obj/item/slimecross/recurring/process()
- if(cooldown > 0)
- cooldown--
- else if(extract.Uses < 10 && extract.Uses > 0)
- extract.Uses++
- cooldown = max_cooldown
- else if(extract.Uses <= 0)
- extract.visible_message(" The light inside [extract] flickers and dies out.")
- extract.desc = "A tiny, inert core, bleeding dark, cerulean-colored goo."
- extract.icon_state = "prismatic"
- qdel(src)
-
-/obj/item/slimecross/recurring/Destroy()
- . = ..()
- STOP_PROCESSING(SSobj,src)
-
-/obj/item/slimecross/recurring/grey
- extract_type = /obj/item/slime_extract/grey
- colour = "grey"
-
-/obj/item/slimecross/recurring/orange
- extract_type = /obj/item/slime_extract/orange
- colour = "orange"
-
-/obj/item/slimecross/recurring/purple
- extract_type = /obj/item/slime_extract/purple
- colour = "purple"
-
-/obj/item/slimecross/recurring/blue
- extract_type = /obj/item/slime_extract/blue
- colour = "blue"
-
-/obj/item/slimecross/recurring/metal
- extract_type = /obj/item/slime_extract/metal
- colour = "metal"
- max_cooldown = 10
-
-/obj/item/slimecross/recurring/yellow
- extract_type = /obj/item/slime_extract/yellow
- colour = "yellow"
- max_cooldown = 10
-
-/obj/item/slimecross/recurring/darkpurple
- extract_type = /obj/item/slime_extract/darkpurple
- colour = "dark purple"
- max_cooldown = 10
-
-/obj/item/slimecross/recurring/darkblue
- extract_type = /obj/item/slime_extract/darkblue
- colour = "dark blue"
-
-/obj/item/slimecross/recurring/silver
- extract_type = /obj/item/slime_extract/silver
- colour = "silver"
-
-/obj/item/slimecross/recurring/bluespace
- extract_type = /obj/item/slime_extract/bluespace
- colour = "bluespace"
-
-/obj/item/slimecross/recurring/sepia
- extract_type = /obj/item/slime_extract/sepia
- colour = "sepia"
- max_cooldown = 18 //No infinite timestop for you!
-
-/obj/item/slimecross/recurring/cerulean
- extract_type = /obj/item/slime_extract/cerulean
- colour = "cerulean"
-
-/obj/item/slimecross/recurring/pyrite
- extract_type = /obj/item/slime_extract/pyrite
- colour = "pyrite"
-
-/obj/item/slimecross/recurring/red
- extract_type = /obj/item/slime_extract/red
- colour = "red"
-
-/obj/item/slimecross/recurring/green
- extract_type = /obj/item/slime_extract/green
- colour = "green"
-
-/obj/item/slimecross/recurring/pink
- extract_type = /obj/item/slime_extract/pink
- colour = "pink"
-
-/obj/item/slimecross/recurring/gold
- extract_type = /obj/item/slime_extract/gold
- colour = "gold"
- max_cooldown = 15
-
-/obj/item/slimecross/recurring/oil
- extract_type = /obj/item/slime_extract/oil
- colour = "oil" //Why would you want this?
-
-/obj/item/slimecross/recurring/black
- extract_type = /obj/item/slime_extract/black
- colour = "black"
-
-/obj/item/slimecross/recurring/lightpink
- extract_type = /obj/item/slime_extract/lightpink
- colour = "light pink"
-
-/obj/item/slimecross/recurring/adamantine
- extract_type = /obj/item/slime_extract/adamantine
- colour = "adamantine"
- max_cooldown = 10
-
-/obj/item/slimecross/recurring/rainbow
- extract_type = /obj/item/slime_extract/rainbow
- colour = "rainbow"
- max_cooldown = 20 //It's pretty powerful.
diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
deleted file mode 100644
index 75a1201d924a..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
-Regenerative extracts:
- Work like a legion regenerative core.
- Has a unique additional effect.
-*/
-/obj/item/slimecross/regenerative
- name = "regenerative extract"
- desc = "It's filled with a milky substance, and pulses like a heartbeat."
- effect = "regenerative"
- icon_state = "regenerative"
-
- var/oxy_loss = 0
- var/tox_loss = 0
- var/fire_loss = 0
- var/brute_loss = 0
- var/stamina_loss = 0
- var/blood_loss = 100
- var/organ_loss = 3
- var/slime_heal_modifier = 1 //Specialised types only heal half
- var/jelly_amount = 7.5
- var/bone_loss = FALSE
- var/life_loss = FALSE
- var/slime_delay = 10
-
-/obj/item/slimecross/regenerative/proc/core_effect(mob/living/carbon/human/target, mob/user)
- return
-/obj/item/slimecross/regenerative/proc/core_effect_before(mob/living/carbon/human/target, mob/user)
- return
-
-/obj/item/slimecross/regenerative/afterattack(atom/target,mob/user,prox)
- . = ..()
- if(!prox || !isliving(target))
- return
- var/mob/living/H = target
- if(H.stat == DEAD && life_loss)
- slime_delay = 200 //Reviving the dead takes a while, 20 seconds to be exact
- to_chat(user, " You begin using the [src] to try and bring [H] back from the dead...")
- else
- slime_delay = 10
- if(H.stat == DEAD && !life_loss) // Won't revive the dead, except for specific extracts
- to_chat(user, " [src] will not work on the dead!")
- return
- if(H != user)
- if(!do_after(user, slime_delay, H)) // 1 second delay
- return FALSE
- user.visible_message(" [user] crushes the [src] over [H], the milky goo quickly regenerating some of [H.p_their()] injuries!",
- " You squeeze the [src], and it bursts over [H], the milky goo regenerating some of [H.p_their()] injuries.")
- else
- if(!do_after(user, (slime_delay * 1.5), H)) // 1.5 second delay
- return FALSE
- user.visible_message(" [user] crushes the [src] over [user.p_them()]self, the milky goo quickly regenerating some of [user.p_their()] injuries!",
- " You squeeze the [src], and it bursts in your hand, splashing you with milky goo which quickly regenerates some of your injuries!")
-// Slimes are good at healing clone damage, but don't heal other damage types as much. Additionally heals 15 organ damage.
- core_effect_before(H, user) // can affect heal multiplier
- oxy_loss = (12.5 + (H.getOxyLoss() * 0.4 * slime_heal_modifier))
- tox_loss = (12.5 + (H.getToxLoss() * 0.4 * slime_heal_modifier))
- fire_loss = (12.5 + (H.getFireLoss() * 0.4 * slime_heal_modifier))
- brute_loss = (12.5 + (H.getBruteLoss() * 0.4 * slime_heal_modifier))
- stamina_loss = (12.5 + (H.getStaminaLoss() * 0.5 * slime_heal_modifier))
- core_effect(H, user) // can affect specific healing values
- H.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,jelly_amount) // Splits the healing effect across an instant heal, and a smaller heal after.
- H.specific_heal(brute_amt = brute_loss, fire_amt = fire_loss, tox_amt = tox_loss, oxy_amt = oxy_loss, stam_amt = stamina_loss, organ_amt = organ_loss, clone_amt = 100, blood_amt = blood_loss, specific_bones = bone_loss, specific_revive = life_loss)
- playsound(target, 'sound/effects/splat.ogg', 40, TRUE)
- qdel(src)
-
-/obj/item/slimecross/regenerative/grey
- colour = "grey" //Has no bonus effect.
- effect_desc = "Partially heals the target and does nothing else."
-
-/obj/item/slimecross/regenerative/orange
- colour = "orange"
-
-/obj/item/slimecross/regenerative/orange/core_effect_before(mob/living/target, mob/user)
- target.visible_message(" The [src] boils over!")
- for(var/turf/turf in range(1,target))
- if(!locate(/obj/effect/hotspot) in turf)
- new /obj/effect/hotspot(turf)
-
-/obj/item/slimecross/regenerative/purple
- colour = "purple"
- effect_desc = "Weakly heals the target, but treats toxin damage especially well. Additionally injects them with some additional regen jelly."
-
-/obj/item/slimecross/regenerative/purple/core_effect_before(mob/living/target, mob/user)
- slime_heal_modifier = 0.75
-
-/obj/item/slimecross/regenerative/purple/core_effect(mob/living/target, mob/user)
- tox_loss = (10 + (target.getBruteLoss() * 0.8))
- jelly_amount += 10
-
-/obj/item/slimecross/regenerative/blue
- colour = "blue"
- effect_desc = "Weakly heals the target, but extra effective at treating burns. Additionally makes the floor wet."
-
-/obj/item/slimecross/regenerative/blue/core_effect_before(mob/living/target, mob/user)
- slime_heal_modifier = 0.5
-
-/obj/item/slimecross/regenerative/blue/core_effect(mob/living/target, mob/user)
- if(isturf(target.loc))
- var/turf/open/T = get_turf(target)
- T.MakeSlippery(TURF_WET_WATER, min_wet_time = 10, wet_time_to_add = 5)
- target.visible_message(" The milky goo in the extract gets all over the floor!")
- fire_loss = (10 + (target.getFireLoss() * 0.8))
- jelly_amount *= 0.2
-
-/obj/item/slimecross/regenerative/metal
- colour = "metal"
- effect_desc = "Barely heals the target, but fixes their bones .Additionally encases the target in a locker."
-
-/obj/item/slimecross/regenerative/metal/core_effect_before(mob/living/target, mob/user)
- slime_heal_modifier = 0.1
-
-/obj/item/slimecross/regenerative/metal/core_effect(mob/living/target, mob/user)
- target.visible_message(" The milky goo hardens and reshapes itself, encasing [target]!")
- var/obj/structure/closet/C = new /obj/structure/closet(target.loc)
- C.name = "slimy closet"
- C.desc = "Looking closer, it seems to be made of a sort of solid, opaque, metal-like goo."
- target.forceMove(C)
- bone_loss = TRUE
- jelly_amount *= 0.2
-
-/obj/item/slimecross/regenerative/yellow
- colour = "yellow"
- effect_desc = "Partially heals the target, can revive the dead. additionally Partially recharges a single item on the target."
- life_loss = TRUE //Will revive the dead. Heals normally unless target is dead, in which case it heals less.
-
-/obj/item/slimecross/regenerative/yellow/core_effect_before(mob/living/target, mob/user)
- if(target.stat == DEAD)
- slime_heal_modifier = 0.1 //use surgery to fix wounds
- else
- slime_heal_modifier = 0.75 //discourages spamming these to revive a target, combine with other cores
-
-/obj/item/slimecross/regenerative/yellow/core_effect(mob/living/target, mob/user)
- var/list/batteries = list()
- for(var/obj/item/stock_parts/cell/C in target.GetAllContents())
- if(C.charge < C.maxcharge)
- batteries += C
- if(batteries.len)
- var/obj/item/stock_parts/cell/ToCharge = pick(batteries)
- ToCharge.charge = ToCharge.maxcharge
- to_chat(target, " You feel a strange electrical pulse, and one of your electrical items was recharged.")
- if(target.stat == DEAD)
- blood_loss = 100
- organ_loss = 30 // More effective at fixing organs if the target is dead
- jelly_amount *= 0.2
- target.visible_message(" The [src] sparks as it tries to revive [target]!")
-
-/obj/item/slimecross/regenerative/darkpurple
- colour = "dark purple"
- effect_desc = "Partially heals the target and gives them purple clothing if they are naked."
-
-/obj/item/slimecross/regenerative/darkpurple/core_effect(mob/living/target, mob/user)
- var/equipped = 0
- equipped += target.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/purple(null), ITEM_SLOT_FEET)
- equipped += target.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(null), ITEM_SLOT_ICLOTHING)
- equipped += target.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/purple(null), ITEM_SLOT_GLOVES)
- equipped += target.equip_to_slot_or_del(new /obj/item/clothing/head/soft/purple(null), ITEM_SLOT_HEAD)
- if(equipped > 0)
- target.visible_message(" The milky goo congeals into clothing!")
-
-/obj/item/slimecross/regenerative/darkblue
- colour = "dark blue"
- effect_desc = "Partially heals the target and fireproofs their clothes."
-
-/obj/item/slimecross/regenerative/darkblue/core_effect(mob/living/target, mob/user)
- if(!ishuman(target))
- return
- var/mob/living/carbon/human/H = target
- var/fireproofed = FALSE
- if(H.get_item_by_slot(ITEM_SLOT_OCLOTHING))
- fireproofed = TRUE
- var/obj/item/clothing/C = H.get_item_by_slot(ITEM_SLOT_OCLOTHING)
- fireproof(C)
- if(H.get_item_by_slot(ITEM_SLOT_HEAD))
- fireproofed = TRUE
- var/obj/item/clothing/C = H.get_item_by_slot(ITEM_SLOT_HEAD)
- fireproof(C)
- if(fireproofed)
- target.visible_message(" Some of [target]'s clothing gets coated in the goo, and turns blue!")
-
-/obj/item/slimecross/regenerative/darkblue/proc/fireproof(obj/item/clothing/C)
- C.name = "fireproofed [C.name]"
- C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
- C.add_atom_colour("#000080", FIXED_COLOUR_PRIORITY)
- C.max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- C.heat_protection = C.body_parts_covered
- C.resistance_flags |= FIRE_PROOF
-
-/obj/item/slimecross/regenerative/silver
- colour = "silver"
- effect_desc = "Partially heals the target and makes their belly feel round and full."
-
-/obj/item/slimecross/regenerative/silver/core_effect(mob/living/target, mob/user)
- target.set_nutrition(NUTRITION_LEVEL_FULL - 1)
- to_chat(target, " You feel satiated.")
-
-/obj/item/slimecross/regenerative/bluespace
- colour = "bluespace"
- effect_desc = "Partially heals the target and teleports them to where this core was created."
- var/turf/open/T
-
-/obj/item/slimecross/regenerative/bluespace/core_effect(mob/living/target, mob/user)
- target.visible_message(" [src] disappears in a shower of sparks!"," The milky goo teleports you somewhere it remembers!")
- do_sparks(5,FALSE,target)
- target.forceMove(T)
- do_sparks(5,FALSE,target)
-
-/obj/item/slimecross/regenerative/bluespace/Initialize()
- . = ..()
- T = get_turf(src)
-
-/obj/item/slimecross/regenerative/sepia
- colour = "sepia"
- effect_desc = "Partially heals the target and stops time."
-
-/obj/item/slimecross/regenerative/sepia/core_effect_before(mob/living/target, mob/user)
- to_chat(target, " You try to forget how you feel.")
- target.AddComponent(/datum/component/dejavu)
-
-/obj/item/slimecross/regenerative/cerulean
- colour = "cerulean"
- effect_desc = "Slightly heals the target, but provides a boost of oxygen for a while. Additionally makes a second regenerative core with no special effects."
-
-/obj/item/slimecross/regenerative/cerulean/core_effect_before(mob/living/target, mob/user)
- slime_heal_modifier = 0.5
-
-/obj/item/slimecross/regenerative/cerulean/core_effect(mob/living/target, mob/user)
- src.forceMove(user.loc)
- var/obj/item/slimecross/X = new /obj/item/slimecross/regenerative(user.loc)
- X.name = name
- X.desc = desc
- user.put_in_active_hand(X)
- oxy_loss = 150
- target.reagents.add_reagent(/datum/reagent/medicine/salbutamol,15) //Similar to the luminescent effect, lets you breathe without oxygen for a while.
- to_chat(user, " Some of the milky goo congeals in your hand!")
-
-/obj/item/slimecross/regenerative/pyrite
- colour = "pyrite"
- effect_desc = "Partially heals and randomly colors the target."
-
-/obj/item/slimecross/regenerative/pyrite/core_effect(mob/living/target, mob/user)
- target.visible_message(" The milky goo coating [target] leaves [target.p_them()] a different color!")
- target.add_atom_colour(rgb(rand(0,255),rand(0,255),rand(0,255)),WASHABLE_COLOUR_PRIORITY)
-
-/obj/item/slimecross/regenerative/red
- colour = "red"
- effect_desc = "Slightly heals the target and injects them with a lot of blood, what a rush!"
-
-/obj/item/slimecross/regenerative/red/core_effect_before(mob/living/target, mob/user)
- slime_heal_modifier = 0.5
-
-/obj/item/slimecross/regenerative/red/core_effect(mob/living/target, mob/user)
- to_chat(target, " You feel... faster.")
- target.reagents.add_reagent(/datum/reagent/medicine/ephedrine,3)
- blood_loss += 700
-
-/obj/item/slimecross/regenerative/green
- colour = "green"
- effect_desc = "Weakly heals the target, but fixes their organs .Additionally changes the spieces or color of a slime or jellyperson."
-
-/obj/item/slimecross/regenerative/green/core_effect_before(mob/living/target, mob/user)
- slime_heal_modifier = 0.5
-
-/obj/item/slimecross/regenerative/green/core_effect(mob/living/target, mob/user)
- if(isslime(target))
- target.visible_message(" The [target] suddenly changes color!")
- var/mob/living/simple_animal/slime/S = target
- S.random_colour()
- organ_loss += 17
-
-
-/obj/item/slimecross/regenerative/pink
- colour = "pink"
- effect_desc = "Partially heals the target and injects them with some krokodil."
-
-/obj/item/slimecross/regenerative/pink/core_effect(mob/living/target, mob/user)
- to_chat(target, " You feel more calm.")
- target.reagents.add_reagent(/datum/reagent/drug/krokodil,4)
-
-/obj/item/slimecross/regenerative/gold
- colour = "gold"
- effect_desc = "Partially heals the target and produces a random coin."
-
-/obj/item/slimecross/regenerative/gold/core_effect(mob/living/target, mob/user)
- var/newcoin = pick(/obj/item/coin/silver, /obj/item/coin/iron, /obj/item/coin/gold, /obj/item/coin/diamond, /obj/item/coin/plasma, /obj/item/coin/uranium)
- var/obj/item/coin/C = new newcoin(target.loc)
- playsound(C, 'sound/items/coinflip.ogg', 50, TRUE)
- target.put_in_hand(C)
-
-/obj/item/slimecross/regenerative/oil
- colour = "oil"
- effect_desc = "Partially heals the target and flashes everyone in sight."
-
-/obj/item/slimecross/regenerative/oil/core_effect(mob/living/target, mob/user)
- playsound(src, 'sound/weapons/flash.ogg', 100, TRUE)
- for(var/mob/living/L in view(user,7))
- L.flash_act()
-
-/obj/item/slimecross/regenerative/black
- colour = "black"
- effect_desc = "Partially heals the target and creates a duplicate of them, that drops dead soon after."
-
-/obj/item/slimecross/regenerative/black/core_effect_before(mob/living/target, mob/user)
- var/dummytype = target.type
- var/mob/living/dummy = new dummytype(target.loc)
- to_chat(target, " The milky goo flows from your skin, forming an imperfect copy of you.")
- if(iscarbon(target))
- var/mob/living/carbon/T = target
- var/mob/living/carbon/D = dummy
- T.dna.transfer_identity(D)
- D.updateappearance(mutcolor_update=1)
- D.real_name = T.real_name
- dummy.adjustBruteLoss(target.getBruteLoss())
- dummy.adjustFireLoss(target.getFireLoss())
- dummy.adjustToxLoss(target.getToxLoss())
- dummy.adjustOxyLoss(200)
-
-/obj/item/slimecross/regenerative/lightpink
- colour = "light pink"
- effect_desc = "Partially heals the target and also heals the user."
-
-// Doesn't heal the user as much as the target
-/obj/item/slimecross/regenerative/lightpink/core_effect(mob/living/target, mob/user)
- if(!isliving(user))
- return
- if(target == user)
- return
- var/mob/living/U = user
- var/oxy_loss = (10 + (U.getOxyLoss() * 0.3))
- var/tox_loss = (10 + (U.getToxLoss() * 0.3))
- var/fire_loss = (10 + (U.getFireLoss() * 0.3))
- var/brute_loss = (10 + (U.getBruteLoss() * 0.3))
- var/stamina_loss = (10 + (U.getStaminaLoss() * 0.35))
- U.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10) // Splits the healing effect across an instant heal, and a smaller heal after.
- U.specific_heal(brute_amt = brute_loss, fire_amt = fire_loss, tox_amt = tox_loss, oxy_amt = oxy_loss, stam_amt = stamina_loss, organ_amt = 2, clone_amt = 100)
- to_chat(U, " Some of the milky goo sprays onto you, as well!")
-
-/obj/item/slimecross/regenerative/adamantine
- colour = "adamantine"
- effect_desc = "weakly heals the target, but extra effective at treating brute trauma. Additionally boosts their armor."
-
-/obj/item/slimecross/regenerative/adamantine/core_effect_before(mob/living/target, mob/user)
- slime_heal_modifier = 0.3
-
-/obj/item/slimecross/regenerative/adamantine/core_effect(mob/living/target, mob/user) //WIP - Find out why this doesn't work.
- target.apply_status_effect(STATUS_EFFECT_SLIMESKIN)
- brute_loss = (10 + (target.getBruteLoss() * 0.65)) //most common damage type, let's not go overboard
- jelly_amount *= 0.5
-
-/obj/item/slimecross/regenerative/rainbow
- colour = "rainbow"
- effect_desc = "Partially heals the target and temporarily makes them immortal, but pacifistic."
-
-/obj/item/slimecross/regenerative/rainbow/core_effect(mob/living/target, mob/user)
- target.apply_status_effect(STATUS_EFFECT_RAINBOWPROTECTION)
diff --git a/code/modules/research/xenobiology/crossbreeding/reproductive.dm b/code/modules/research/xenobiology/crossbreeding/reproductive.dm
deleted file mode 100644
index f51c5a271177..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/reproductive.dm
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-Reproductive extracts:
- When fed three monkey cubes, produces between
- 1 and 4 normal slime extracts of the same colour.
-*/
-/obj/item/slimecross/reproductive
- name = "reproductive extract"
- desc = "It pulses with a strange hunger."
- icon_state = "reproductive"
- effect = "reproductive"
- effect_desc = "When fed monkey cubes it produces more extracts. Bio bag compatible as well."
- var/extract_type = /obj/item/slime_extract/
- var/cubes_eaten = 0
- var/last_produce = 0
- var/cooldown = 30 // 3 seconds.
-
-/obj/item/slimecross/reproductive/attackby(obj/item/O, mob/user)
- if((last_produce + cooldown) > world.time)
- to_chat(user, " [src] is still digesting!")
- return
- if(istype(O, /obj/item/storage/bag/bio))
- var/list/inserted = list()
- SEND_SIGNAL(O, COMSIG_TRY_STORAGE_TAKE_TYPE, /obj/item/reagent_containers/food/snacks/monkeycube, src, 1, null, null, user, inserted)
- if(inserted.len)
- var/obj/item/reagent_containers/food/snacks/monkeycube/M = inserted[1]
- if(istype(M))
- eat_cube(M, user)
- else
- to_chat(user, " There are no monkey cubes in the bio bag!")
- if(istype(O,/obj/item/reagent_containers/food/snacks/monkeycube))
- eat_cube(O, user)
- if(cubes_eaten >= 3)
- var/cores = rand(1,4)
- visible_message(" [src] briefly swells to a massive size, and expels [cores] extract[cores > 1 ? "s":""]!")
- playsound(src, 'sound/effects/splat.ogg', 40, TRUE)
- last_produce = world.time
- for(var/i = 0, i < cores, i++)
- new extract_type(get_turf(loc))
- cubes_eaten = 0
-
-/obj/item/slimecross/reproductive/proc/eat_cube(obj/item/reagent_containers/food/snacks/monkeycube, mob/user)
- qdel(monkeycube)
- cubes_eaten++
- to_chat(user, " You feed [monkeycube] to [src], and it pulses gently.")
- playsound(src, 'sound/items/eatfood.ogg', 20, TRUE)
-
-/obj/item/slimecross/reproductive/grey
- extract_type = /obj/item/slime_extract/grey
- colour = "grey"
-
-/obj/item/slimecross/reproductive/orange
- extract_type = /obj/item/slime_extract/orange
- colour = "orange"
-
-/obj/item/slimecross/reproductive/purple
- extract_type = /obj/item/slime_extract/purple
- colour = "purple"
-
-/obj/item/slimecross/reproductive/blue
- extract_type = /obj/item/slime_extract/blue
- colour = "blue"
-
-/obj/item/slimecross/reproductive/metal
- extract_type = /obj/item/slime_extract/metal
- colour = "metal"
-
-/obj/item/slimecross/reproductive/yellow
- extract_type = /obj/item/slime_extract/yellow
- colour = "yellow"
-
-/obj/item/slimecross/reproductive/darkpurple
- extract_type = /obj/item/slime_extract/darkpurple
- colour = "dark purple"
-
-/obj/item/slimecross/reproductive/darkblue
- extract_type = /obj/item/slime_extract/darkblue
- colour = "dark blue"
-
-/obj/item/slimecross/reproductive/silver
- extract_type = /obj/item/slime_extract/silver
- colour = "silver"
-
-/obj/item/slimecross/reproductive/bluespace
- extract_type = /obj/item/slime_extract/bluespace
- colour = "bluespace"
-
-/obj/item/slimecross/reproductive/sepia
- extract_type = /obj/item/slime_extract/sepia
- colour = "sepia"
-
-/obj/item/slimecross/reproductive/cerulean
- extract_type = /obj/item/slime_extract/cerulean
- colour = "cerulean"
-
-/obj/item/slimecross/reproductive/pyrite
- extract_type = /obj/item/slime_extract/pyrite
- colour = "pyrite"
-
-/obj/item/slimecross/reproductive/red
- extract_type = /obj/item/slime_extract/red
- colour = "red"
-
-/obj/item/slimecross/reproductive/green
- extract_type = /obj/item/slime_extract/green
- colour = "green"
-
-/obj/item/slimecross/reproductive/pink
- extract_type = /obj/item/slime_extract/pink
- colour = "pink"
-
-/obj/item/slimecross/reproductive/gold
- extract_type = /obj/item/slime_extract/gold
- colour = "gold"
-
-/obj/item/slimecross/reproductive/oil
- extract_type = /obj/item/slime_extract/oil
- colour = "oil"
-
-/obj/item/slimecross/reproductive/black
- extract_type = /obj/item/slime_extract/black
- colour = "black"
-
-/obj/item/slimecross/reproductive/lightpink
- extract_type = /obj/item/slime_extract/lightpink
- colour = "light pink"
-
-/obj/item/slimecross/reproductive/adamantine
- extract_type = /obj/item/slime_extract/adamantine
- colour = "adamantine"
-
-/obj/item/slimecross/reproductive/rainbow
- extract_type = /obj/item/slime_extract/rainbow
- colour = "rainbow"
diff --git a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm b/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm
deleted file mode 100644
index 814083c3bb50..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-Self-sustaining extracts:
- Produces 4 extracts that do not need reagents.
-*/
-/obj/item/slimecross/selfsustaining
- name = "self-sustaining extract"
- effect = "self-sustaining"
- icon_state = "selfsustaining"
- var/extract_type = /obj/item/slime_extract
-
-/obj/item/autoslime
- name = "autoslime"
- desc = "It resembles a normal slime extract, but seems filled with a strange, multi-colored fluid."
- var/obj/item/slime_extract/extract
- var/effect_desc = "A self-sustaining slime extract. When used, lets you choose which reaction you want."
-
-//Just divides into the actual item.
-/obj/item/slimecross/selfsustaining/Initialize()
- ..()
- visible_message(" The [src] shudders, and splits into four smaller extracts.")
- for(var/i = 0, i < 4, i++)
- var/obj/item/autoslime/A = new /obj/item/autoslime(src.loc)
- var/obj/item/slime_extract/X = new extract_type(A)
- A.extract = X
- A.icon = icon
- A.icon_state = icon_state
- A.color = color
- A.name = "self-sustaining " + colour + " extract"
- return INITIALIZE_HINT_QDEL
-
-/obj/item/autoslime/Initialize()
- return ..()
-
-/obj/item/autoslime/attack_self(mob/user)
- var/reagentselect = input(user, "Choose the reagent the extract will produce.", "Self-sustaining Reaction") as null|anything in sortList(extract.activate_reagents, /proc/cmp_typepaths_asc)
- var/amount = 5
- var/secondary
-
- if (user.get_active_held_item() != src || user.stat != CONSCIOUS || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
- return
- if(!reagentselect)
- return
- if(reagentselect == "lesser plasma")
- amount = 4
- reagentselect = /datum/reagent/toxin/plasma
- if(reagentselect == "holy water and uranium")
- reagentselect = /datum/reagent/water/holywater
- secondary = /datum/reagent/uranium
- extract.forceMove(user.drop_location())
- qdel(src)
- user.put_in_active_hand(extract)
- extract.reagents.add_reagent(reagentselect,amount)
- if(secondary)
- extract.reagents.add_reagent(secondary,amount)
-
-/obj/item/autoslime/examine(mob/user)
- . = ..()
- if(effect_desc)
- . += " [effect_desc]"
-
-//Different types.
-
-/obj/item/slimecross/selfsustaining/grey
- extract_type = /obj/item/slime_extract/grey
- colour = "grey"
-
-/obj/item/slimecross/selfsustaining/orange
- extract_type = /obj/item/slime_extract/orange
- colour = "orange"
-
-/obj/item/slimecross/selfsustaining/purple
- extract_type = /obj/item/slime_extract/purple
- colour = "purple"
-
-/obj/item/slimecross/selfsustaining/blue
- extract_type = /obj/item/slime_extract/blue
- colour = "blue"
-
-/obj/item/slimecross/selfsustaining/metal
- extract_type = /obj/item/slime_extract/metal
- colour = "metal"
-
-/obj/item/slimecross/selfsustaining/yellow
- extract_type = /obj/item/slime_extract/yellow
- colour = "yellow"
-
-/obj/item/slimecross/selfsustaining/darkpurple
- extract_type = /obj/item/slime_extract/darkpurple
- colour = "dark purple"
-
-/obj/item/slimecross/selfsustaining/darkblue
- extract_type = /obj/item/slime_extract/darkblue
- colour = "dark blue"
-
-/obj/item/slimecross/selfsustaining/silver
- extract_type = /obj/item/slime_extract/silver
- colour = "silver"
-
-/obj/item/slimecross/selfsustaining/bluespace
- extract_type = /obj/item/slime_extract/bluespace
- colour = "bluespace"
-
-/obj/item/slimecross/selfsustaining/sepia
- extract_type = /obj/item/slime_extract/sepia
- colour = "sepia"
-
-/obj/item/slimecross/selfsustaining/cerulean
- extract_type = /obj/item/slime_extract/cerulean
- colour = "cerulean"
-
-/obj/item/slimecross/selfsustaining/pyrite
- extract_type = /obj/item/slime_extract/pyrite
- colour = "pyrite"
-
-/obj/item/slimecross/selfsustaining/red
- extract_type = /obj/item/slime_extract/red
- colour = "red"
-
-/obj/item/slimecross/selfsustaining/green
- extract_type = /obj/item/slime_extract/green
- colour = "green"
-
-/obj/item/slimecross/selfsustaining/pink
- extract_type = /obj/item/slime_extract/pink
- colour = "pink"
-
-/obj/item/slimecross/selfsustaining/gold
- extract_type = /obj/item/slime_extract/gold
- colour = "gold"
-
-/obj/item/slimecross/selfsustaining/oil
- extract_type = /obj/item/slime_extract/oil
- colour = "oil"
-
-/obj/item/slimecross/selfsustaining/black
- extract_type = /obj/item/slime_extract/black
- colour = "black"
-
-/obj/item/slimecross/selfsustaining/lightpink
- extract_type = /obj/item/slime_extract/lightpink
- colour = "light pink"
-
-/obj/item/slimecross/selfsustaining/adamantine
- extract_type = /obj/item/slime_extract/adamantine
- colour = "adamantine"
-
-/obj/item/slimecross/selfsustaining/rainbow
- extract_type = /obj/item/slime_extract/rainbow
- colour = "rainbow"
diff --git a/code/modules/research/xenobiology/crossbreeding/stabilized.dm b/code/modules/research/xenobiology/crossbreeding/stabilized.dm
deleted file mode 100644
index eee23636f780..000000000000
--- a/code/modules/research/xenobiology/crossbreeding/stabilized.dm
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
-Stabilized extracts:
- Provides a passive buff to the holder.
-*/
-
-//To add: Create an effect in crossbreeding/_status_effects.dm with the name "/datum/status_effect/stabilized/[color]"
-//Status effect will automatically be applied while held, and lost on drop.
-
-/obj/item/slimecross/stabilized
- name = "stabilized extract"
- desc = "It seems inert, but anything it touches glows softly..."
- effect = "stabilized"
- icon_state = "stabilized"
- var/datum/status_effect/linked_effect
- var/mob/living/owner
-
-/obj/item/slimecross/stabilized/Initialize()
- . = ..()
- START_PROCESSING(SSobj,src)
-
-/obj/item/slimecross/stabilized/Destroy()
- STOP_PROCESSING(SSobj,src)
- qdel(linked_effect)
- return ..()
-
-/obj/item/slimecross/stabilized/process()
- var/humanfound = null
- if(ishuman(loc))
- humanfound = loc
- if(ishuman(loc.loc)) //Check if in backpack.
- humanfound = (loc.loc)
- if(!humanfound)
- return
- var/mob/living/carbon/human/H = humanfound
- var/effectpath = /datum/status_effect/stabilized
- var/static/list/effects = subtypesof(/datum/status_effect/stabilized)
- for(var/X in effects)
- var/datum/status_effect/stabilized/S = X
- if(initial(S.colour) == colour)
- effectpath = S
- break
- if(!H.has_status_effect(effectpath))
- var/datum/status_effect/stabilized/S = H.apply_status_effect(effectpath)
- owner = H
- S.linked_extract = src
- STOP_PROCESSING(SSobj,src)
-
-
-
-//Colors and subtypes:
-/obj/item/slimecross/stabilized/grey
- colour = "grey"
- effect_desc = "Makes slimes friendly to the owner"
-
-/obj/item/slimecross/stabilized/orange
- colour = "orange"
- effect_desc = "Passively tries to increase or decrease the owner's body temperature to normal"
-
-/obj/item/slimecross/stabilized/purple
- colour = "purple"
- effect_desc = "Provides a regeneration effect"
-
-/obj/item/slimecross/stabilized/blue
- colour = "blue"
- effect_desc = "Makes the owner immune to slipping on water, soap or foam. Space lube and ice are still too slippery."
-
-/obj/item/slimecross/stabilized/metal
- colour = "metal"
- effect_desc = "Every 30 seconds, adds a sheet of material to a random stack in the owner's backpack."
-
-/obj/item/slimecross/stabilized/yellow
- colour = "yellow"
- effect_desc = "Every ten seconds it recharges a device on the owner by 10%."
-
-/obj/item/slimecross/stabilized/darkpurple
- colour = "dark purple"
- effect_desc = "Gives you burning fingertips, automatically cooking any microwavable food you hold."
-
-/obj/item/slimecross/stabilized/darkblue
- colour = "dark blue"
- effect_desc = "Slowly extinguishes the owner if they are on fire, also wets items like monkey cubes, creating a monkey."
-
-/obj/item/slimecross/stabilized/silver
- colour = "silver"
- effect_desc = "Slows the rate at which the owner loses nutrition"
-
-/obj/item/slimecross/stabilized/bluespace
- colour = "bluespace"
- effect_desc = "On a two minute cooldown, when the owner has taken enough damage, they are teleported to a safe place."
-
-/obj/item/slimecross/stabilized/sepia
- colour = "sepia"
- effect_desc = "Randomly adjusts the owner's speed."
-
-/obj/item/slimecross/stabilized/cerulean
- colour = "cerulean"
- effect_desc = "Creates a duplicate of the owner. If the owner dies they will take control of the duplicate, unless the death was from beheading or gibbing."
-
-/obj/item/slimecross/stabilized/pyrite
- colour = "pyrite"
- effect_desc = "Randomly colors the owner every few seconds."
-
-/obj/item/slimecross/stabilized/red
- colour = "red"
- effect_desc = "Nullifies all equipment based slowdowns."
-
-/obj/item/slimecross/stabilized/green
- colour = "green"
- effect_desc = "Changes the owner's name and appearance while holding this extract."
-
-/obj/item/slimecross/stabilized/pink
- colour = "pink"
- effect_desc = "As long as no creatures are harmed in the owner's presense, they will not attack you. If the peace is broken it takes two minutes to restore."
-
-/obj/item/slimecross/stabilized/gold
- colour = "gold"
- effect_desc = "Creates a pet when held."
- var/mob_type
- var/datum/mind/saved_mind
- var/mob_name = "Familiar"
-
-/obj/item/slimecross/stabilized/gold/proc/generate_mobtype()
- var/static/list/mob_spawn_pets = list()
- if(mob_spawn_pets.len <= 0)
- for(var/T in typesof(/mob/living/simple_animal))
- var/mob/living/simple_animal/SA = T
- switch(initial(SA.gold_core_spawnable))
- if(FRIENDLY_SPAWN)
- mob_spawn_pets += T
- mob_type = pick(mob_spawn_pets)
-
-/obj/item/slimecross/stabilized/gold/Initialize()
- . = ..()
- generate_mobtype()
-
-/obj/item/slimecross/stabilized/gold/attack_self(mob/user)
- var/choice = input(user, "Which do you want to reset?", "Familiar Adjustment") as null|anything in sortList(list("Familiar Location", "Familiar Species", "Familiar Sentience", "Familiar Name"))
- if(!user.canUseTopic(src, BE_CLOSE))
- return
- if(isliving(user))
- var/mob/living/L = user
- if(L.has_status_effect(/datum/status_effect/stabilized/gold))
- L.remove_status_effect(/datum/status_effect/stabilized/gold)
- if(choice == "Familiar Location")
- to_chat(user, " You prod [src], and it shudders slightly.")
- START_PROCESSING(SSobj, src)
- if(choice == "Familiar Species")
- to_chat(user, " You squeeze [src], and a shape seems to shift around inside.")
- generate_mobtype()
- START_PROCESSING(SSobj, src)
- if(choice == "Familiar Sentience")
- to_chat(user, " You poke [src], and it lets out a glowing pulse.")
- saved_mind = null
- START_PROCESSING(SSobj, src)
- if(choice == "Familiar Name")
- var/newname = sanitize_name(stripped_input(user, "Would you like to change the name of [mob_name]", "Name change", mob_name, MAX_NAME_LEN))
- if(newname)
- mob_name = newname
- to_chat(user, " You speak softly into [src], and it shakes slightly in response.")
- START_PROCESSING(SSobj, src)
-
-/obj/item/slimecross/stabilized/oil
- colour = "oil"
- effect_desc = "The owner will violently explode when they die while holding this extract."
-
-/obj/item/slimecross/stabilized/black
- colour = "black"
- effect_desc = "While strangling someone, the owner's hands melt around their neck, draining their life in exchange for food and healing."
-
-/obj/item/slimecross/stabilized/lightpink
- colour = "light pink"
- effect_desc = "The owner moves at high speeds while holding this extract, also stabilizes anyone in critical condition around you using Epinephrine."
-
-/obj/item/slimecross/stabilized/adamantine
- colour = "adamantine"
- effect_desc = "Owner gains a slight boost in damage resistance to all types."
-
-/obj/item/slimecross/stabilized/rainbow
- colour = "rainbow"
- effect_desc = "Accepts a regenerative extract and automatically uses it if the owner enters a critical condition."
- var/obj/item/slimecross/regenerative/regencore
-
-/obj/item/slimecross/stabilized/rainbow/attackby(obj/item/O, mob/user)
- var/obj/item/slimecross/regenerative/regen = O
- if(istype(regen) && !regencore)
- to_chat(user, " You place [O] in [src], prepping the extract for automatic application!")
- regencore = regen
- regen.forceMove(src)
- return
- return ..()
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
deleted file mode 100644
index 81ac7db98b01..000000000000
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ /dev/null
@@ -1,473 +0,0 @@
-//Xenobio control console
-/mob/camera/aiEye/remote/xenobio
- visible_icon = TRUE
- icon = 'icons/mob/cameramob.dmi'
- icon_state = "generic_camera"
- var/allowed_area = null
-
-/mob/camera/aiEye/remote/xenobio/Initialize()
- var/area/A = get_area(loc)
- allowed_area = A.name
- . = ..()
-
-/mob/camera/aiEye/remote/xenobio/setLoc(t)
- var/area/new_area = get_area(t)
- if(new_area && new_area.name == allowed_area || new_area && (new_area.area_flags & XENOBIOLOGY_COMPATIBLE))
- return ..()
- else
- return
-
-/obj/machinery/computer/camera_advanced/xenobio
- name = "Slime management console"
- desc = "A computer used for remotely handling slimes."
- networks = list("ss13")
- circuit = /obj/item/circuitboard/computer/xenobiology
- var/datum/action/innate/slime_place/slime_place_action
- var/datum/action/innate/slime_pick_up/slime_up_action
- var/datum/action/innate/feed_slime/feed_slime_action
- var/datum/action/innate/monkey_recycle/monkey_recycle_action
- var/datum/action/innate/slime_scan/scan_action
- var/datum/action/innate/feed_potion/potion_action
- var/datum/action/innate/hotkey_help/hotkey_help
-
- var/obj/machinery/monkey_recycler/connected_recycler
- var/list/stored_slimes
- var/obj/item/slimepotion/slime/current_potion
- var/max_slimes = 5
- var/monkeys = 0
-
- icon_screen = "slime_comp"
- icon_keyboard = "rd_key"
-
- light_color = LIGHT_COLOR_PINK
-
-/obj/machinery/computer/camera_advanced/xenobio/Initialize(mapload)
- . = ..()
- slime_place_action = new
- slime_up_action = new
- feed_slime_action = new
- monkey_recycle_action = new
- scan_action = new
- potion_action = new
- hotkey_help = new
- stored_slimes = list()
- for(var/obj/machinery/monkey_recycler/recycler in GLOB.monkey_recyclers)
- if(get_area(recycler.loc) == get_area(loc))
- connected_recycler = recycler
- connected_recycler.connected += src
-
-/obj/machinery/computer/camera_advanced/xenobio/Destroy()
- QDEL_NULL(current_potion)
- for(var/thing in stored_slimes)
- var/mob/living/simple_animal/slime/S = thing
- S.forceMove(drop_location())
- stored_slimes.Cut()
- if(connected_recycler)
- connected_recycler.connected -= src
- connected_recycler = null
- return ..()
-
-/obj/machinery/computer/camera_advanced/xenobio/handle_atom_del(atom/A)
- if(A == current_potion)
- current_potion = null
- if(A in stored_slimes)
- stored_slimes -= A
- return ..()
-
-/obj/machinery/computer/camera_advanced/xenobio/CreateEye()
- eyeobj = new /mob/camera/aiEye/remote/xenobio(get_turf(src))
- eyeobj.origin = src
- eyeobj.visible_icon = TRUE
- eyeobj.icon = 'icons/mob/cameramob.dmi'
- eyeobj.icon_state = "generic_camera"
-
-/obj/machinery/computer/camera_advanced/xenobio/GrantActions(mob/living/user)
- ..()
-
- if(slime_up_action)
- slime_up_action.target = src
- slime_up_action.Grant(user)
- actions += slime_up_action
-
- if(slime_place_action)
- slime_place_action.target = src
- slime_place_action.Grant(user)
- actions += slime_place_action
-
- if(feed_slime_action)
- feed_slime_action.target = src
- feed_slime_action.Grant(user)
- actions += feed_slime_action
-
- if(monkey_recycle_action)
- monkey_recycle_action.target = src
- monkey_recycle_action.Grant(user)
- actions += monkey_recycle_action
-
- if(scan_action)
- scan_action.target = src
- scan_action.Grant(user)
- actions += scan_action
-
- if(potion_action)
- potion_action.target = src
- potion_action.Grant(user)
- actions += potion_action
-
- if(hotkey_help)
- hotkey_help.target = src
- hotkey_help.Grant(user)
- actions += hotkey_help
-
- RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL, PROC_REF(XenoSlimeClickCtrl))
- RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT, PROC_REF(XenoSlimeClickAlt))
- RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT, PROC_REF(XenoSlimeClickShift))
- RegisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT, PROC_REF(XenoTurfClickShift))
- RegisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL, PROC_REF(XenoTurfClickCtrl))
- RegisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL, PROC_REF(XenoMonkeyClickCtrl))
-
- //Checks for recycler on every interact, prevents issues with load order on certain maps.
- if(!connected_recycler)
- for(var/obj/machinery/monkey_recycler/recycler in GLOB.monkey_recyclers)
- if(get_area(recycler.loc) == get_area(loc))
- connected_recycler = recycler
- connected_recycler.connected += src
-
-/obj/machinery/computer/camera_advanced/xenobio/remove_eye_control(mob/living/user)
- UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL)
- UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT)
- UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT)
- UnregisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT)
- UnregisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL)
- UnregisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL)
- ..()
-
-/obj/machinery/computer/camera_advanced/xenobio/attackby(obj/item/O, mob/user, params)
- if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
- monkeys++
- to_chat(user, " You feed [O] to [src]. It now has [monkeys] monkey cubes stored.")
- qdel(O)
- return
- else if(istype(O, /obj/item/storage/bag))
- var/obj/item/storage/P = O
- var/loaded = FALSE
- for(var/obj/G in P.contents)
- if(istype(G, /obj/item/reagent_containers/food/snacks/monkeycube))
- loaded = TRUE
- monkeys++
- qdel(G)
- if(loaded)
- to_chat(user, " You fill [src] with the monkey cubes stored in [O]. [src] now has [monkeys] monkey cubes stored.")
- return
- else if(istype(O, /obj/item/slimepotion/slime))
- var/replaced = FALSE
- if(user && !user.transferItemToLoc(O, src))
- return
- if(!QDELETED(current_potion))
- current_potion.forceMove(drop_location())
- replaced = TRUE
- current_potion = O
- to_chat(user, " You load [O] in the console's potion slot[replaced ? ", replacing the one that was there before" : ""].")
- return
- ..()
-
-/obj/machinery/computer/camera_advanced/xenobio/multitool_act(mob/living/user, obj/item/multitool/I)
- . = ..()
- if (istype(I) && istype(I.buffer,/obj/machinery/monkey_recycler))
- to_chat(user, " You link [src] with [I.buffer] in [I] buffer.")
- connected_recycler = I.buffer
- connected_recycler.connected += src
- return TRUE
-
-/datum/action/innate/slime_place
- name = "Place Slimes"
- icon_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "slime_down"
-
-/datum/action/innate/slime_place/Activate()
- if(!target || !isliving(owner))
- return
- var/mob/living/C = owner
- var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = target
-
- if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
- for(var/mob/living/simple_animal/slime/S in X.stored_slimes)
- S.forceMove(remote_eye.loc)
- S.visible_message(" [S] warps in!")
- X.stored_slimes -= S
- else
- to_chat(owner, " Target is not near a camera. Cannot proceed.")
-
-/datum/action/innate/slime_pick_up
- name = "Pick up Slime"
- icon_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "slime_up"
-
-/datum/action/innate/slime_pick_up/Activate()
- if(!target || !isliving(owner))
- return
- var/mob/living/C = owner
- var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = target
-
- if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
- for(var/mob/living/simple_animal/slime/S in remote_eye.loc)
- if(X.stored_slimes.len >= X.max_slimes)
- break
- if(!S.ckey)
- if(S.buckled)
- S.Feedstop(silent = TRUE)
- S.visible_message(" [S] vanishes in a flash of light!")
- S.forceMove(X)
- X.stored_slimes += S
- else
- to_chat(owner, " Target is not near a camera. Cannot proceed.")
-
-
-/datum/action/innate/feed_slime
- name = "Feed Slimes"
- icon_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "monkey_down"
-
-/datum/action/innate/feed_slime/Activate()
- if(!target || !isliving(owner))
- return
- var/mob/living/C = owner
- var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = target
-
- if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
- if(X.monkeys >= 1)
- var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(remote_eye.loc, TRUE, owner)
- if (!QDELETED(food))
- food.LAssailant = WEAKREF(C)
- X.monkeys--
- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors
- to_chat(owner, " [X] now has [X.monkeys] monkeys stored.")
- else
- to_chat(owner, " [X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.")
- else
- to_chat(owner, " Target is not near a camera. Cannot proceed.")
-
-
-/datum/action/innate/monkey_recycle
- name = "Recycle Monkeys"
- icon_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "monkey_up"
-
-/datum/action/innate/monkey_recycle/Activate()
- if(!target || !isliving(owner))
- return
- var/mob/living/C = owner
- var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = target
- var/obj/machinery/monkey_recycler/recycler = X.connected_recycler
-
- if(!recycler)
- to_chat(owner, " There is no connected monkey recycler. Use a multitool to link one.")
- return
- if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
- for(var/mob/living/carbon/monkey/M in remote_eye.loc)
- if(M.stat)
- M.visible_message(" [M] vanishes as [M.p_theyre()] reclaimed for recycling!")
- recycler.use_power(500)
- X.monkeys += recycler.cube_production
- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors
- qdel(M)
- to_chat(owner, " [X] now has [X.monkeys] monkeys available.")
- else
- to_chat(owner, " Target is not near a camera. Cannot proceed.")
-
-/datum/action/innate/slime_scan
- name = "Scan Slime"
- icon_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "slime_scan"
-
-/datum/action/innate/slime_scan/Activate()
- if(!target || !isliving(owner))
- return
- var/mob/living/C = owner
- var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
-
- if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
- for(var/mob/living/simple_animal/slime/S in remote_eye.loc)
- slime_scan(S, C)
- else
- to_chat(owner, " Target is not near a camera. Cannot proceed.")
-
-/datum/action/innate/feed_potion
- name = "Apply Potion"
- icon_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "slime_potion"
-
-/datum/action/innate/feed_potion/Activate()
- if(!target || !isliving(owner))
- return
-
- var/mob/living/C = owner
- var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = target
-
- if(QDELETED(X.current_potion))
- to_chat(owner, " No potion loaded.")
- return
-
- if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
- for(var/mob/living/simple_animal/slime/S in remote_eye.loc)
- X.current_potion.attack(S, C)
- break
- else
- to_chat(owner, " Target is not near a camera. Cannot proceed.")
-
-/datum/action/innate/hotkey_help
- name = "Hotkey Help"
- icon_icon = 'icons/mob/actions/actions_silicon.dmi'
- button_icon_state = "hotkey_help"
-
-/datum/action/innate/hotkey_help/Activate()
- if(!target || !isliving(owner))
- return
- to_chat(owner, " Click shortcuts:")
- to_chat(owner, "Shift-click a slime to pick it up, or the floor to drop all held slimes.")
- to_chat(owner, "Ctrl-click a slime to scan it.")
- to_chat(owner, "Alt-click a slime to feed it a potion.")
- to_chat(owner, "Ctrl-click or a dead monkey to recycle it, or the floor to place a new monkey.")
-
-//
-// Alternate clicks for slime, monkey and open turf if using a xenobio console
-
-// Scans slime
-/mob/living/simple_animal/slime/CtrlClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_CTRL, src)
- ..()
-
-//Feeds a potion to slime
-/mob/living/simple_animal/slime/AltClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_ALT, src)
- ..()
-
-//Picks up slime
-/mob/living/simple_animal/slime/ShiftClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_SHIFT, src)
- ..()
-
-//Place slimes
-/turf/open/ShiftClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_TURF_CLICK_SHIFT, src)
- ..()
-
-//Place monkey
-/turf/open/CtrlClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_TURF_CLICK_CTRL, src)
- ..()
-
-//Pick up monkey
-/mob/living/carbon/monkey/CtrlClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_MONKEY_CLICK_CTRL, src)
- ..()
-
-// Scans slime
-/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickCtrl(mob/living/user, mob/living/simple_animal/slime/S)
- if(!GLOB.cameranet.checkTurfVis(S.loc))
- to_chat(user, " Target is not near a camera. Cannot proceed.")
- return
- var/mob/living/C = user
- var/mob/camera/aiEye/remote/xenobio/E = C.remote_control
- var/area/mobarea = get_area(S.loc)
- if(mobarea.name == E.allowed_area || (mobarea & XENOBIOLOGY_COMPATIBLE))
- slime_scan(S, C)
-
-//Feeds a potion to slime
-/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickAlt(mob/living/user, mob/living/simple_animal/slime/S)
- if(!GLOB.cameranet.checkTurfVis(S.loc))
- to_chat(user, " Target is not near a camera. Cannot proceed.")
- return
- var/mob/living/C = user
- var/mob/camera/aiEye/remote/xenobio/E = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
- var/area/mobarea = get_area(S.loc)
- if(QDELETED(X.current_potion))
- to_chat(C, " No potion loaded.")
- return
- if(mobarea.name == E.allowed_area ||(mobarea & XENOBIOLOGY_COMPATIBLE))
- X.current_potion.attack(S, C)
-
-//Picks up slime
-/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickShift(mob/living/user, mob/living/simple_animal/slime/S)
- if(!GLOB.cameranet.checkTurfVis(S.loc))
- to_chat(user, " Target is not near a camera. Cannot proceed.")
- return
- var/mob/living/C = user
- var/mob/camera/aiEye/remote/xenobio/E = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
- var/area/mobarea = get_area(S.loc)
- if(mobarea.name == E.allowed_area || (mobarea & XENOBIOLOGY_COMPATIBLE))
- if(X.stored_slimes.len >= X.max_slimes)
- to_chat(C, " Slime storage is full.")
- return
- if(S.ckey)
- to_chat(C, " The slime wiggled free!")
- return
- if(S.buckled)
- S.Feedstop(silent = TRUE)
- S.visible_message(" [S] vanishes in a flash of light!")
- S.forceMove(X)
- X.stored_slimes += S
-
-//Place slimes
-/obj/machinery/computer/camera_advanced/xenobio/proc/XenoTurfClickShift(mob/living/user, turf/open/T)
- if(!GLOB.cameranet.checkTurfVis(T))
- to_chat(user, " Target is not near a camera. Cannot proceed.")
- return
- var/mob/living/C = user
- var/mob/camera/aiEye/remote/xenobio/E = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
- var/area/turfarea = get_area(T)
- if(turfarea.name == E.allowed_area || (turfarea & XENOBIOLOGY_COMPATIBLE))
- for(var/mob/living/simple_animal/slime/S in X.stored_slimes)
- S.forceMove(T)
- S.visible_message(" [S] warps in!")
- X.stored_slimes -= S
-
-//Place monkey
-/obj/machinery/computer/camera_advanced/xenobio/proc/XenoTurfClickCtrl(mob/living/user, turf/open/T)
- if(!GLOB.cameranet.checkTurfVis(T))
- to_chat(user, " Target is not near a camera. Cannot proceed.")
- return
- var/mob/living/C = user
- var/mob/camera/aiEye/remote/xenobio/E = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
- var/area/turfarea = get_area(T)
- if(turfarea.name == E.allowed_area || (turfarea & XENOBIOLOGY_COMPATIBLE))
- if(X.monkeys >= 1)
- var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(T, TRUE, C)
- if (!QDELETED(food))
- food.LAssailant = WEAKREF(C)
- X.monkeys--
- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors
- to_chat(C, " [X] now has [X.monkeys] monkeys stored.")
- else
- to_chat(C, " [X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.")
-
-//Pick up monkey
-/obj/machinery/computer/camera_advanced/xenobio/proc/XenoMonkeyClickCtrl(mob/living/user, mob/living/carbon/monkey/M)
- if(!isturf(M.loc) || !GLOB.cameranet.checkTurfVis(M.loc))
- to_chat(user, " Target is not near a camera. Cannot proceed.")
- return
- var/mob/living/C = user
- var/mob/camera/aiEye/remote/xenobio/E = C.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
- var/area/mobarea = get_area(M.loc)
- if(!X.connected_recycler)
- to_chat(C, " There is no connected monkey recycler. Use a multitool to link one.")
- return
- if(mobarea.name == E.allowed_area || (mobarea & XENOBIOLOGY_COMPATIBLE))
- if(!M.stat)
- return
- M.visible_message(" [M] vanishes as [p_theyre()] reclaimed for recycling!")
- X.connected_recycler.use_power(500)
- X.monkeys += connected_recycler.cube_production
- X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors
- qdel(M)
- to_chat(C, " [X] now has [X.monkeys] monkeys available.")
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
deleted file mode 100644
index c907f11c1cfa..000000000000
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ /dev/null
@@ -1,1072 +0,0 @@
-/// Slime Extracts ///
-
-/obj/item/slime_extract
- name = "slime extract"
- desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"."
- icon = 'icons/mob/slimes.dmi'
- icon_state = "grey slime extract"
- force = 0
- w_class = WEIGHT_CLASS_TINY
- throwforce = 0
- throw_speed = 3
- throw_range = 6
- grind_results = list()
- var/Uses = 1 ///uses before it goes inert
- var/qdel_timer = null ///deletion timer, for delayed reactions
- var/effectmod ///Which type of crossbred
- var/crossbreed_modifier = 1 //Modifies how many extracts are needed to cross a core.
- var/list/activate_reagents = list() ///Reagents required for activation
- var/recurring = FALSE
- var/research ///Research point value for slime cores. These are defines stored in [/__DEFINES/research] - the actual values are updated there.
-
-/obj/item/slime_extract/examine(mob/user)
- . = ..()
- if(Uses > 1)
- . += "It has [Uses] uses remaining."
-
-/obj/item/slime_extract/attackby(obj/item/O, mob/user)
- if(istype(O, /obj/item/slimepotion/enhancer))
- if(Uses >= 5 || recurring)
- to_chat(user, " You cannot enhance this extract further!")
- return ..()
- if(O.type == /obj/item/slimepotion/enhancer) //Seriously, why is this defined here...?
- to_chat(user, " You apply the enhancer to the slime extract. It may now be reused one more time.")
- Uses++
- if(O.type == /obj/item/slimepotion/enhancer/max)
- to_chat(user, " You dump the maximizer on the slime extract. It can now be used a total of 5 times!")
- Uses = 5
- qdel(O)
- ..()
-
-/obj/item/slime_extract/Initialize()
- . = ..()
- create_reagents(100, INJECTABLE | DRAWABLE)
-
-/obj/item/slime_extract/on_grind()
- if(Uses)
- grind_results[/datum/reagent/toxin/slimejelly] = 20
-
-/**
-* Effect when activated by a Luminescent.
-*
-* This proc is called whenever a Luminescent consumes a slime extract. Each one is separated into major and minor effects depending on the extract. Cooldown is measured in deciseconds.
-*
-* * arg1 - The mob absorbing the slime extract.
-* * arg2 - The valid species for the absorbtion. Should always be a Luminescent unless something very major has changed.
-* * arg3 - Whether or not the activation is major or minor. Major activations have large, complex effects, minor are simple.
-*/
-/obj/item/slime_extract/proc/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- to_chat(user, " Nothing happened... This slime extract cannot be activated this way.")
- return 0
-
-/**
-* Core-crossing: Feeding adult slimes extracts to obtain a much more powerful, single extract.
-*
-* By using a valid core on a living adult slime, then feeding it nine more of the same type, you can mutate it into more useful items. Not every slime type has an implemented core cross.
-*/
-/obj/item/slime_extract/attack(mob/living/simple_animal/slime/M, mob/user)
- if(!isslime(M))
- return ..()
- if(M.stat)
- to_chat(user, " The slime is dead!")
- return
- if(!M.is_adult)
- to_chat(user, " The slime must be an adult to cross its core!")
- return
- if(M.effectmod && M.effectmod != effectmod)
- to_chat(user, " The slime is already being crossed with a different extract!")
- return
-
- if(!M.effectmod)
- M.effectmod = effectmod
- M.crossbreed_modifier = crossbreed_modifier
-
- M.applied++
- qdel(src)
- to_chat(user, " You feed the slime [src], [M.applied == 1 ? "starting to mutate its core." : "further mutating its core."]")
- playsound(M, 'sound/effects/attackblob.ogg', 50, TRUE)
-
- if(M.applied >= (SLIME_EXTRACT_CROSSING_REQUIRED * crossbreed_modifier))
- M.spawn_corecross()
-
-/obj/item/slime_extract/grey
- name = "grey slime extract"
- icon_state = "grey slime extract"
- effectmod = "reproductive"
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
- research = SLIME_RESEARCH_TIER_0
- custom_price = 1000
-
-/obj/item/slime_extract/grey/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- var/obj/item/reagent_containers/food/snacks/monkeycube/M = new
- if(!user.put_in_active_hand(M))
- M.forceMove(user.drop_location())
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- to_chat(user, " You spit out a monkey cube.")
- return 120
- if(SLIME_ACTIVATE_MAJOR)
- to_chat(user, " Your [name] starts pulsing...")
- if(do_after(user, 40, target = user))
- var/mob/living/simple_animal/slime/S = new(get_turf(user), "grey")
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- to_chat(user, " You spit out [S].")
- return 350
- else
- return 0
-
-/obj/item/slime_extract/gold
- name = "gold slime extract"
- icon_state = "gold slime extract"
- effectmod = "symbiont"
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
- research = SLIME_RESEARCH_TIER_4
-
-/obj/item/slime_extract/gold/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- user.visible_message(" [user] starts shaking!"," Your [name] starts pulsing gently...")
- if(do_after(user, 40, target = user))
- var/mob/living/simple_animal/S = create_random_mob(user.drop_location(), FRIENDLY_SPAWN)
- S.faction |= "neutral"
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- user.visible_message(" [user] spits out [S]!", " You spit out [S]!")
- return 300
-
- if(SLIME_ACTIVATE_MAJOR)
- user.visible_message(" [user] starts shaking violently!"," Your [name] starts pulsing violently...")
- if(do_after(user, 50, target = user))
- var/mob/living/simple_animal/S = create_random_mob(user.drop_location(), HOSTILE_SPAWN)
- if(user.a_intent != INTENT_HARM)
- S.faction |= "neutral"
- else
- S.faction |= "slime"
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- user.visible_message(" [user] spits out [S]!", " You spit out [S]!")
- return 600
-
-/obj/item/slime_extract/silver
- name = "silver slime extract"
- icon_state = "silver slime extract"
- effectmod = "consuming"
- activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
- research = SLIME_RESEARCH_TIER_2
-
-/obj/item/slime_extract/silver/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- var/food_type = get_random_food()
- var/obj/O = new food_type
- if(!user.put_in_active_hand(O))
- O.forceMove(user.drop_location())
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- user.visible_message(" [user] spits out [O]!", " You spit out [O]!")
- return 200
- if(SLIME_ACTIVATE_MAJOR)
- var/drink_type = get_random_drink()
- var/obj/O = new drink_type
- if(!user.put_in_active_hand(O))
- O.forceMove(user.drop_location())
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- user.visible_message(" [user] spits out [O]!", " You spit out [O]!")
- return 200
-
-/obj/item/slime_extract/metal
- name = "metal slime extract"
- icon_state = "metal slime extract"
- effectmod = "industrial"
- activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
- research = SLIME_RESEARCH_TIER_1
-
-/obj/item/slime_extract/metal/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- var/obj/item/stack/sheet/glass/O = new(null, 5)
- if(!user.put_in_active_hand(O))
- O.forceMove(user.drop_location())
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- user.visible_message(" [user] spits out [O]!", " You spit out [O]!")
- return 150
-
- if(SLIME_ACTIVATE_MAJOR)
- var/obj/item/stack/sheet/metal/O = new(null, 5)
- if(!user.put_in_active_hand(O))
- O.forceMove(user.drop_location())
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- user.visible_message(" [user] spits out [O]!", " You spit out [O]!")
- return 200
-
-/obj/item/slime_extract/purple
- name = "purple slime extract"
- icon_state = "purple slime extract"
- effectmod = "regenerative"
- crossbreed_modifier = 0.3
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
- research = SLIME_RESEARCH_TIER_1
-
-/obj/item/slime_extract/purple/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- user.adjust_nutrition(50)
- user.blood_volume += 50
- to_chat(user, " You activate [src], and your body is refilled with fresh slime jelly!")
- return 150
-
- if(SLIME_ACTIVATE_MAJOR)
- to_chat(user, " You activate [src], and it releases regenerative chemicals!")
- user.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10)
- return 600
-
-/obj/item/slime_extract/darkpurple
- name = "dark purple slime extract"
- icon_state = "dark purple slime extract"
- effectmod = "self-sustaining"
- activate_reagents = list(/datum/reagent/toxin/plasma)
- research = SLIME_RESEARCH_TIER_2
-
-/obj/item/slime_extract/darkpurple/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- var/obj/item/stack/sheet/mineral/plasma/O = new(null, 1)
- if(!user.put_in_active_hand(O))
- O.forceMove(user.drop_location())
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- user.visible_message(" [user] spits out [O]!", " You spit out [O]!")
- return 150
-
- if(SLIME_ACTIVATE_MAJOR)
- var/turf/open/T = get_turf(user)
- if(istype(T))
- T.atmos_spawn_air("plasma=20")
- to_chat(user, " You activate [src], and a cloud of plasma bursts out of your skin!")
- return 900
-
-/obj/item/slime_extract/orange
- name = "orange slime extract"
- icon_state = "orange slime extract"
- effectmod = "burning"
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
- research = SLIME_RESEARCH_TIER_1
-
-/obj/item/slime_extract/orange/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- to_chat(user, " You activate [src]. You start feeling hot!")
- user.reagents.add_reagent(/datum/reagent/consumable/capsaicin,10)
- return 150
-
- if(SLIME_ACTIVATE_MAJOR)
- user.reagents.add_reagent(/datum/reagent/phosphorus,5)//
- user.reagents.add_reagent(/datum/reagent/potassium,5) // = smoke, along with any reagents inside mr. slime
- user.reagents.add_reagent(/datum/reagent/consumable/sugar,5) //
- to_chat(user, " You activate [src], and a cloud of smoke bursts out of your skin!")
- return 450
-
-/obj/item/slime_extract/yellow
- name = "yellow slime extract"
- icon_state = "yellow slime extract"
- effectmod = "charged"
- crossbreed_modifier = 0.8
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
- research = SLIME_RESEARCH_TIER_2
-
-/obj/item/slime_extract/yellow/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- if(species.glow_intensity != LUMINESCENT_DEFAULT_GLOW)
- to_chat(user, " Your glow is already enhanced!")
- return
- species.update_glow(user, 5)
- addtimer(CALLBACK(species, TYPE_PROC_REF(/datum/species/jelly/luminescent, update_glow), user, LUMINESCENT_DEFAULT_GLOW), 600)
- to_chat(user, " You start glowing brighter.")
-
- if(SLIME_ACTIVATE_MAJOR)
- user.visible_message(" [user]'s skin starts flashing intermittently...", " Your skin starts flashing intermittently...")
- if(do_after(user, 25, target = user))
- empulse(user, 1, 2)
- user.visible_message(" [user]'s skin flashes!", " Your skin flashes as you emit an electromagnetic pulse!")
- return 600
-
-/obj/item/slime_extract/red
- name = "red slime extract"
- icon_state = "red slime extract"
- effectmod = "sanguine"
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
- research = SLIME_RESEARCH_TIER_4
-
-/obj/item/slime_extract/red/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- to_chat(user, " You activate [src]. You start feeling fast!")
- user.reagents.add_reagent(/datum/reagent/medicine/ephedrine,5)
- return 450
-
- if(SLIME_ACTIVATE_MAJOR)
- user.visible_message(" [user]'s skin flashes red for a moment...", " Your skin flashes red as you emit rage-inducing pheromones...")
- for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(user), null))
- slime.rabid = TRUE
- slime.visible_message(" The [slime] is driven into a frenzy!")
- return 600
-
-/obj/item/slime_extract/blue
- name = "blue slime extract"
- icon_state = "blue slime extract"
- effectmod = "stabilized"
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
- research = SLIME_RESEARCH_TIER_1
-
-/obj/item/slime_extract/blue/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- to_chat(user, " You activate [src]. Your genome feels more stable!")
- user.adjustCloneLoss(-15)
- user.reagents.add_reagent(/datum/reagent/medicine/mutadone, 10)
- user.reagents.add_reagent(/datum/reagent/medicine/potass_iodide, 10)
- return 250
-
- if(SLIME_ACTIVATE_MAJOR)
- user.reagents.create_foam(/datum/effect_system/foam_spread,20)
- user.visible_message(" Foam spews out from [user]'s skin!", " You activate [src], and foam bursts out of your skin!")
- return 600
-
-/obj/item/slime_extract/darkblue
- name = "dark blue slime extract"
- icon_state = "dark blue slime extract"
- effectmod = "chilling"
- activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
- research = SLIME_RESEARCH_TIER_2
-
-/obj/item/slime_extract/darkblue/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- to_chat(user, " You activate [src]. You start feeling colder!")
- user.ExtinguishMob()
- user.adjust_fire_stacks(-20)
- user.reagents.add_reagent(/datum/reagent/consumable/frostoil,4)
- user.reagents.add_reagent(/datum/reagent/medicine/cryoxadone,5)
- return 100
-
- if(SLIME_ACTIVATE_MAJOR)
- var/turf/open/T = get_turf(user)
- if(istype(T))
- T.atmos_spawn_air("nitrogen=40;TEMP=2.7")
- to_chat(user, " You activate [src], and icy air bursts out of your skin!")
- return 900
-
-/obj/item/slime_extract/pink
- name = "pink slime extract"
- icon_state = "pink slime extract"
- effectmod = "gentle"
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
- research = SLIME_RESEARCH_TIER_4
-
-/obj/item/slime_extract/pink/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- if(user.gender != MALE && user.gender != FEMALE)
- to_chat(user, " You can't swap your gender!")
- return
-
- if(user.gender == MALE)
- user.gender = FEMALE
- user.visible_message(" [user] suddenly looks more feminine!", " You suddenly feel more feminine!")
- else
- user.gender = MALE
- user.visible_message(" [user] suddenly looks more masculine!", " You suddenly feel more masculine!")
- return 100
-
- if(SLIME_ACTIVATE_MAJOR)
- user.visible_message(" [user]'s skin starts flashing hypnotically...", " Your skin starts forming odd patterns, pacifying creatures around you.")
- for(var/mob/living/carbon/C in viewers(user, null))
- if(C != user)
- C.reagents.add_reagent(/datum/reagent/pax,2)
- return 600
-
-/obj/item/slime_extract/green
- name = "green slime extract"
- icon_state = "green slime extract"
- effectmod = "mutative"
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/uranium/radium)
- research = SLIME_RESEARCH_TIER_4
-
-/obj/item/slime_extract/green/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- to_chat(user, " You feel yourself reverting to human form...")
- if(do_after(user, 120, target = user))
- to_chat(user, " You feel human again!")
- user.set_species(/datum/species/human)
- return
- to_chat(user, " You stop the transformation.")
-
- if(SLIME_ACTIVATE_MAJOR)
- to_chat(user, " You feel yourself radically changing your slime type...")
- if(do_after(user, 120, target = user))
- to_chat(user, " You feel different!")
- user.set_species(pick(/datum/species/jelly/slime, /datum/species/jelly/stargazer))
- return
- to_chat(user, " You stop the transformation.")
-
-/obj/item/slime_extract/lightpink
- name = "light pink slime extract"
- icon_state = "light pink slime extract"
- effectmod = "loyal"
- activate_reagents = list(/datum/reagent/toxin/plasma)
- research = SLIME_RESEARCH_TIER_5
-
-/obj/item/slime_extract/lightpink/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- var/obj/item/slimepotion/slime/renaming/O = new(null, 1)
- if(!user.put_in_active_hand(O))
- O.forceMove(user.drop_location())
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- user.visible_message(" [user] spits out [O]!", " You spit out [O]!")
- return 150
-
- if(SLIME_ACTIVATE_MAJOR)
- var/obj/item/slimepotion/slime/sentience/O = new(null, 1)
- if(!user.put_in_active_hand(O))
- O.forceMove(user.drop_location())
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- user.visible_message(" [user] spits out [O]!", " You spit out [O]!")
- return 450
-
-/obj/item/slime_extract/black
- name = "black slime extract"
- icon_state = "black slime extract"
- effectmod = "transformative"
- activate_reagents = list(/datum/reagent/toxin/plasma)
- research = SLIME_RESEARCH_TIER_5
-
-/obj/item/slime_extract/black/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- to_chat(user, " You feel something wrong inside you...")
- user.ForceContractDisease(new /datum/disease/transformation/slime(), FALSE, TRUE)
- return 100
-
- if(SLIME_ACTIVATE_MAJOR)
- to_chat(user, " You feel your own light turning dark...")
- if(do_after(user, 120, target = user))
- to_chat(user, " You feel a longing for darkness.")
- user.set_species(pick(/datum/species/shadow))
- return
- to_chat(user, " You stop feeding [src].")
-
-/obj/item/slime_extract/oil
- name = "oil slime extract"
- icon_state = "oil slime extract"
- effectmod = "detonating"
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
- research = SLIME_RESEARCH_TIER_5
-
-/obj/item/slime_extract/oil/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- to_chat(user, " You vomit slippery oil.")
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- new /obj/effect/decal/cleanable/oil/slippery(get_turf(user))
- return 450
-
- if(SLIME_ACTIVATE_MAJOR)
- user.visible_message(" [user]'s skin starts pulsing and glowing ominously...", " You feel unstable...")
- if(do_after(user, 60, target = user))
- to_chat(user, " You explode!")
- explosion(get_turf(user), 1 ,3, 6)
- user.gib()
- return
- to_chat(user, " You stop feeding [src], and the feeling passes.")
-
-/obj/item/slime_extract/adamantine
- name = "adamantine slime extract"
- icon_state = "adamantine slime extract"
- effectmod = "crystalline"
- activate_reagents = list(/datum/reagent/toxin/plasma)
- research = SLIME_RESEARCH_TIER_5
-
-/obj/item/slime_extract/adamantine/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- if(species.armor > 0)
- to_chat(user, " Your skin is already hardened!")
- return
- to_chat(user, " You feel your skin harden and become more resistant.")
- species.armor += 25
- addtimer(CALLBACK(src, PROC_REF(reset_armor), species), 1200)
- return 450
-
-/obj/item/slime_extract/adamantine/proc/reset_armor(datum/species/jelly/luminescent/species)
- if(istype(species))
- species.armor -= 25
-
-/obj/item/slime_extract/bluespace
- name = "bluespace slime extract"
- icon_state = "bluespace slime extract"
- effectmod = "warping"
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
- var/teleport_ready = FALSE
- var/teleport_x = 0
- var/teleport_y = 0
- var/teleport_z = 0
- research = SLIME_RESEARCH_TIER_3
-
-/obj/item/slime_extract/bluespace/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- to_chat(user, " You feel your body vibrating...")
- if(do_after(user, 25, target = user))
- to_chat(user, " You teleport!")
- do_teleport(user, get_turf(user), 6, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
- return 300
-
- if(SLIME_ACTIVATE_MAJOR)
- if(!teleport_ready)
- to_chat(user, " You feel yourself anchoring to this spot...")
- var/turf/T = get_turf(user)
- teleport_x = T.x
- teleport_y = T.y
- teleport_z = T.z
- teleport_ready = TRUE
- else
- teleport_ready = FALSE
- if(teleport_x && teleport_y && teleport_z)
- var/turf/T = locate(teleport_x, teleport_y, teleport_z)
- to_chat(user, " You snap back to your anchor point!")
- do_teleport(user, T, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
- return 450
-
-
-/obj/item/slime_extract/pyrite
- name = "pyrite slime extract"
- icon_state = "pyrite slime extract"
- effectmod = "prismatic"
- crossbreed_modifier = 0.5
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
- research = SLIME_RESEARCH_TIER_3
-
-/obj/item/slime_extract/pyrite/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- var/chosen = pick(difflist(subtypesof(/obj/item/toy/crayon),typesof(/obj/item/toy/crayon/spraycan)))
- var/obj/item/O = new chosen(null)
- if(!user.put_in_active_hand(O))
- O.forceMove(user.drop_location())
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- user.visible_message(" [user] spits out [O]!", " You spit out [O]!")
- return 150
-
- if(SLIME_ACTIVATE_MAJOR)
- var/blacklisted_cans = list(/obj/item/toy/crayon/spraycan/borg, /obj/item/toy/crayon/spraycan/infinite)
- var/chosen = pick(subtypesof(/obj/item/toy/crayon/spraycan) - blacklisted_cans)
- var/obj/item/O = new chosen(null)
- if(!user.put_in_active_hand(O))
- O.forceMove(user.drop_location())
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- user.visible_message(" [user] spits out [O]!", " You spit out [O]!")
- return 250
-
-/obj/item/slime_extract/cerulean
- name = "cerulean slime extract"
- icon_state = "cerulean slime extract"
- effectmod = "recurring"
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
- research = SLIME_RESEARCH_TIER_3
-
-/obj/item/slime_extract/cerulean/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- user.reagents.add_reagent(/datum/reagent/medicine/salbutamol,15)
- to_chat(user, " You feel like you don't need to breathe!")
- return 150
-
- if(SLIME_ACTIVATE_MAJOR)
- var/turf/open/T = get_turf(user)
- if(istype(T))
- T.atmos_spawn_air("o2=11;n2=41;TEMP=293.15")
- to_chat(user, " You activate [src], and fresh air bursts out of your skin!")
- return 600
-
-/obj/item/slime_extract/sepia
- name = "sepia slime extract"
- icon_state = "sepia slime extract"
- effectmod = "lengthened"
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
- research = SLIME_RESEARCH_TIER_3
-
-/obj/item/slime_extract/sepia/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- var/obj/item/camera/O = new(null, 1)
- if(!user.put_in_active_hand(O))
- O.forceMove(user.drop_location())
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- user.visible_message(" [user] spits out [O]!", " You spit out [O]!")
- return 150
-
- if(SLIME_ACTIVATE_MAJOR)
- to_chat(user, " You feel time slow down...")
- if(do_after(user, 30, target = user))
- new /obj/effect/timestop(get_turf(user), 2, 50, list(user))
- return 900
-
-/obj/item/slime_extract/rainbow
- name = "rainbow slime extract"
- icon_state = "rainbow slime extract"
- effectmod = "hyperchromatic"
- activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,"lesser plasma",/datum/reagent/toxin/slimejelly,"holy water and uranium") //Curse this snowflake reagent list.
- research = SLIME_RESEARCH_TIER_RAINBOW
-
-/obj/item/slime_extract/rainbow/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
- switch(activation_type)
- if(SLIME_ACTIVATE_MINOR)
- user.dna.features["mcolor"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")
- user.updateappearance(mutcolor_update=1)
- species.update_glow(user)
- to_chat(user, " You feel different...")
- return 100
-
- if(SLIME_ACTIVATE_MAJOR)
- var/chosen = pick(subtypesof(/obj/item/slime_extract))
- var/obj/item/O = new chosen(null)
- if(!user.put_in_active_hand(O))
- O.forceMove(user.drop_location())
- playsound(user, 'sound/effects/splat.ogg', 50, TRUE)
- user.visible_message(" [user] spits out [O]!", " You spit out [O]!")
- return 150
-
-////Slime-derived potions///
-
-/**
-* #Slime potions
-*
-* Feed slimes potions either by hand or using the slime console.
-*
-* Slime potions either augment the slime's behavior, its extract output, or its intelligence. These all come either from extract effects or cross cores.
-* A few of the more powerful ones can modify someone's equipment or gender.
-* New ones should probably be accessible only through cross cores as all the normal core types already have uses. Rule of thumb is 'stronger effects go in cross cores'.
-*/
-
-/obj/item/slimepotion
- name = "slime potion"
- desc = "A hard yet gelatinous capsule excreted by a slime, containing mysterious substances."
- w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/slimepotion/afterattack(obj/item/reagent_containers/target, mob/user , proximity)
- . = ..()
- if(!proximity)
- return
- if (istype(target))
- to_chat(user, " You cannot transfer [src] to [target]! It appears the potion must be given directly to a slime to absorb." )
- return
-
-/obj/item/slimepotion/slime/docility
- name = "docility potion"
- desc = "A potent chemical mix that nullifies a slime's hunger, causing it to become docile and tame."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potsilver"
-
-/obj/item/slimepotion/slime/docility/attack(mob/living/simple_animal/slime/M, mob/user)
- if(!isslime(M))
- to_chat(user, " The potion only works on slimes!")
- return ..()
- if(M.stat)
- to_chat(user, " The slime is dead!")
- return
- if(M.rabid) //Stops being rabid, but doesn't become truly docile.
- to_chat(M, " You absorb the potion, and your rabid hunger finally settles to a normal desire to feed.")
- to_chat(user, " You feed the slime the potion, calming its rabid rage.")
- M.rabid = FALSE
- qdel(src)
- return
- M.docile = 1
- M.set_nutrition(700)
- to_chat(M, " You absorb the potion and feel your intense desire to feed melt away.")
- to_chat(user, " You feed the slime the potion, removing its hunger and calming it.")
- var/newname = sanitize_name(stripped_input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime", MAX_NAME_LEN))
-
- if (!newname)
- newname = "pet slime"
- M.name = newname
- M.real_name = newname
- qdel(src)
-
-/obj/item/slimepotion/slime/sentience
- name = "intelligence potion"
- desc = "A miraculous chemical mix that grants human like intelligence to living beings."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potpink"
- var/list/not_interested = list()
- var/being_used = FALSE
- var/sentience_type = SENTIENCE_ORGANIC
-
-/obj/item/slimepotion/slime/sentience/attack(mob/living/M, mob/user)
- if(being_used || !ismob(M))
- return
- if(!isanimal(M) || M.ckey) //only works on animals that aren't player controlled
- to_chat(user, " [M] is already too intelligent for this to work!")
- return
- if(M.stat)
- to_chat(user, " [M] is dead!")
- return
- var/mob/living/simple_animal/SM = M
- if(SM.sentience_type != sentience_type)
- to_chat(user, " [src] won't work on [SM].")
- return
-
- to_chat(user, " You offer [src] to [SM]...")
- being_used = TRUE
-
- var/list/candidates = pollCandidatesForMob("Do you want to play as [SM.name]?", ROLE_SENTIENCE, null, ROLE_SENTIENCE, 50, SM, POLL_IGNORE_SENTIENCE_POTION) // see poll_ignore.dm
- if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
- SM.key = C.key
- SM.mind.enslave_mind_to_creator(user)
- SM.sentience_act()
- to_chat(SM, " All at once it makes sense: you know what you are and who you are! Self awareness is yours!")
- to_chat(SM, " You are grateful to be self aware and owe [user.real_name] a great debt. Serve [user.real_name], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.")
- if(SM.flags_1 & HOLOGRAM_1) //Check to see if it's a holodeck creature
- to_chat(SM, " You also become depressingly aware that you are not a real creature, but instead a holoform. Your existence is limited to the parameters of the holodeck.")
- to_chat(user, " [SM] accepts [src] and suddenly becomes attentive and aware. It worked!")
- SM.copy_languages(user)
- after_success(user, SM)
- qdel(src)
- else
- to_chat(user, " [SM] looks interested for a moment, but then looks back down. Maybe you should try again later.")
- being_used = FALSE
- ..()
-
-/obj/item/slimepotion/slime/sentience/proc/after_success(mob/living/user, mob/living/simple_animal/SM)
- return
-
-/obj/item/slimepotion/slime/sentience/nuclear
- name = "syndicate intelligence potion"
- desc = "A miraculous chemical mix that grants human like intelligence to living beings. It has been modified with Syndicate technology to also grant an internal radio implant to the target and authenticate with identification systems."
-
-/obj/item/slimepotion/slime/sentience/nuclear/after_success(mob/living/user, mob/living/simple_animal/SM)
- var/obj/item/implant/radio/syndicate/imp = new(src)
- imp.implant(SM, user)
-
- SM.access_card = new /obj/item/card/id/syndicate(SM)
- ADD_TRAIT(SM.access_card, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
-
-/obj/item/slimepotion/transference
- name = "consciousness transference potion"
- desc = "A strange slime-based chemical that, when used, allows the user to transfer their consciousness to a lesser being."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potorange"
- var/prompted = 0
- var/animal_type = SENTIENCE_ORGANIC
-
-/obj/item/slimepotion/transference/afterattack(mob/living/M, mob/user, proximity)
- if(!proximity)
- return
- if(prompted || !ismob(M))
- return
- if(!isanimal(M) || M.ckey) //much like sentience, these will not work on something that is already player controlled
- to_chat(user, " [M] already has a higher consciousness!")
- return ..()
- if(M.stat)
- to_chat(user, " [M] is dead!")
- return ..()
- var/mob/living/simple_animal/SM = M
- if(SM.sentience_type != animal_type)
- to_chat(user, " You cannot transfer your consciousness to [SM]." )
- return ..()
- var/jb = is_banned_from(user.ckey, ROLE_MIND_TRANSFER)
- if(QDELETED(src) || QDELETED(M) || QDELETED(user))
- return
-
- if(jb)
- to_chat(user, " Your mind goes blank as you attempt to use the potion.")
- return
-
- prompted = 1
- if(alert("This will permanently transfer your consciousness to [SM]. Are you sure you want to do this?",,"Yes","No")=="No")
- prompted = 0
- return
-
- to_chat(user, " You drink the potion then place your hands on [SM]...")
-
-
- user.mind.transfer_to(SM)
- SM.faction = user.faction.Copy()
- SM.sentience_act() //Same deal here as with sentience
- user.death()
- to_chat(SM, " In a quick flash, you feel your consciousness flow into [SM]!")
- to_chat(SM, " You are now [SM]. Your allegiances, alliances, and role is still the same as it was prior to consciousness transfer!")
- SM.name = "[user.real_name]"
- qdel(src)
-
-/obj/item/slimepotion/slime/steroid
- name = "slime steroid"
- desc = "A potent chemical mix that will cause a baby slime to generate more extract."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potred"
-
-/obj/item/slimepotion/slime/steroid/attack(mob/living/simple_animal/slime/M, mob/user)
- if(!isslime(M))//If target is not a slime.
- to_chat(user, " The steroid only works on baby slimes!")
- return ..()
- if(M.is_adult) //Can't steroidify adults
- to_chat(user, " Only baby slimes can use the steroid!")
- return
- if(M.stat)
- to_chat(user, " The slime is dead!")
- return
- if(M.cores >= 5)
- to_chat(user, " The slime already has the maximum amount of extract!")
- return
-
- to_chat(user, " You feed the slime the steroid. It will now produce one more extract.")
- M.cores++
- qdel(src)
-
-/obj/item/slimepotion/enhancer
- name = "extract enhancer"
- desc = "A potent chemical mix that will give a slime extract an additional use."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potpurple"
-
-/obj/item/slimepotion/slime/stabilizer
- name = "slime stabilizer"
- desc = "A potent chemical mix that will reduce the chance of a slime mutating."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potcyan"
-
-/obj/item/slimepotion/slime/stabilizer/attack(mob/living/simple_animal/slime/M, mob/user)
- if(!isslime(M))
- to_chat(user, " The stabilizer only works on slimes!")
- return ..()
- if(M.stat)
- to_chat(user, " The slime is dead!")
- return
- if(M.mutation_chance == 0)
- to_chat(user, " The slime already has no chance of mutating!")
- return
-
- to_chat(user, " You feed the slime the stabilizer. It is now less likely to mutate.")
- M.mutation_chance = clamp(M.mutation_chance-15,0,100)
- qdel(src)
-
-/obj/item/slimepotion/slime/mutator
- name = "slime mutator"
- desc = "A potent chemical mix that will increase the chance of a slime mutating."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potgreen"
-
-/obj/item/slimepotion/slime/mutator/attack(mob/living/simple_animal/slime/M, mob/user)
- if(!isslime(M))
- to_chat(user, " The mutator only works on slimes!")
- return ..()
- if(M.stat)
- to_chat(user, " The slime is dead!")
- return
- if(M.mutator_used)
- to_chat(user, " This slime has already consumed a mutator, any more would be far too unstable!")
- return
- if(M.mutation_chance == 100)
- to_chat(user, " The slime is already guaranteed to mutate!")
- return
-
- to_chat(user, " You feed the slime the mutator. It is now more likely to mutate.")
- M.mutation_chance = clamp(M.mutation_chance+12,0,100)
- M.mutator_used = TRUE
- qdel(src)
-
-/obj/item/slimepotion/speed
- name = "slime speed potion"
- desc = "A potent chemical mix that will reduce the slowdown from any item."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potyellow"
-
-/obj/item/slimepotion/speed/afterattack(obj/C, mob/user, proximity)
- . = ..()
- if(!proximity)
- return
- if(!istype(C))
- to_chat(user, " The potion can only be used on items or vehicles!")
- return
- if(isitem(C))
- var/obj/item/I = C
- if(I.slowdown <= 0.25 || I.obj_flags & IMMUTABLE_SLOW)
- to_chat(user, " The [C] can't be made any faster!")
- return ..()
- I.slowdown = 0.25
-
- if(istype(C, /obj/vehicle))
- var/obj/vehicle/V = C
- var/datum/component/riding/R = V.GetComponent(/datum/component/riding)
- if(R)
- var/vehicle_speed_mod = round(CONFIG_GET(number/movedelay/run_delay) * 0.85, 0.01)
- if(R.vehicle_move_delay <= vehicle_speed_mod)
- to_chat(user, " The [C] can't be made any faster!")
- return ..()
- R.vehicle_move_delay = vehicle_speed_mod
-
- to_chat(user, " You slather the red gunk over the [C], making it faster.")
- C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
- C.add_atom_colour("#FF0000", FIXED_COLOUR_PRIORITY)
- qdel(src)
-
-/obj/item/slimepotion/fireproof
- name = "slime chill potion"
- desc = "A potent chemical mix that will fireproof any article of clothing. Has three uses."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potblue"
- resistance_flags = FIRE_PROOF
- var/uses = 3
-
-/obj/item/slimepotion/fireproof/afterattack(obj/item/clothing/C, mob/user, proximity)
- . = ..()
- if(!proximity)
- return
- if(!uses)
- qdel(src)
- return
- if(!istype(C))
- to_chat(user, " The potion can only be used on clothing!")
- return
- if(C.max_heat_protection_temperature >= FIRE_IMMUNITY_MAX_TEMP_PROTECT)
- to_chat(user, " The [C] is already fireproof!")
- return
- to_chat(user, " You slather the blue gunk over the [C], fireproofing it.")
- C.name = "fireproofed [C.name]"
- C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
- C.add_atom_colour("#000080", FIXED_COLOUR_PRIORITY)
- C.max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- C.heat_protection = C.body_parts_covered
- C.resistance_flags |= FIRE_PROOF
- uses --
- if(!uses)
- qdel(src)
-
-/obj/item/slimepotion/genderchange
- name = "gender change potion"
- desc = "An interesting chemical mix that changes the biological gender of what its applied to. Cannot be used on things that lack gender entirely."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potlightpink"
-
-/obj/item/slimepotion/genderchange/attack(mob/living/L, mob/user)
- if(!istype(L) || L.stat == DEAD)
- to_chat(user, " The potion can only be used on living things!")
- return
-
- if(L.gender != MALE && L.gender != FEMALE)
- to_chat(user, " The potion can only be used on gendered things!")
- return
-
- if(L.gender == MALE)
- L.gender = FEMALE
- L.visible_message(" [L] suddenly looks more feminine!", " You suddenly feel more feminine!")
- else
- L.gender = MALE
- L.visible_message(" [L] suddenly looks more masculine!", " You suddenly feel more masculine!")
- L.regenerate_icons()
- qdel(src)
-
-/obj/item/slimepotion/slime/renaming
- name = "renaming potion"
- desc = "A potion that allows a self-aware being to change what name it subconciously presents to the world."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potgreen"
-
- var/being_used = FALSE
-
-/obj/item/slimepotion/slime/renaming/attack(mob/living/M, mob/user)
- if(being_used || !ismob(M))
- return
- if(!M.ckey) //only works on animals that aren't player controlled
- to_chat(user, " [M] is not self aware, and cannot pick its own name.")
- return
-
- being_used = TRUE
-
- to_chat(user, " You offer [src] to [user]...")
-
- var/new_name = stripped_input(M, "What would you like your name to be?", "Input a name", M.real_name, MAX_NAME_LEN)
-
- if(!new_name || QDELETED(src) || QDELETED(M) || new_name == M.real_name || !M.Adjacent(user))
- being_used = FALSE
- return
-
- M.visible_message(" [M] has a new name, [new_name].", " Your old name of [M.real_name] fades away, and your new name [new_name] anchors itself in your mind.")
- message_admins("[ADMIN_LOOKUPFLW(user)] used [src] on [ADMIN_LOOKUPFLW(M)], letting them rename themselves into [new_name].")
-
- // pass null as first arg to not update records or ID/PDA
- M.fully_replace_character_name(null, new_name)
-
- qdel(src)
-
-/obj/item/slimepotion/slime/slimeradio
- name = "bluespace radio potion"
- desc = "A strange chemical that grants those who ingest it the ability to broadcast and receive subscape radio waves."
- icon = 'icons/obj/chemical/misc.dmi'
- icon_state = "potgrey"
-
-/obj/item/slimepotion/slime/slimeradio/attack(mob/living/M, mob/user)
- if(!ismob(M))
- return
- if(!isanimal(M))
- to_chat(user, " [M] is too complex for the potion!")
- return
- if(M.stat)
- to_chat(user, " [M] is dead!")
- return
-
- to_chat(user, " You feed the potion to [M].")
- to_chat(M, " Your mind tingles as you are fed the potion. You can hear radio waves now!")
- var/obj/item/implant/radio/slime/imp = new(src)
- imp.implant(M, user)
- qdel(src)
-
-///Definitions for slime products that don't have anywhere else to go (Floor tiles, blueprints).
-
-/obj/item/stack/tile/bluespace
- name = "bluespace floor tile"
- singular_name = "floor tile"
- desc = "Through a series of micro-teleports these tiles let people move at incredible speeds."
- icon_state = "tile-bluespace"
- item_state = "tile-bluespace"
- w_class = WEIGHT_CLASS_NORMAL
- force = 6
- custom_materials = list(/datum/material/iron=500)
- throwforce = 10
- throw_speed = 3
- throw_range = 7
- flags_1 = CONDUCT_1
- max_amount = 60
- turf_type = /turf/open/floor/bluespace
-
-
-/obj/item/stack/tile/sepia
- name = "sepia floor tile"
- singular_name = "floor tile"
- desc = "Time seems to flow very slowly around these tiles."
- icon_state = "tile-sepia"
- item_state = "tile-sepia"
- w_class = WEIGHT_CLASS_NORMAL
- force = 6
- custom_materials = list(/datum/material/iron=500)
- throwforce = 10
- throw_speed = 0.1
- throw_range = 28
- flags_1 = CONDUCT_1
- max_amount = 60
- turf_type = /turf/open/floor/sepia
-
-
-/obj/item/areaeditor/blueprints/slime
- name = "cerulean prints"
- desc = "A one use yet of blueprints made of jelly like organic material. Extends the reach of the management console."
- color = "#2956B2"
-
-/obj/item/areaeditor/blueprints/slime/edit_area()
- ..()
- var/area/A = get_area(src)
- for(var/turf/T in A)
- T.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
- T.add_atom_colour("#2956B2", FIXED_COLOUR_PRIORITY)
- A.area_flags |= XENOBIOLOGY_COMPATIBLE
- qdel(src)
diff --git a/code/modules/ruins/rockplanet_ruin_code/mining_base.dm b/code/modules/ruins/rockplanet_ruin_code/mining_base.dm
new file mode 100644
index 000000000000..afd34e00a6eb
--- /dev/null
+++ b/code/modules/ruins/rockplanet_ruin_code/mining_base.dm
@@ -0,0 +1,93 @@
+/obj/machinery/porta_turret/ship/nt/light/mining_base
+ req_ship_access = FALSE
+ lethal = TRUE
+ turret_flags = TURRET_FLAG_SHOOT_FAUNA
+
+/obj/machinery/porta_turret/ship/nt/light/mining_base/Initialize()
+ . = ..()
+ take_damage(rand(120, 150),BRUTE)
+
+/obj/effect/mob_spawn/human/corpse/ruin/ns_mine_manager
+ mob_name = "gruff sarathi man"
+ mob_gender = MALE
+ mob_species = /datum/species/lizard
+ icon_state = "corpsehuman"
+ outfit = /datum/outfit/job/nanotrasen/quartermaster
+ brute_damage = 120
+
+/obj/effect/mob_spawn/human/corpse/ruin/ns_mine_miner
+ outfit = /datum/outfit/job/nanotrasen/miner
+
+/obj/effect/mob_spawn/human/corpse/ruin/ns_mine_miner/armored
+ outfit = /datum/outfit/job/nanotrasen/miner/armored
+
+/datum/outfit/job/nanotrasen/miner/armored
+ name = "Nanotrasen - Armored Miner"
+ suit = /obj/item/clothing/suit/hooded/explorer
+ mask = /obj/item/clothing/mask/gas/explorer
+
+/obj/effect/mob_spawn/human/corpse/ruin/ns_mine_miner/Initialize()
+ . = ..()
+ mob_species = pick_weight(list(
+ /datum/species/human = 50,
+ /datum/species/lizard = 20,
+ /datum/species/ipc = 10,
+ /datum/species/elzuose = 10,
+ /datum/species/moth = 5,
+ /datum/species/spider = 5
+ )
+ )
+
+/obj/item/taperecorder/preset/mining_base
+ starting_tape_type = /obj/item/tape/random/preset/mining_base/one
+
+/obj/item/tape/random/preset/mining_base/one
+ ruined = 1
+ used_capacity = 120
+
+/obj/item/tape/random/preset/mining_base/one/Initialize()
+ . = ..()
+ storedinfo = list(
+ "\[00:00\] Recording started.",
+ "\[00:02\] [span_name("gruff sarathi man")] firmly declares \"-urn in hell for thisss.\"",
+ "\[00:05\] [span_name("stern human woman")] retorts \"A hell of my own making.\"",
+ "\[00:08\] [span_name("gruff sarathi man")] states \"And we'll sssend you-\"",
+ "\[00:11\] [span_name("gruff sarathi man")] suddenly gasps",
+ "\[00:12\] [span_name("stern human woman")] confidently delivers \"If you're so sure, why aren't you the one with the gun?\"",
+ "\[00:17\] [span_name("gruff sarathi man")] stammers \"y-you won't get away with thisss\"",
+ "\[00:20\] [span_name("stern human woman")] says \"The last Nanotrasen cuck I killed said that too~\"",
+ "\[00:25\] sudden clattering and a dull thump.",
+ "\[00:26\] [span_name("gruff sarathi man")] gasps for breath!",
+ "\[00:27\] [span_name("stern human woman")] contemptously declares \"Different boot. Same pathetic people.\"",
+ "\[00:30\] A pistol's slide is racked.",
+ "\[00:32\] [span_name("stern human woman")] says \"Burn in hell.\"",
+ "\[00:33\] A pistol is fired!",
+ "\[00:36\] [span_name("stern human woman")] states \"Get moving. I want us out and a garrison deployed within the hour.\"",
+ "\[00:38\] armored footsteps thump against a metal floor",
+ "\[00:44\] an airlock hisses open.",
+ "\[00:45\] [span_name("stern human woman")] taunts \"tchuss, tovai.\"",
+ "\[00:50\] an airlock suddenly closes!",
+ "\[02:00\] Recording ended.",
+ )
+ timestamp = list(
+ 0,
+ 2,
+ 5,
+ 8,
+ 11,
+ 12,
+ 17,
+ 20,
+ 25,
+ 26,
+ 27,
+ 30,
+ 32,
+ 33,
+ 36,
+ 38,
+ 44,
+ 45,
+ 50,
+ 120
+ )
diff --git a/code/modules/ruins/sandplanet_ruin_code/cave_base.dm b/code/modules/ruins/sandplanet_ruin_code/cave_base.dm
new file mode 100644
index 000000000000..91caf21e1edf
--- /dev/null
+++ b/code/modules/ruins/sandplanet_ruin_code/cave_base.dm
@@ -0,0 +1,224 @@
+//the satchel charge that'll explode
+
+/obj/item/grenade/c4/satchel_charge/cave_base
+ det_time = 15
+ desc = "With Love - Kerberos-574"
+
+//i am such a bitch
+/obj/item/grenade/c4/satchel_charge/cave_base/Initialize()
+ . = ..()
+ AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE, INVISIBILITY_OBSERVER, use_anchor = TRUE)
+ wires.attach_assembly_init(/obj/item/assembly/signaler/preset/cave_base)
+
+/obj/item/assembly_holder/premade/cave_base
+ a_left = /obj/item/assembly/signaler/preset/cave_base
+ a_right = /obj/item/assembly/prox_sensor/preset/cave_base
+
+/obj/item/grenade/c4/cave_base
+
+/obj/item/grenade/c4/cave_base/Initialize()
+ . = ..()
+ AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE, INVISIBILITY_OBSERVER, use_anchor = TRUE)
+ wires.attach_assembly_init(/obj/item/assembly/voice/preset/cave_base)
+
+/obj/item/assembly/signaler/preset/cave_base
+ code = 44
+ frequency = 1451
+
+/obj/item/assembly/voice/preset/cave_base
+ mode = 1
+ recorded = "Goodbye~"
+
+/obj/item/assembly/prox_sensor/preset/cave_base
+
+//pre-netted cams
+/obj/machinery/camera/cave_base
+ network = list("ForwardPost")
+
+/obj/machinery/computer/security/retro/cave_base
+ network = list("ForwardPost")
+
+//turret
+/obj/machinery/porta_turret/cave_base
+ max_integrity = 100
+ faction = list("turret", "Forward_Ops_Post")
+ stun_projectile = /obj/projectile/beam/laser/heavylaser
+ stun_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
+ lethal_projectile = /obj/projectile/beam/laser/heavylaser
+ lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
+ turret_flags = TURRET_FLAG_SHOOT_ALLMOBS
+
+//gut wrenching content
+
+/datum/preset_holoimage/hapless_ipc
+ species_type = /datum/species/ipc
+ outfit_type = /datum/outfit/job/independent/security/pirate/jupiter
+
+/datum/outfit/cave_base_ipc
+ name = "Cave Base IPC"
+ uniform = /obj/item/clothing/under/utility
+ head = /obj/item/clothing/head/soft/black
+ shoes = /obj/item/clothing/shoes/combat
+ l_pocket = /obj/item/melee/knife/combat
+ suit = /obj/item/clothing/suit/hooded/cloak/goliath
+
+
+/datum/preset_holoimage/hunting_ipc
+ species_type = /datum/species/ipc
+ outfit_type = /datum/outfit/cave_base_ipc
+
+/obj/item/disk/holodisk/ruin/cave_base/one
+ name = "holorecord disk - Journal #1"
+ desc = "Stores recorder holocalls, has a layer of dust on it."
+ preset_image_type = /datum/preset_holoimage/hapless_ipc
+ preset_record_text = {"
+ NAME Kerberos-574
+ DELAY 10
+ SAY My Name is Kerberos-574. I've been assigned to this Operations Post for the foreseeable future.
+ DELAY 40
+ SAY Command's orders included some fine print.
+ DELAY 20
+ SAY Said *I* need to keep a journal for my morale's sake.
+ SOUND keyboard
+ DELAY 40
+ SAY Don't know how long I'm gonna be down here but I'm not too keen on journaling.
+ DELAY 30
+ SAY We'll see how it goes, though.
+ DELAY 30
+ "}
+
+/obj/item/disk/holodisk/ruin/cave_base/two
+ name = "holorecord disk - Journal #2"
+ preset_image_type = /datum/preset_holoimage/hapless_ipc
+ preset_record_text = {"
+ NAME Kerberos-574
+ DELAY 30
+ SAY Been about... 2 months since my last journal entry. Haven't heard *shit* from anyone for the past....
+ DELAY 50
+ SOUND keyboard
+ DELAY 10
+ SAY 2 weeks?
+ DELAY 40
+ SAY Checked the relay and made sure that everything was linked up. Got a no connection error when I - well - tried to forcibly re-establish one.
+ DELAY 40
+ SAY Miss being able to chat. But. It is what it is.
+ DELAY 20
+ "}
+
+/obj/item/disk/holodisk/ruin/cave_base/three
+ name = "holorecord disk - Journal #3"
+ preset_image_type = /datum/preset_holoimage/hapless_ipc
+ preset_record_text = {"
+ NAME Kerberos-574
+ DELAY 30
+ SAY 'Nother month down the drain, aye Kerberos?
+ DELAY 40
+ SAY Yup. Still haven't heard anything from anyone.
+ DELAY 40
+ SAY Just making sure this place runs, and that *I'm* okay.
+ DELAY 50
+ SAY Weather has been picking up something fierce lately. Scanners are saying that the planetoid is entering it's winter.
+ DELAY 40
+ SAY Heh. Maybe some new beasts will show themselves.
+ DELAY 40
+ SAY I was dropped with an AMR and kit for a reason after all...
+ DELAY 30
+ SAY Self-defense. And you know what the Solarians say about the best defense.
+ SOUND rustle
+ DELAY 50
+ "}
+
+/obj/item/disk/holodisk/ruin/cave_base/four
+ name = "holorecord disk - Journal #4"
+ preset_image_type = /datum/preset_holoimage/hunting_ipc
+ preset_record_text = {"
+ NAME Kerberos-574
+ DELAY 20
+ SAY One Four Point Five
+ SOUND sparks
+ DELAY 20
+ SAY One Four Point Five By One Four Six Point Seven.
+ SOUND sparks
+ DELAY 20
+ SOUND sparks
+ DELAY 40
+ SAY -and that animal clipped me in something important.
+ DELAY 30
+ SAY I got knocked around - and landed by something *buzzing*.
+ DELAY 30
+ SAY Got the gun. Scrambled away.
+ DELAY 20
+ SAY But I've been blacking out for bits. Losing days.
+ DELAY 15
+ SOUND rustle
+ DELAY 20
+ SAY And still no word from command. Starting to wor-
+ DELAY 5
+ SOUND sparks
+ DELAY 20
+ SAY One Fou-
+ DELAY 5
+ "}
+
+/obj/item/disk/holodisk/ruin/cave_base/five
+ name = "holorecord disk - Journal #5"
+ preset_image_type = /datum/preset_holoimage/hunting_ipc
+ preset_record_text = {"
+ NAME Kerberos-574
+ DELAY 20
+ SAY I used to be a renegade!~
+ DELAY 30
+ SAY Used to fool around!~
+ SOUND sparks
+ DELAY 30
+ SAY But they left me on this godsdamned rock!~
+ DELAY 30
+ SAY And I had to learn new rounds!~
+ DELAY 30
+ SAY Don't know where I picked up that beat. Maybe that static put it in my processors.
+ DELAY 50
+ SAY I'm runnin out of rounds for my crunch gun too.
+ DELAY 25
+ SAY Not that I'm keen to heft 50kg around.
+ SOUND rustle
+ DELAY 40
+ SAY But I've been going through my old intel reports, and there're some ships in the dust that I could get to. With a few weeks.
+ DELAY 80
+ SOUND sparks
+ SAY I'm gonna go for it soon. Just gotta get everything in order.
+ DELAY 40
+ "}
+
+/obj/item/disk/holodisk/ruin/cave_base/six
+ name = "holorecord disk - Journal #6"
+ preset_image_type = /datum/preset_holoimage/hunting_ipc
+ preset_record_text = {"
+ NAME Kerberos-574
+ DELAY 30
+ SAY Hey!
+ DELAY 25
+ SAY I missed you earlier.
+ SOUND sparks
+ DELAY 30
+ SAY Gonna be out for a bit, gotta find a ship.
+ DELAY 40
+ SAY Gotta find a radio. Gotta call help.
+ DELAY 30
+ SAY Maybe they can fix me somewhere~
+ DELAY 30
+ SOUND sparks
+ DELAY 10
+ SAY I've got this place ah - set just in case anyone comes snooping around.
+ DELAY 40
+ SOUND sparks
+ SAY There is no strategic information.
+ DELAY 20
+ SAY There is no essential equipment.
+ DELAY 20
+ SAY Just you and me~
+ SOUND hiss
+ DELAY 30
+ SAY Maybe one day we'll really meet. For now?
+ DELAY 40
+ SAY Goodbye~
+ "}
diff --git a/code/modules/ruins/wasteplanet_ruin_code/tradepost.dm b/code/modules/ruins/wasteplanet_ruin_code/tradepost.dm
new file mode 100644
index 000000000000..5369d0e2f2d1
--- /dev/null
+++ b/code/modules/ruins/wasteplanet_ruin_code/tradepost.dm
@@ -0,0 +1,61 @@
+/obj/item/tape/random/preset/tradepost/one
+ ruined = 1
+ used_capacity = 120
+
+/obj/item/tape/random/preset/tradepost/one/Initialize()
+ . = ..()
+ storedinfo = list(
+ "\[00:00\] Recording started.",
+ "\[00:06\] [span_name("firm elzousa")] drawls \"Now I figure that... give or take a few months a' tradin out here, I'll 'ave enough money t' pay you boys forra 'nother year.\"",
+ "\[00:14\] [span_name("muffled rachnid woman")] declares \"Caelum. If you don't have payment rendered soon we this contract is called.\"",
+ "\[00:23\] [span_name("firm elzousa")] drawls \"I know. I know. I gotcha few more weeks of pay annif I don' make any trades, then 's done.\"",
+ "\[00:32\] [span_name("firm elzousa")] drawls \"Don'tcha wave those things at me.\"",
+ "\[00:37\] [span_name("muffled rachnid woman")] declares \"You have two weeks. My enforcers are reporting that the area is drawing the attention of scrapbots.\"",
+ "\[00:46\] [span_name("muffled rachnid woman")] declares \"If we don't have the money to buy more ammo, I don't need to tell you what'll happen.\"",
+ "\[00:50\] [span_name("firm elzousa")] lets out a sigh.",
+ "\[00:53\] [span_name("firm elzousa")] drawls \" Cour ma'am. Cour. \"",
+ )
+ timestamp = list(
+ 0,
+ 6,
+ 14,
+ 23,
+ 32,
+ 37,
+ 46,
+ 50,
+ 53
+ )
+
+/obj/effect/mob_spawn/human/corpse/inteq/medic/tradepost
+ mob_name = "Jenny Amasatsu"
+ brute_damage = 140
+ burn_damage = 78
+ mob_gender = FEMALE
+ outfit = /datum/outfit/job/inteq/paramedic/tradepost
+
+/obj/effect/mob_spawn/human/corpse/inteq/vanguard/tradepost
+ outfit = /datum/outfit/job/inteq/captain/tradepost
+ mob_species = /datum/species/spider
+ gender = FEMALE
+
+/obj/effect/mob_spawn/human/corpse/indie/engineer
+ outfit = /datum/outfit/job/independent/engineer
+
+/obj/effect/mob_spawn/human/corpse/indie/manager
+ outfit = /datum/outfit/job/independent/captain/manager
+ mob_species = /datum/species/elzuose
+ backpack_contents = null
+
+
+/datum/outfit/job/inteq/paramedic/tradepost
+ name = "Trade Post Corpsman"
+ belt = /obj/item/storage/belt/medical/webbing
+
+/datum/outfit/job/inteq/captain/tradepost
+ name = "Trade Post Vanguard"
+
+ r_pocket = null
+ l_pocket = null
+
+ backpack_contents = null
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 6cb9f7304585..65e893994912 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -82,6 +82,7 @@ All ShuttleMove procs go here
/turf/proc/afterShuttleMove(turf/oldT, rotation, list/all_towed_shuttles)
//Dealing with the turf we left behind
oldT.TransferComponents(src)
+ src.base_icon_state = oldT.base_icon_state
SEND_SIGNAL(oldT, COMSIG_TURF_AFTER_SHUTTLE_MOVE, src) //Mostly for decals
if(rotation)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 5af554a60557..5b6e6239f6a7 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -5,9 +5,9 @@
//NORTH default dir
/obj/docking_port
- invisibility = INVISIBILITY_ABSTRACT
- icon = 'icons/obj/device.dmi'
- icon_state = "pinonfar"
+ invisibility = INVISIBILITY_OBSERVER
+ icon = 'icons/effects/mapping/docking_ports.dmi'
+ icon_state = "static"
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | LANDING_PROOF | HYPERSPACE_PROOF
anchored = TRUE
@@ -249,7 +249,7 @@
name = "transit dock"
var/datum/map_zone/reserved_mapzone
- var/area/shuttle/transit/assigned_area
+ var/area/hyperspace/assigned_area
var/obj/docking_port/mobile/owner
/obj/docking_port/stationary/transit/Initialize()
@@ -272,7 +272,7 @@
/obj/docking_port/mobile
name = "shuttle"
- icon_state = "pinonclose"
+ icon_state = "mobile"
var/area_type = SHUTTLE_DEFAULT_SHUTTLE_AREA_TYPE
@@ -409,7 +409,7 @@
shuttle_areas = list()
var/list/all_turfs = return_ordered_turfs(x, y, z, dir)
for(var/turf/curT as anything in all_turfs)
- var/area/shuttle/cur_area = curT.loc
+ var/area/ship/cur_area = curT.loc
if(istype(cur_area, area_type))
turf_count++
shuttle_areas[cur_area] = TRUE
@@ -651,7 +651,7 @@
continue // out of bounds
if(T0.type == T0.baseturfs)
continue // indestructible
- if(!all_shuttle_areas[T0.loc] || istype(T0.loc, /area/shuttle/transit))
+ if(!all_shuttle_areas[T0.loc] || istype(T0.loc, /area/hyperspace))
continue // not part of the shuttle
ripple_turfs += T1
@@ -722,13 +722,13 @@
var/obj/docking_port/stationary/S0 = docked
if(istype(S0, /obj/docking_port/stationary/transit) && timeLeft(1) <= PARALLAX_LOOP_TIME)
for(var/place in shuttle_areas)
- var/area/shuttle/shuttle_area = place
+ var/area/ship/shuttle_area = place
if(shuttle_area.parallax_movedir)
parallax_slowdown()
/obj/docking_port/mobile/proc/parallax_slowdown()
for(var/place in shuttle_areas)
- var/area/shuttle/shuttle_area = place
+ var/area/ship/shuttle_area = place
shuttle_area.parallax_movedir = FALSE
if(assigned_transit && assigned_transit.assigned_area)
assigned_transit.assigned_area.parallax_movedir = FALSE
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 4f785516f5cc..9888384d59cb 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -1,18 +1,15 @@
GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
/mob/living,
- /obj/effect/rune,
/obj/structure/spider/spiderling,
/obj/item/disk/nuclear,
/obj/machinery/nuclearbomb,
/obj/item/beacon,
- /obj/singularity/narsie,
/obj/singularity/wizard,
/obj/machinery/teleport/station,
/obj/machinery/teleport/hub,
/obj/machinery/quantumpad,
/obj/effect/mob_spawn,
/obj/effect/hierophant,
- /obj/structure/receiving_pad,
/obj/item/warp_cube,
/obj/machinery/rnd/production, //print tracking beacons, send shuttle
/obj/machinery/autolathe, //same
@@ -34,168 +31,3 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
/obj/item/pipe
//[/CELADON-ADD]
)))
-
-/*
-/obj/docking_port/mobile/supply
- name = "supply shuttle"
- callTime = 600
-
- dir = WEST
- port_direction = EAST
- width = 12
- dwidth = 5
- height = 7
- movement_force = list("KNOCKDOWN" = 0, "THROW" = 0)
-
-
- //Export categories for this run, this is set by console sending the shuttle.
- var/export_categories = EXPORT_CARGO
-
-/obj/docking_port/mobile/supply/register()
- . = ..()
- SSshuttle.supply = src
-
-/obj/docking_port/mobile/supply/proc/check_blacklist(areaInstances)
- for(var/place in areaInstances)
- var/area/shuttle/shuttle_area = place
- for(var/trf in shuttle_area)
- var/turf/T = trf
- for(var/a in T.GetAllContents())
- if(is_type_in_typecache(a, GLOB.blacklisted_cargo_types) && !istype(a, /obj/docking_port))
- return FALSE
- return TRUE
-
-/obj/docking_port/mobile/supply/request(obj/docking_port/stationary/S)
- if(mode != SHUTTLE_IDLE)
- return 2
- return ..()
-
-
-/obj/docking_port/mobile/supply/initiate_docking()
- if(get_docked() == SSshuttle.supply_away_port) // Buy when we leave home.
- buy()
- . = ..() // Fly/enter transit.
- if(. != DOCKING_SUCCESS)
- return
- if(get_docked() == SSshuttle.supply_away_port) // Sell when we get home
- sell()
-
-/obj/docking_port/mobile/supply/proc/buy()
- var/list/obj/miscboxes = list() //miscboxes are combo boxes that contain all small_item orders grouped
- var/list/misc_order_num = list() //list of strings of order numbers, so that the manifest can show all orders in a box
- var/list/misc_contents = list() //list of lists of items that each box will contain
- if(!SSshuttle.shoppinglist.len)
- return
-
- var/list/empty_turfs = list()
- for(var/place in shuttle_areas)
- var/area/shuttle/shuttle_area = place
- for(var/turf/open/floor/T in shuttle_area)
- if(T.is_blocked_turf())
- continue
- empty_turfs += T
-
- var/value = 0
- var/purchases = 0
- for(var/datum/supply_order/SO in SSshuttle.shoppinglist)
- if(!empty_turfs.len)
- break
- var/price = SO.pack.cost
- var/datum/bank_account/D
- if(SO.paying_account) //Someone paid out of pocket
- D = SO.paying_account
- price *= 1.1 //TODO make this customizable by the quartermaster
- else
- D = SSeconomy.get_dep_account(ACCOUNT_CAR)
- if(D)
- if(!D.adjust_money(-price))
- if(SO.paying_account)
- D.bank_card_talk("Cargo order #[SO.id] rejected due to lack of funds. Credits required: [price]")
- continue
-
- if(SO.paying_account)
- D.bank_card_talk("Cargo order #[SO.id] has shipped. [price] credits have been charged to your bank account.")
- var/datum/bank_account/department/cargo = SSeconomy.get_dep_account(ACCOUNT_CAR)
- cargo.adjust_money(price - SO.pack.cost) //Cargo gets the handling fee
- value += SO.pack.cost
- SSshuttle.shoppinglist -= SO
- SSshuttle.orderhistory += SO
-
- if(SO.pack.small_item) //small_item means it gets piled in the miscbox
- if(SO.paying_account)
- if(!miscboxes.len || !miscboxes[D.account_holder]) //if there's no miscbox for this person
- miscboxes[D.account_holder] = new /obj/structure/closet/crate/secure/owned(pick_n_take(empty_turfs), SO.paying_account)
- miscboxes[D.account_holder].name = "small items crate - purchased by [D.account_holder]"
- misc_contents[D.account_holder] = list()
- for (var/item in SO.pack.contains)
- misc_contents[D.account_holder] += item
- misc_order_num[D.account_holder] = "[misc_order_num[D.account_holder]]#[SO.id] "
- else //No private payment, so we just stuff it all into a generic crate
- if(!miscboxes.len || !miscboxes["Cargo"])
- miscboxes["Cargo"] = new /obj/structure/closet/crate/secure(pick_n_take(empty_turfs))
- miscboxes["Cargo"].name = "small items crate"
- misc_contents["Cargo"] = list()
- miscboxes["Cargo"].req_access = list()
- for (var/item in SO.pack.contains)
- misc_contents["Cargo"] += item
- //new item(miscboxes["Cargo"])
- if(SO.pack.access)
- miscboxes["Cargo"].req_access += SO.pack.access
- misc_order_num["Cargo"] = "[misc_order_num["Cargo"]]#[SO.id] "
- else
- SO.generate(pick_n_take(empty_turfs))
-
- SSblackbox.record_feedback("nested tally", "cargo_imports", 1, list("[SO.pack.cost]", "[SO.pack.name]"))
- investigate_log("Order #[SO.id] ([SO.pack.name], placed by [key_name(SO.orderer_ckey)]), paid by [D.account_holder] has shipped.", INVESTIGATE_CARGO)
- if(SO.pack.dangerous)
- message_admins("\A [SO.pack.name] ordered by [ADMIN_LOOKUPFLW(SO.orderer_ckey)], paid by [D.account_holder] has shipped.")
- purchases++
-
- for(var/I in miscboxes)
- var/datum/supply_order/SO = new/datum/supply_order()
- SO.id = misc_order_num[I]
- SO.generateCombo(miscboxes[I], I, misc_contents[I])
- qdel(SO)
-
- var/datum/bank_account/cargo_budget = SSeconomy.get_dep_account(ACCOUNT_CAR)
- investigate_log("[purchases] orders in this shipment, worth [value] credits. [cargo_budget.account_balance] credits left.", INVESTIGATE_CARGO)
-
-/obj/docking_port/mobile/supply/proc/sell()
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
- var/presale_points = D.account_balance
-
- if(!GLOB.exports_list.len) // No exports list? Generate it!
- setupExports()
-
- var/msg = ""
- var/matched_bounty = FALSE
-
- var/datum/export_report/ex = new
-
- for(var/place in shuttle_areas)
- var/area/shuttle/shuttle_area = place
- for(var/atom/movable/AM in shuttle_area)
- if(iscameramob(AM))
- continue
- if(bounty_ship_item_and_contents(AM, dry_run = FALSE))
- matched_bounty = TRUE
- if(!AM.anchored || istype(AM, /obj/mecha))
- export_item_and_contents(AM, export_categories , dry_run = FALSE, external_report = ex)
-
- if(ex.exported_atoms)
- ex.exported_atoms += "." //ugh
-
- if(matched_bounty)
- msg += "Bounty items received. An update has been sent to all bounty consoles. "
-
- for(var/datum/export/E in ex.total_amount)
- var/export_text = E.total_printout(ex)
- if(!export_text)
- continue
-
- msg += export_text + "\n"
- D.adjust_money(ex.total_value[E])
-
- SSshuttle.centcom_message = msg
- investigate_log("Shuttle contents sold for [D.account_balance - presale_points] credits. Contents: [ex.exported_atoms ? ex.exported_atoms.Join(",") + "." : "none."] Message: [SSshuttle.centcom_message || "none."]", INVESTIGATE_CARGO)
-*/
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index c67e82cf7e7d..bc453eecd3d1 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -117,7 +117,6 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
var/holder_var_amount = 20 //same. The amount adjusted with the mob's var when the spell is used
var/clothes_req = TRUE //see if it requires clothes
- var/cult_req = FALSE //SPECIAL SNOWFLAKE clothes required for cult only spells
var/human_req = FALSE //spell can only be cast by humans
var/nonabstract_req = FALSE //spell can only be cast by mobs that are physical entities
var/stat_allowed = FALSE //see if it requires being conscious/alive, need to set to 1 for ghostpells
@@ -209,19 +208,6 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
if(!is_type_in_typecache(H.head, casting_clothes))
to_chat(H, " You don't feel strong enough without your hat!")
return FALSE
- if(cult_req) //CULT_REQ CLOTHES CHECK
- // [CELADON-EDIT] - CELADON_RETURN_CONTENT
- // if(!istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/cult)) // CELADON-EDIT - ORIGINAL
- if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/cult))
- // [/CELADON-EDIT]
- to_chat(H, " You don't feel strong enough without your armor.")
- return FALSE
- // [CELADON-EDIT] - CELADON_RETURN_CONTENT
- // if(!istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/cult)) // CELADON-EDIT - ORIGINAL
- if(!istype(H.head, /obj/item/clothing/head/magus) && !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/cult))
- // [/CELADON-EDIT]
- to_chat(H, " You don't feel strong enough without your helmet.")
- return FALSE
else
if(clothes_req || human_req)
to_chat(user, " This spell can only be cast by humans!")
diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm
deleted file mode 100644
index 61c05c4170fe..000000000000
--- a/code/modules/spells/spell_types/construct_spells.dm
+++ /dev/null
@@ -1,327 +0,0 @@
-//////////////////////////////Construct Spells/////////////////////////
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser
- charge_max = 1800
- action_background_icon_state = "bg_demon"
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser/cult
- clothes_req = TRUE
- charge_max = 2500
-
-/obj/effect/proc_holder/spell/aoe_turf/area_conversion
- name = "Area Conversion"
- desc = "This spell instantly converts a small area around you."
-
- school = "transmutation"
- charge_max = 50
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = 2
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "areaconvert"
- action_background_icon_state = "bg_cult"
-
-/obj/effect/proc_holder/spell/aoe_turf/area_conversion/cast(list/targets, mob/user = usr)
- playsound(get_turf(user), 'sound/items/welder.ogg', 75, TRUE)
- for(var/turf/T in targets)
- T.narsie_act(FALSE, TRUE, 100 - (get_dist(user, T) * 25))
-
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/floor
- name = "Summon Cult Floor"
- desc = "This spell constructs a cult floor."
-
- school = "conjuration"
- charge_max = 20
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = 0
- summon_type = list(/turf/open/floor/engine/cult)
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "floorconstruct"
- action_background_icon_state = "bg_cult"
-
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/wall
- name = "Summon Cult Wall"
- desc = "This spell constructs a cult wall."
-
- school = "conjuration"
- charge_max = 100
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = 0
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "lesserconstruct"
- action_background_icon_state = "bg_cult"
-
- summon_type = list(/turf/closed/wall/mineral/cult/artificer) //we don't want artificer-based runed metal farms
-
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced
- name = "Greater Construction"
- desc = "This spell constructs a reinforced metal wall."
-
- school = "conjuration"
- charge_max = 300
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = 0
-
- summon_type = list(/turf/closed/wall/r_wall)
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone
- name = "Summon Soulstone"
- desc = "This spell reaches into Nar'Sie's realm, summoning one of the legendary fragments across time and space."
-
- school = "conjuration"
- charge_max = 2400
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = 0
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "summonsoulstone"
- action_background_icon_state = "bg_demon"
-
- summon_type = list(/obj/item/soulstone)
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/cult
- clothes_req = TRUE
- charge_max = 3600
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/noncult
- summon_type = list(/obj/item/soulstone/anybody)
-
-/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/noncult/purified
- summon_type = list(/obj/item/soulstone/anybody/purified)
-
-/obj/effect/proc_holder/spell/targeted/forcewall/cult
- name = "Shield"
- desc = "This spell creates a temporary forcefield to shield yourself and allies from incoming fire."
- school = "transmutation"
- charge_max = 400
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- wall_type = /obj/effect/forcefield/cult
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "cultforcewall"
- action_background_icon_state = "bg_demon"
-
-
-
-/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift
- name = "Phase Shift"
- desc = "This spell allows you to pass through walls."
-
- school = "transmutation"
- charge_max = 250
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = -1
- include_user = TRUE
- jaunt_duration = 50 //in deciseconds
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "phaseshift"
- action_background_icon_state = "bg_demon"
- jaunt_in_time = 6
- jaunt_in_type = /obj/effect/temp_visual/dir_setting/wraith
- jaunt_out_type = /obj/effect/temp_visual/dir_setting/wraith/out
-
-/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_steam(mobloc)
- return
-
-/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/angelic
- jaunt_in_type = /obj/effect/temp_visual/dir_setting/wraith/angelic
- jaunt_out_type = /obj/effect/temp_visual/dir_setting/wraith/out/angelic
-
-/obj/effect/proc_holder/spell/targeted/projectile/magic_missile/lesser
- name = "Lesser Magic Missile"
- desc = "This spell fires several, slow moving, magic projectiles at nearby targets."
-
- school = "evocation"
- charge_max = 400
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- max_targets = 6
- action_icon_state = "magicm"
- action_background_icon_state = "bg_demon"
- proj_type = /obj/projectile/magic/spell/magic_missile/lesser
-
-/obj/projectile/magic/spell/magic_missile/lesser
- color = "red" //Looks more culty this way
- range = 10
-
-/obj/effect/proc_holder/spell/targeted/smoke/disable
- name = "Paralysing Smoke"
- desc = "This spell spawns a cloud of paralysing smoke."
-
- school = "conjuration"
- charge_max = 200
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = -1
- include_user = TRUE
- cooldown_min = 20 //25 deciseconds reduction per rank
-
- smoke_spread = 3
- smoke_amt = 4
- action_icon_state = "smoke"
- action_background_icon_state = "bg_cult"
-
-/obj/effect/proc_holder/spell/pointed/abyssal_gaze
- name = "Abyssal Gaze"
- desc = "This spell instills a deep terror in your target, temporarily chilling and blinding it."
- charge_max = 750
- range = 5
- stat_allowed = FALSE
- school = "evocation"
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- ranged_mousepointer = 'icons/effects/mouse_pointers/cult_target.dmi'
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_background_icon_state = "bg_demon"
- action_icon_state = "abyssal_gaze"
- active_msg = "You prepare to instill a deep terror in a target..."
-
-/obj/effect/proc_holder/spell/pointed/abyssal_gaze/cast(list/targets, mob/user)
- if(!LAZYLEN(targets))
- to_chat(user, " No target found in range!")
- return FALSE
- if(!can_target(targets[1], user))
- return FALSE
-
- var/mob/living/carbon/target = targets[1]
- if(target.anti_magic_check(TRUE, TRUE))
- to_chat(user, " The spell had no effect!")
- to_chat(target, " You feel a freezing darkness closing in on you, but it rapidly dissipates.")
- return FALSE
-
- to_chat(target, " A freezing darkness surrounds you...")
- target.playsound_local(get_turf(target), 'sound/hallucinations/i_see_you1.ogg', 50, 1)
- user.playsound_local(get_turf(user), 'sound/effects/ghost2.ogg', 50, 1)
- target.become_blind(ABYSSAL_GAZE_BLIND)
- addtimer(CALLBACK(src, PROC_REF(cure_blindness), target), 40)
- target.adjust_bodytemperature(-200)
-
-/**
- * cure_blidness: Cures Abyssal Gaze blindness from the target
- *
- * Arguments:
- * * target The mob that is being cured of the blindness.
- */
-/obj/effect/proc_holder/spell/pointed/abyssal_gaze/proc/cure_blindness(mob/target)
- if(isliving(target))
- var/mob/living/L = target
- L.cure_blind(ABYSSAL_GAZE_BLIND)
-
-/obj/effect/proc_holder/spell/pointed/abyssal_gaze/can_target(atom/target, mob/user, silent)
- . = ..()
- if(!.)
- return FALSE
- if(!iscarbon(target))
- if(!silent)
- to_chat(user, " You can only target carbon based lifeforms!")
- return FALSE
- return TRUE
-
-/obj/effect/proc_holder/spell/pointed/dominate
- name = "Dominate"
- desc = "This spell dominates the mind of a lesser creature to the will of Nar'Sie, allying it only to her direct followers."
- charge_max = 600
- range = 7
- stat_allowed = FALSE
- school = "evocation"
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- ranged_mousepointer = 'icons/effects/mouse_pointers/cult_target.dmi'
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_background_icon_state = "bg_demon"
- action_icon_state = "dominate"
- active_msg = "You prepare to dominate the mind of a target..."
-
-/obj/effect/proc_holder/spell/pointed/dominate/cast(list/targets, mob/user)
- if(!LAZYLEN(targets))
- to_chat(user, " No target found in range.")
- return FALSE
- if(!can_target(targets[1], user))
- return FALSE
-
- var/mob/living/simple_animal/S = targets[1]
- S.add_atom_colour("#990000", FIXED_COLOUR_PRIORITY)
- S.faction = list("cult")
- playsound(get_turf(S), 'sound/effects/ghost.ogg', 100, TRUE)
- new /obj/effect/temp_visual/cult/sac(get_turf(S))
-
-/obj/effect/proc_holder/spell/pointed/dominate/can_target(atom/target, mob/user, silent)
- . = ..()
- if(!.)
- return FALSE
- if(!isanimal(target))
- if(!silent)
- to_chat(user, " Target is not a lesser creature!")
- return FALSE
-
- var/mob/living/simple_animal/S = target
- if(S.mind)
- if(!silent)
- to_chat(user, " [S] is too intelligent to dominate!")
- return FALSE
- if(S.stat)
- if(!silent)
- to_chat(user, " [S] is dead!")
- return FALSE
- if(S.sentience_type != SENTIENCE_ORGANIC)
- if(!silent)
- to_chat(user, " [S] cannot be dominated!")
- return FALSE
- if("cult" in S.faction)
- if(!silent)
- to_chat(user, " [S] is already serving Nar'Sie!")
- return FALSE
- return TRUE
-
-/obj/effect/proc_holder/spell/targeted/projectile/dumbfire/juggernaut
- name = "Gauntlet Echo"
- desc = "Channels energy into your gauntlet - firing its essence forward in a slow moving, yet devastating, attack."
- proj_type = /obj/projectile/magic/spell/juggernaut
- charge_max = 350
- clothes_req = FALSE
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "cultfist"
- action_background_icon_state = "bg_demon"
- sound = 'sound/weapons/resonator_blast.ogg'
-
-/obj/projectile/magic/spell/juggernaut
- name = "Gauntlet Echo"
- icon_state = "cultfist"
- alpha = 180
- damage = 30
- damage_type = BRUTE
- knockdown = 50
- hitsound = 'sound/weapons/punch3.ogg'
- trigger_range = 0
- check_holy = TRUE
- ignored_factions = list("cult")
- range = 15
- speed = 7
-
-/obj/projectile/magic/spell/juggernaut/on_hit(atom/target, blocked)
- . = ..()
- var/turf/T = get_turf(src)
- playsound(T, 'sound/weapons/resonator_blast.ogg', 100, FALSE)
- new /obj/effect/temp_visual/cult/sac(T)
- for(var/obj/O in range(src,1))
- if(O.density && !istype(O, /obj/structure/destructible/cult))
- O.take_damage(90, BRUTE, "melee", 0)
- new /obj/effect/temp_visual/cult/turf/floor(get_turf(O))
diff --git a/code/modules/spells/spell_types/devil.dm b/code/modules/spells/spell_types/devil.dm
deleted file mode 100644
index f1654551df3a..000000000000
--- a/code/modules/spells/spell_types/devil.dm
+++ /dev/null
@@ -1,236 +0,0 @@
-/obj/effect/proc_holder/spell/targeted/conjure_item/violin
- item_type = /obj/item/instrument/violin/golden
- desc = "A devil's instrument of choice. Use this to summon/unsummon your golden violin."
- invocation_type = INVOCATION_WHISPER
- invocation = "I ain't had this much fun since Georgia."
- action_icon_state = "golden_violin"
- name = "Summon golden violin"
- action_icon = 'icons/mob/actions/actions_minor_antag.dmi'
- action_background_icon_state = "bg_demon"
-
-/obj/effect/proc_holder/spell/targeted/summon_contract
- name = "Summon infernal contract"
- desc = "Skip making a contract by hand, just do it by magic."
- invocation_type = INVOCATION_WHISPER
- invocation = "Just sign on the dotted line."
- include_user = FALSE
- range = 5
- clothes_req = FALSE
-
- school = "conjuration"
- charge_max = 150
- cooldown_min = 10
- action_icon_state = "spell_default"
- action_background_icon_state = "bg_demon"
-
-/obj/effect/proc_holder/spell/targeted/summon_contract/cast(list/targets, mob/user = usr)
- for(var/mob/living/carbon/C in targets)
- if(C.mind && user.mind)
- if(C.stat == DEAD)
- if(user.dropItemToGround(user.get_active_held_item()))
- var/obj/item/paper/contract/infernal/revive/contract = new(user.loc, C.mind, user.mind)
- user.put_in_hands(contract)
- else
- var/obj/item/paper/contract/infernal/contract // = new(user.loc, C.mind, contractType, user.mind)
- var/contractTypeName = input(user, "What type of contract?") in sortList(list("Power", "Wealth", "Prestige", "Magic", "Knowledge", "Friendship"))
- switch(contractTypeName)
- if("Power")
- contract = new /obj/item/paper/contract/infernal/power(C.loc, C.mind, user.mind)
- if("Wealth")
- contract = new /obj/item/paper/contract/infernal/wealth(C.loc, C.mind, user.mind)
- if("Prestige")
- contract = new /obj/item/paper/contract/infernal/prestige(C.loc, C.mind, user.mind)
- if("Magic")
- contract = new /obj/item/paper/contract/infernal/magic(C.loc, C.mind, user.mind)
- if("Knowledge")
- contract = new /obj/item/paper/contract/infernal/knowledge(C.loc, C.mind, user.mind)
- if("Friendship")
- contract = new /obj/item/paper/contract/infernal/friend(C.loc, C.mind, user.mind)
- C.put_in_hands(contract)
- else
- to_chat(user, " [C] seems to not be sentient. You cannot summon a contract for [C.p_them()].")
-
-
-/obj/effect/proc_holder/spell/aimed/fireball/hellish
- name = "Hellfire"
- desc = "This spell launches hellfire at the target."
-
- school = "evocation"
- charge_max = 80
- clothes_req = FALSE
- invocation = "Your very soul will catch fire!"
- invocation_type = INVOCATION_SHOUT
- range = 2
-
- projectile_type = /obj/projectile/magic
-
- action_background_icon_state = "bg_demon"
-
-/obj/effect/proc_holder/spell/targeted/infernal_jaunt
- name = "Infernal Jaunt"
- desc = "Use hellfire to phase out of existence."
- charge_max = 200
- clothes_req = FALSE
- selection_type = "range"
- range = -1
- cooldown_min = 0
- overlay = null
- include_user = TRUE
- action_icon_state = "jaunt"
- action_background_icon_state = "bg_demon"
- phase_allowed = TRUE
-
-/obj/effect/proc_holder/spell/targeted/infernal_jaunt/cast(list/targets, mob/living/user = usr)
- if(istype(user))
- if(istype(user.loc, /obj/effect/dummy/phased_mob/slaughter/))
- if(valid_location(user))
- to_chat(user, " You are now phasing in.")
- if(do_after(user, 1.5 SECONDS, user))
- if(valid_location(user))
- user.infernalphasein()
- else
- to_chat(user, " You are no longer near a potential signer.")
-
- else
- to_chat(user, " You can only re-appear near a potential signer.")
- revert_cast()
- return ..()
- else
- user.notransform = TRUE
- user.fakefire()
- to_chat(src, " You begin to phase back into sinful flames.")
- if(do_after(user, 1.5 SECONDS, user))
- user.infernalphaseout()
- else
- to_chat(user, " You must remain still while exiting.")
- user.notransform = FALSE
- user.fakefireextinguish()
- start_recharge()
- return
- revert_cast()
-
-/obj/effect/proc_holder/spell/targeted/infernal_jaunt/proc/valid_location(mob/living/user = usr)
- if(istype(get_area(user), /area/shuttle/)) // Can always phase in in a shuttle.
- return TRUE
- else
- for(var/mob/living/C in orange(2, get_turf(user))) //Can also phase in when nearby a potential buyer.
- if (C.owns_soul())
- return TRUE
- return FALSE
-
-/mob/living/proc/infernalphaseout()
- dust_animation()
- spawn_dust()
- visible_message(" [src] disappears in a flashfire!")
- playsound(get_turf(src), 'sound/magic/enter_blood.ogg', 100, TRUE, -1)
- var/obj/effect/dummy/phased_mob/slaughter/holder = new /obj/effect/dummy/phased_mob/slaughter(loc)
- ExtinguishMob()
- forceMove(holder)
- holder = holder
- notransform = FALSE
- fakefireextinguish()
-
-/mob/living/proc/infernalphasein()
- if(notransform)
- to_chat(src, " You're too busy to jaunt in.")
- return FALSE
- fakefire()
- forceMove(drop_location())
- client.eye = src
- visible_message(" [src] appears in a fiery blaze!")
- playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, TRUE, -1)
- addtimer(CALLBACK(src, PROC_REF(fakefireextinguish)), 15, TIMER_UNIQUE)
-
-/obj/effect/proc_holder/spell/targeted/sintouch
- name = "Sin Touch"
- desc = "Subtly encourage someone to sin."
- charge_max = 1800
- clothes_req = FALSE
- selection_type = "range"
- range = 2
- cooldown_min = 0
- overlay = null
- include_user = FALSE
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "sintouch"
- action_background_icon_state = "bg_demon"
- phase_allowed = FALSE
- random_target = TRUE
- random_target_priority = TARGET_RANDOM
- max_targets = 3
- invocation = "TASTE SIN AND INDULGE!!"
- invocation_type = INVOCATION_SHOUT
-
-/obj/effect/proc_holder/spell/targeted/sintouch/ascended
- name = "Greater sin touch"
- charge_max = 100
- range = 7
- max_targets = 10
-
-/obj/effect/proc_holder/spell/targeted/sintouch/cast(list/targets, mob/living/user = usr)
- for(var/mob/living/carbon/human/H in targets)
- if(!H.mind)
- continue
- if(H.mind.has_antag_datum(/datum/antagonist/sintouched))
- continue
- if(H.anti_magic_check(FALSE, TRUE))
- continue
- H.mind.add_antag_datum(/datum/antagonist/sintouched)
- H.Paralyze(400)
-
-
-/obj/effect/proc_holder/spell/targeted/summon_dancefloor
- name = "Summon Dancefloor"
- desc = "When what a Devil really needs is funk."
- include_user = TRUE
- range = -1
- clothes_req = FALSE
-
- school = "conjuration"
- charge_max = 10
- cooldown_min = 50 //5 seconds, so the smoke can't be spammed
- action_icon = 'icons/mob/actions/actions_minor_antag.dmi'
- action_icon_state = "funk"
- action_background_icon_state = "bg_demon"
-
- var/list/dancefloor_turfs
- var/list/dancefloor_turfs_types
- var/dancefloor_exists = FALSE
- var/datum/effect_system/smoke_spread/transparent/dancefloor_devil/smoke
-
-
-/obj/effect/proc_holder/spell/targeted/summon_dancefloor/cast(list/targets, mob/user = usr)
- LAZYINITLIST(dancefloor_turfs)
- LAZYINITLIST(dancefloor_turfs_types)
-
- if(!smoke)
- smoke = new()
- smoke.set_up(0, get_turf(user))
- smoke.start()
-
- if(dancefloor_exists)
- dancefloor_exists = FALSE
- for(var/i in 1 to dancefloor_turfs.len)
- var/turf/T = dancefloor_turfs[i]
- T.ChangeTurf(dancefloor_turfs_types[i], flags = CHANGETURF_INHERIT_AIR)
- else
- var/list/funky_turfs = RANGE_TURFS(1, user)
- for(var/turf/closed/solid in funky_turfs)
- to_chat(user, " You're too close to a wall.")
- return
- dancefloor_exists = TRUE
- var/i = 1
- dancefloor_turfs.len = funky_turfs.len
- dancefloor_turfs_types.len = funky_turfs.len
- for(var/t in funky_turfs)
- var/turf/T = t
- dancefloor_turfs[i] = T
- dancefloor_turfs_types[i] = T.type
- T.ChangeTurf((i % 2 == 0) ? /turf/open/floor/light/colour_cycle/dancefloor_a : /turf/open/floor/light/colour_cycle/dancefloor_b, flags = CHANGETURF_INHERIT_AIR)
- i++
-
-/datum/effect_system/smoke_spread/transparent/dancefloor_devil
- effect_type = /obj/effect/particle_effect/smoke/transparent/dancefloor_devil
-
-/obj/effect/particle_effect/smoke/transparent/dancefloor_devil
- lifetime = 2
diff --git a/code/modules/spells/spell_types/devil_boons.dm b/code/modules/spells/spell_types/devil_boons.dm
deleted file mode 100644
index 01ea14b15fa8..000000000000
--- a/code/modules/spells/spell_types/devil_boons.dm
+++ /dev/null
@@ -1,76 +0,0 @@
-/obj/effect/proc_holder/spell/targeted/summon_wealth
- name = "Summon wealth"
- desc = "The reward for selling your soul."
- invocation_type = "none"
- include_user = TRUE
- range = -1
- clothes_req = FALSE
- school = "conjuration"
- charge_max = 100
- cooldown_min = 10
- action_icon = 'icons/mob/actions/actions_minor_antag.dmi'
- action_icon_state = "moneybag"
-
-
-/obj/effect/proc_holder/spell/targeted/summon_wealth/cast(list/targets, mob/user = usr)
- for(var/mob/living/carbon/C in targets)
- if(user.dropItemToGround(user.get_active_held_item()))
- var/obj/item = pick(
- new /obj/item/coin/gold(user.drop_location()),
- new /obj/item/coin/diamond(user.drop_location()),
- new /obj/item/coin/silver(user.drop_location()),
- new /obj/item/clothing/accessory/medal/gold(user.drop_location()),
- new /obj/item/stack/sheet/mineral/gold(user.drop_location()),
- new /obj/item/stack/sheet/mineral/silver(user.drop_location()),
- new /obj/item/stack/sheet/mineral/diamond(user.drop_location()),
- new /obj/item/holochip(user.drop_location(), 1000))
- C.put_in_hands(item)
-
-/obj/effect/proc_holder/spell/targeted/view_range
- name = "Distant vision"
- desc = "The reward for selling your soul."
- invocation_type = "none"
- include_user = TRUE
- range = -1
- clothes_req = FALSE
- charge_max = 50
- cooldown_min = 10
- action_icon = 'icons/mob/actions/actions_silicon.dmi'
- action_icon_state = "camera_jump"
- var/ranges = list(7,8,9,10)
-
-/obj/effect/proc_holder/spell/targeted/view_range/cast(list/targets, mob/user = usr)
- for(var/mob/C in targets)
- if(!C.client)
- continue
- C.client.view_size.setTo((input("Select view range:", "Range", 4) in ranges) - 7)
-
-/obj/effect/proc_holder/spell/targeted/summon_friend
- name = "Summon Friend"
- desc = "The reward for selling your soul."
- invocation_type = "none"
- include_user = TRUE
- range = -1
- clothes_req = FALSE
- charge_max = 50
- cooldown_min = 10
- action_icon = 'icons/mob/actions/actions_spells.dmi'
- action_icon_state = "sacredflame"
- var/mob/living/friend
- var/obj/effect/mob_spawn/human/demonic_friend/friendShell
-
-/obj/effect/proc_holder/spell/targeted/summon_friend/cast(list/targets, mob/user = usr)
- if(!QDELETED(friend))
- to_chat(friend, " Your master has deemed you a poor friend. Your durance in hell will now resume.")
- friend.dust(TRUE)
- qdel(friendShell)
- return
- if(!QDELETED(friendShell))
- qdel(friendShell)
- return
- for(var/C in targets)
- var/mob/living/L = C
- friendShell = new /obj/effect/mob_spawn/human/demonic_friend(L.loc, L.mind, src)
-
-/obj/effect/proc_holder/spell/targeted/conjure_item/spellpacket/robeless
- clothes_req = FALSE
diff --git a/code/modules/spells/spell_types/mime.dm b/code/modules/spells/spell_types/mime.dm
index 0e56c1112488..0cfb0ca04449 100644
--- a/code/modules/spells/spell_types/mime.dm
+++ b/code/modules/spells/spell_types/mime.dm
@@ -174,55 +174,6 @@
invocation_type ="none"
..()
-/obj/effect/proc_holder/spell/aimed/finger_guns
- name = "Finger Guns"
- desc = "Shoot a mimed bullet from your fingers that stuns and does some damage."
- school = "mime"
- panel = "Mime"
- charge_max = 300
- clothes_req = FALSE
- antimagic_allowed = TRUE
- invocation_type = INVOCATION_EMOTE
- invocation_emote_self = " You fire your finger gun!"
- range = 20
- projectile_type = /obj/projectile/bullet/mime
- projectile_amount = 3
- sound = null
- active_msg = "You draw your fingers!"
- deactive_msg = "You put your fingers at ease. Another time."
- active = FALSE
-
- action_icon = 'icons/mob/actions/actions_mime.dmi'
- action_icon_state = "finger_guns0"
- action_background_icon_state = "bg_mime"
- base_icon_state = "finger_guns"
-
-
-/obj/effect/proc_holder/spell/aimed/finger_guns/Click()
- var/mob/living/carbon/human/owner = usr
- if(owner.incapacitated())
- to_chat(owner, " You can't properly point your fingers while incapacitated.")
- return
- if(usr && usr.mind)
- if(!usr.mind.miming)
- to_chat(usr, " You must dedicate yourself to silence first!")
- return
- invocation = " [usr.real_name] fires [usr.p_their()] finger gun!"
- else
- invocation_type ="none"
- ..()
-
-/obj/effect/proc_holder/spell/aimed/finger_guns/InterceptClickOn(mob/living/caller, params, atom/target)
- if(caller.incapacitated())
- to_chat(caller, " You can't properly point your fingers while incapacitated.")
- if(charge_type == "recharge")
- var/refund_percent = current_amount/projectile_amount
- charge_counter = charge_max * refund_percent
- start_recharge()
- remove_ranged_ability()
- on_deactivation(caller)
- ..()
-
/obj/item/book/granter/spell/mimery_blockade
spell = /obj/effect/proc_holder/spell/targeted/forcewall/mime
spellname = "Invisible Blockade"
@@ -237,18 +188,3 @@
return
if(!locate(/obj/effect/proc_holder/spell/targeted/mime/speak) in user.mind.spell_list)
user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak)
-
-/obj/item/book/granter/spell/mimery_guns
- spell = /obj/effect/proc_holder/spell/aimed/finger_guns
- spellname = "Finger Guns"
- name = "Guide to Advanced Mimery Vol 2"
- desc = "There aren't any words written..."
- icon_state ="bookmime"
- remarks = list("...")
-
-/obj/item/book/granter/spell/mimery_guns/attack_self(mob/user)
- . = ..()
- if(!.)
- return
- if(!locate(/obj/effect/proc_holder/spell/targeted/mime/speak) in user.mind.spell_list)
- user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak)
diff --git a/code/modules/spells/spell_types/pointed/mind_transfer.dm b/code/modules/spells/spell_types/pointed/mind_transfer.dm
index e0ef3566fa0d..04a91f09b5e4 100644
--- a/code/modules/spells/spell_types/pointed/mind_transfer.dm
+++ b/code/modules/spells/spell_types/pointed/mind_transfer.dm
@@ -30,14 +30,10 @@
var/mob/living/victim = targets[1] //The target of the spell whos body will be transferred to.
var/datum/mind/VM = victim.mind
- if(victim.anti_magic_check(TRUE, FALSE) || VM.has_antag_datum(/datum/antagonist/wizard) || VM.has_antag_datum(/datum/antagonist/cult) || VM.has_antag_datum(/datum/antagonist/changeling) || victim.key[1] == "@")
+ if(victim.anti_magic_check(TRUE, FALSE) || VM.has_antag_datum(/datum/antagonist/wizard) || VM.has_antag_datum(/datum/antagonist/changeling) || victim.key[1] == "@")
if(!silent)
to_chat(user, " [victim.p_their(TRUE)] mind is resisting your spell!")
return FALSE
- if(istype(victim, /mob/living/simple_animal/hostile/guardian))
- var/mob/living/simple_animal/hostile/guardian/stand = victim
- if(stand.summoner)
- victim = stand.summoner
//MIND TRANSFER BEGIN
var/mob/dead/observer/ghost = victim.ghostize()
@@ -84,11 +80,4 @@
if(!silent)
to_chat(user, " [t_He] appear[victim.p_s()] to be catatonic! Not even magic can affect [victim.p_their()] vacant mind.")
return FALSE
- if(istype(victim, /mob/living/simple_animal/hostile/guardian))
- var/mob/living/simple_animal/hostile/guardian/stand = victim
- if(stand.summoner)
- if(stand.summoner == user)
- if(!silent)
- to_chat(user, " Swapping minds with your own guardian would just put you back into your own head!")
- return FALSE
return TRUE
diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm
index 633aa8dc4f25..a5c542c819ce 100644
--- a/code/modules/spells/spell_types/rightandwrong.dm
+++ b/code/modules/spells/spell_types/rightandwrong.dm
@@ -17,15 +17,15 @@ GLOBAL_LIST_INIT(summoned_guns, list(
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/gun/ballistic/shotgun/doublebarrel,
/obj/item/gun/ballistic/shotgun,
- /obj/item/gun/ballistic/shotgun/automatic/combat,
- /obj/item/gun/ballistic/automatic/assault/p16,
+ /obj/item/gun/ballistic/shotgun/automatic/m11,
+ /obj/item/gun/ballistic/automatic/m15,
/obj/item/gun/ballistic/revolver/mateba,
/obj/item/gun/ballistic/rifle/illestren,
/obj/item/pneumatic_cannon/speargun,
/obj/item/gun/energy/lasercannon,
/obj/item/gun/energy/kinetic_accelerator/crossbow/large,
/obj/item/gun/energy/e_gun/nuclear,
- /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto,
+ /obj/item/gun/ballistic/automatic/smg/skm_carbine/saber,
/obj/item/gun/ballistic/automatic/smg/cobra,
/obj/item/gun/ballistic/automatic/assault/hydra/lmg/extended,
/obj/item/gun/ballistic/automatic/assault/hydra,
diff --git a/code/modules/spells/spell_types/shapeshift.dm b/code/modules/spells/spell_types/shapeshift.dm
index 254a43dc23af..3c087cc8840d 100644
--- a/code/modules/spells/spell_types/shapeshift.dm
+++ b/code/modules/spells/spell_types/shapeshift.dm
@@ -20,8 +20,7 @@
var/list/possible_shapes = list(/mob/living/simple_animal/mouse,\
/mob/living/simple_animal/pet/dog/corgi,\
/mob/living/simple_animal/bot/secbot/ed209,\
- /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper,\
- /mob/living/simple_animal/hostile/construct/juggernaut)
+ /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper,)
/obj/effect/proc_holder/spell/targeted/shapeshift/cast(list/targets,mob/user = usr)
if(src in user.mob_spell_list)
diff --git a/code/modules/spells/spell_types/wizard.dm b/code/modules/spells/spell_types/wizard.dm
index 2fab8c5848ef..bc800a49c7d4 100644
--- a/code/modules/spells/spell_types/wizard.dm
+++ b/code/modules/spells/spell_types/wizard.dm
@@ -132,12 +132,6 @@
sound1 = 'sound/magic/blink.ogg'
sound2 = 'sound/magic/blink.ogg'
-/obj/effect/proc_holder/spell/targeted/turf_teleport/blink/cult
- name = "quickstep"
-
- charge_max = 100
- clothes_req = TRUE
-
/obj/effect/proc_holder/spell/targeted/area_teleport/teleport
name = "Teleport"
desc = "This spell teleports you to an area of your selection."
@@ -194,20 +188,6 @@
summon_type = list(/mob/living/simple_animal/hostile/carp)
cast_sound = 'sound/magic/summon_karp.ogg'
-/obj/effect/proc_holder/spell/aoe_turf/conjure/construct
- name = "Artificer"
- desc = "This spell conjures a construct which may be controlled by Shades."
- school = "conjuration"
- charge_max = 600
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- range = 0
- summon_type = list(/obj/structure/constructshell)
- action_icon = 'icons/mob/actions/actions_cult.dmi'
- action_icon_state = "artificer"
- cast_sound = 'sound/magic/summonitems_generic.ogg'
-
/obj/effect/proc_holder/spell/aoe_turf/conjure/creature
name = "Summon Creature Swarm"
desc = "This spell tears the fabric of reality, allowing horrific daemons to spill forth."
@@ -223,12 +203,6 @@
summon_type = list(/mob/living/simple_animal/hostile/netherworld)
cast_sound = 'sound/magic/summonitems_generic.ogg'
-/obj/effect/proc_holder/spell/aoe_turf/conjure/creature/cult
- name = "Summon Creatures (DANGEROUS)"
- clothes_req = TRUE
- charge_max = 5000
- summon_amt = 2
-
/obj/effect/proc_holder/spell/aoe_turf/repulse
name = "Repulse"
desc = "This spell throws everything around the user away."
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 4c9b3556b6aa..e42cb866b508 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -158,26 +158,3 @@
/obj/machinery/satellite/meteor_shield/toggle(user)
if(!..(user))
return FALSE
- if(obj_flags & EMAGGED)
- if(active)
- change_meteor_chance(2)
- else
- change_meteor_chance(0.5)
-
-/obj/machinery/satellite/meteor_shield/proc/change_meteor_chance(mod)
- var/datum/round_event_control/E = locate(/datum/round_event_control/meteor_wave) in SSevents.control
- if(E)
- E.weight *= mod
-
-/obj/machinery/satellite/meteor_shield/Destroy()
- . = ..()
- if(active && (obj_flags & EMAGGED))
- change_meteor_chance(0.5)
-
-/obj/machinery/satellite/meteor_shield/emag_act(mob/user)
- if(obj_flags & EMAGGED)
- return
- obj_flags |= EMAGGED
- to_chat(user, " You access the satellite's debug mode, increasing the chance of meteor strikes.")
- if(active)
- change_meteor_chance(2)
diff --git a/code/modules/surgery/advanced/lobotomy.dm b/code/modules/surgery/advanced/lobotomy.dm
index 0807e1e5c8cc..501cad86da4e 100644
--- a/code/modules/surgery/advanced/lobotomy.dm
+++ b/code/modules/surgery/advanced/lobotomy.dm
@@ -25,7 +25,7 @@
name = "perform lobotomy"
implements = list(
TOOL_SCALPEL = 85, // there is no way this should be reasonable to do basically at all without a real surgery. ghetto lobotomy, for real?
- /obj/item/melee/transforming/energy/sword = 25,
+ /obj/item/melee/energy/sword = 25,
/obj/item/melee/knife = 15,
/obj/item/shard = 10,
/obj/item = 5)
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index d24c6c3b049b..ce5372fab39f 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -109,8 +109,11 @@
var/px_y = 0
var/species_flags_list = list()
+
///the type of damage overlay (if any) to use when this bodypart is bruised/burned.
var/dmg_overlay_type
+ ///the path for dmg overlay icons.
+ var/dmg_overlay_icon = 'icons/mob/dam_mob.dmi'
//Damage messages used by help_shake_act()
var/light_brute_msg = "bruised"
@@ -121,6 +124,9 @@
var/medium_burn_msg = "blistered"
var/heavy_burn_msg = "peeling away"
+ //band-aid for blood overlays & other external overlays until they get refactored
+ var/stored_icon_state
+
/obj/item/bodypart/Initialize()
. = ..()
name = "[limb_id] [parse_zone(body_zone)]"
@@ -373,7 +379,7 @@
if(total_damage >= max_damage * disable_threshold) //Easy limb disable disables the limb at 40% health instead of 0%
if(!last_maxed)
- if(owner.stat < UNCONSCIOUS)
+ if(owner.stat < UNCONSCIOUS && !HAS_TRAIT(owner, TRAIT_ANALGESIA))
INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "scream")
last_maxed = TRUE
set_disabled(TRUE)
@@ -511,8 +517,8 @@
//Updates an organ's brute/burn states for use by update_damage_overlays()
//Returns 1 if we need to update overlays. 0 otherwise.
/obj/item/bodypart/proc/update_bodypart_damage_state()
- var/tbrute = round((brute_dam/max_damage)*3, 1)
- var/tburn = round((burn_dam/max_damage)*3, 1)
+ var/tbrute = min(round((brute_dam/max_damage)*6, 1), 3)
+ var/tburn = min(round((burn_dam/max_damage)*6, 1), 3)
if((tbrute != brutestate) || (tburn != burnstate))
brutestate = tbrute
burnstate = tburn
@@ -564,10 +570,10 @@
no_update = FALSE
if(HAS_TRAIT(C, TRAIT_HUSK) && IS_ORGANIC_LIMB(src))
- dmg_overlay_type = "" //no damage overlay shown when husked
+ //dmg_overlay_type = "" //no damage overlay shown when husked
is_husked = TRUE
else
- dmg_overlay_type = initial(dmg_overlay_type)
+ //dmg_overlay_type = initial(dmg_overlay_type)
is_husked = FALSE
if(!dropping_limb && C.dna?.check_mutation(HULK)) //Please remove hulk from the game. I beg you.
@@ -585,6 +591,11 @@
else
draw_color = null
+ if(C?.dna?.blood_type?.color)
+ damage_color = C.dna.blood_type.color
+ else
+ damage_color = COLOR_BLOOD
+
if(no_update)
return
@@ -677,12 +688,12 @@
image_dir = SOUTH
if(dmg_overlay_type)
if(brutestate)
- var/image/bruteoverlay = image('icons/mob/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_[brutestate]0", -DAMAGE_LAYER, image_dir)
+ var/image/bruteoverlay = image(dmg_overlay_icon, "[dmg_overlay_type]_[body_zone]_[brutestate]0", -DAMAGE_LAYER, image_dir)
if(use_damage_color)
bruteoverlay.color = damage_color
. += bruteoverlay
if(burnstate)
- . += image('icons/mob/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_0[burnstate]", -DAMAGE_LAYER, image_dir)
+ . += image(dmg_overlay_icon, "[dmg_overlay_type]_[body_zone]_0[burnstate]", -DAMAGE_LAYER, image_dir)
var/image/limb = image(layer = -BODYPARTS_LAYER, dir = image_dir)
var/image/aux
@@ -778,6 +789,8 @@
limb_gender,
)*/
+ stored_icon_state = limb.icon_state
+
return
/obj/item/bodypart/deconstruct(disassembled = TRUE)
@@ -799,7 +812,7 @@
///obj/item/bodypart/proc/break_bone_feedback()
owner.visible_message(" You hear a cracking sound coming from [owner]'s [name].", " You feel something crack in your [name]!", " You hear an awful cracking sound.")
- playsound(owner, list('sound/health/bone/bone_break1.ogg','sound/health/bone/bone_break2.ogg','sound/health/bone/bone_break3.ogg','sound/health/bone/bone_break4.ogg','sound/health/bone/bone_break5.ogg','sound/health/bone/bone_break6.ogg'), 100, FALSE, -1)
+ playsound(owner, pick(list('sound/health/bone/bone_break1.ogg','sound/health/bone/bone_break2.ogg','sound/health/bone/bone_break3.ogg','sound/health/bone/bone_break4.ogg','sound/health/bone/bone_break5.ogg','sound/health/bone/bone_break6.ogg')), 100, FALSE, -1)
/obj/item/bodypart/proc/fix_bone()
// owner.update_inv_splints() breaks
@@ -813,7 +826,10 @@
return
if(prob(5))
- to_chat(owner, " [pick("You feel broken bones moving around in your [name]!", "There are broken bones moving around in your [name]!", "The bones in your [name] are moving around!")]")
+ if(HAS_TRAIT(owner, TRAIT_ANALGESIA))
+ to_chat(owner, span_notice("[pick("You feel something shifting inside your [name].", "There is something moving inside [name].", "Something inside your [name] slips.")]"))
+ else
+ to_chat(owner, " [pick("You feel broken bones moving around in your [name]!", "There are broken bones moving around in your [name]!", "The bones in your [name] are moving around!")]")
receive_damage(rand(1, 3))
//1-3 damage every 20 tiles for every broken bodypart.
//A single broken bodypart will give you an average of 650 tiles to run before you get a total of 100 damage and fall into crit
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index 07d30e727c77..4a98e6b93ea0 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -20,7 +20,8 @@
if(C.stat <= SOFT_CRIT)//No more screaming while unconsious
if(IS_ORGANIC_LIMB(affecting))//Chest is a good indicator for if a carbon is robotic in nature or not.
- INVOKE_ASYNC(C, TYPE_PROC_REF(/mob, emote), "scream")
+ if(!HAS_TRAIT(C, TRAIT_ANALGESIA)) //and do we actually feel pain?
+ INVOKE_ASYNC(C, TYPE_PROC_REF(/mob, emote), "scream")
SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "dismembered", /datum/mood_event/dismembered)
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index 05dffd8b4ffd..4c9a9be3b6d4 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -271,11 +271,6 @@
max_damage = 500
animal_origin = ALIEN_BODYPART
-/obj/item/bodypart/head/devil
- dismemberable = 0
- max_damage = 5000
- animal_origin = DEVIL_BODYPART
-
/obj/item/bodypart/head/larva
icon = 'icons/mob/animal_parts.dmi'
icon_state = "larva_head"
diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm
index 5f89d15aa95f..543a0e5fddde 100644
--- a/code/modules/surgery/bodyparts/parts.dm
+++ b/code/modules/surgery/bodyparts/parts.dm
@@ -43,11 +43,6 @@
max_damage = 500
animal_origin = ALIEN_BODYPART
-/obj/item/bodypart/chest/devil
- dismemberable = 0
- max_damage = 5000
- animal_origin = DEVIL_BODYPART
-
/obj/item/bodypart/chest/larva
icon = 'icons/mob/animal_parts.dmi'
icon_state = "larva_chest"
@@ -153,12 +148,6 @@
max_damage = 100
animal_origin = ALIEN_BODYPART
-/obj/item/bodypart/l_arm/devil
- dismemberable = FALSE
- can_be_disabled = FALSE
- max_damage = 5000
- animal_origin = DEVIL_BODYPART
-
/obj/item/bodypart/r_arm
name = "right arm"
desc = "Over 87% of humans are right handed. That figure is much lower \
@@ -255,12 +244,6 @@
max_damage = 100
animal_origin = ALIEN_BODYPART
-/obj/item/bodypart/r_arm/devil
- dismemberable = FALSE
- can_be_disabled = FALSE
- max_damage = 5000
- animal_origin = DEVIL_BODYPART
-
/obj/item/bodypart/leg/left
name = "left leg"
desc = "Some athletes prefer to tie their left shoelaces first for good \
@@ -346,12 +329,6 @@
max_damage = 100
animal_origin = ALIEN_BODYPART
-/obj/item/bodypart/leg/left/devil
- dismemberable = FALSE
- can_be_disabled = FALSE
- max_damage = 5000
- animal_origin = DEVIL_BODYPART
-
/obj/item/bodypart/leg/right
name = "right leg"
desc = "You put your right leg in, your right leg out. In, out, in, out, \
@@ -438,9 +415,3 @@
can_be_disabled = FALSE
max_damage = 100
animal_origin = ALIEN_BODYPART
-
-/obj/item/bodypart/leg/right/devil
- dismemberable = FALSE
- can_be_disabled = FALSE
- max_damage = 5000
- animal_origin = DEVIL_BODYPART
diff --git a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
index 0794602de953..ebf294a3cccf 100644
--- a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
@@ -4,7 +4,7 @@
limb_id = SPECIES_ELZUOSE
is_dimorphic = FALSE
uses_mutcolor = TRUE
- bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC | BODYTYPE_SNOUT
+ bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC | BODYTYPE_SNOUT_SMALL
/obj/item/bodypart/chest/ethereal
icon = 'icons/mob/species/ethereal/bodyparts.dmi'
diff --git a/code/modules/surgery/bodyparts/species_parts/vox_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/vox_bodyparts.dm
index 1437e191578f..b2502f6a172c 100644
--- a/code/modules/surgery/bodyparts/species_parts/vox_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/vox_bodyparts.dm
@@ -4,6 +4,7 @@
is_dimorphic = FALSE
bodytype = BODYTYPE_VOX | BODYTYPE_ORGANIC
should_draw_greyscale = FALSE
+ dmg_overlay_icon = 'icons/mob/species/vox/vox_overlays.dmi'
/obj/item/bodypart/chest/vox
static_icon = 'icons/mob/species/vox/bodyparts.dmi'
@@ -12,18 +13,21 @@
bodytype = BODYTYPE_VOX | BODYTYPE_ORGANIC
acceptable_bodytype = BODYTYPE_VOX
should_draw_greyscale = FALSE
+ dmg_overlay_icon = 'icons/mob/species/vox/vox_overlays.dmi'
/obj/item/bodypart/l_arm/vox
static_icon = 'icons/mob/species/vox/bodyparts.dmi'
limb_id = SPECIES_VOX
bodytype = BODYTYPE_VOX | BODYTYPE_ORGANIC
should_draw_greyscale = FALSE
+ dmg_overlay_icon = 'icons/mob/species/vox/vox_overlays.dmi'
/obj/item/bodypart/r_arm/vox
static_icon = 'icons/mob/species/vox/bodyparts.dmi'
limb_id = SPECIES_VOX
bodytype = BODYTYPE_VOX | BODYTYPE_ORGANIC
should_draw_greyscale = FALSE
+ dmg_overlay_icon = 'icons/mob/species/vox/vox_overlays.dmi'
/obj/item/bodypart/leg/left/vox
static_icon = 'icons/mob/species/vox/bodyparts.dmi'
@@ -31,6 +35,7 @@
bodytype = BODYTYPE_VOX | BODYTYPE_ORGANIC
should_draw_greyscale = FALSE
dismemberable = FALSE //BIG MEATY THIGHS
+ dmg_overlay_icon = 'icons/mob/species/vox/vox_overlays.dmi'
/obj/item/bodypart/leg/right/vox
static_icon = 'icons/mob/species/vox/bodyparts.dmi'
@@ -38,3 +43,4 @@
bodytype = BODYTYPE_VOX | BODYTYPE_ORGANIC
should_draw_greyscale = FALSE
dismemberable = FALSE
+ dmg_overlay_icon = 'icons/mob/species/vox/vox_overlays.dmi'
diff --git a/code/modules/surgery/core_removal.dm b/code/modules/surgery/core_removal.dm
deleted file mode 100644
index c5bfd1108202..000000000000
--- a/code/modules/surgery/core_removal.dm
+++ /dev/null
@@ -1,44 +0,0 @@
-/datum/surgery/core_removal
- name = "Core removal"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/extract_core)
- target_mobtypes = list(/mob/living/simple_animal/slime)
- possible_locs = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_R_LEG,BODY_ZONE_L_LEG,BODY_ZONE_CHEST,BODY_ZONE_HEAD)
- lying_required = FALSE
- ignore_clothes = TRUE
-
-/datum/surgery/core_removal/can_start(mob/user, mob/living/target)
- if(target.stat == DEAD)
- return 1
- return 0
-
-//extract brain
-/datum/surgery_step/extract_core
- name = "extract core"
- implements = list(
- TOOL_HEMOSTAT = 100,
- TOOL_CROWBAR = 100)
- time = 16
-
-/datum/surgery_step/extract_core/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- display_results(user, target, " You begin to extract a core from [target]...",
- " [user] begins to extract a core from [target].",
- " [user] begins to extract a core from [target].")
-
-/datum/surgery_step/extract_core/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
- var/mob/living/simple_animal/slime/slime = target
- if(slime.cores > 0)
- slime.cores--
- display_results(user, target, " You successfully extract a core from [target]. [slime.cores] core\s remaining.",
- " [user] successfully extracts a core from [target]!",
- " [user] successfully extracts a core from [target]!")
-
- new slime.coretype(slime.loc)
-
- if(slime.cores <= 0)
- slime.icon_state = "[slime.colour] baby slime dead-nocore"
- return ..()
- else
- return 0
- else
- to_chat(user, " There aren't any cores left in [target]!")
- return ..()
diff --git a/code/modules/surgery/experimental_dissection.dm b/code/modules/surgery/experimental_dissection.dm
index 31f2b64f0290..b1b98d0fdd30 100644
--- a/code/modules/surgery/experimental_dissection.dm
+++ b/code/modules/surgery/experimental_dissection.dm
@@ -15,7 +15,7 @@
// [/CELADON-REMOVE]
/datum/surgery_step/close)
possible_locs = list(BODY_ZONE_CHEST)
- target_mobtypes = list(/mob/living) //Feel free to dissect devils but they're magic.
+ target_mobtypes = list(/mob/living)
replaced_by = /datum/surgery/advanced/experimental_dissection/adv
requires_tech = FALSE
var/value_multiplier = 0.25
diff --git a/code/modules/surgery/gastrectomy.dm b/code/modules/surgery/gastrectomy.dm
index 6d00f5ae7588..201e9125c06f 100644
--- a/code/modules/surgery/gastrectomy.dm
+++ b/code/modules/surgery/gastrectomy.dm
@@ -24,7 +24,7 @@
name = "remove lower duodenum"
implements = list(
TOOL_SCALPEL = 95,
- /obj/item/melee/transforming/energy/sword = 33,
+ /obj/item/melee/energy/sword = 33,
/obj/item/melee/knife = 40,
/obj/item/shard = 10)
time = 52
diff --git a/code/modules/surgery/hepatectomy.dm b/code/modules/surgery/hepatectomy.dm
index 0571cf9b2397..b5b017831d77 100644
--- a/code/modules/surgery/hepatectomy.dm
+++ b/code/modules/surgery/hepatectomy.dm
@@ -23,7 +23,7 @@
name = "remove damaged liver section"
implements = list(
TOOL_SCALPEL = 95,
- /obj/item/melee/transforming/energy/sword = 33,
+ /obj/item/melee/energy/sword = 33,
/obj/item/melee/knife = 40,
/obj/item/shard = 25)
time = 52
diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm
index 79d3d79bcee5..9e9b8e5241a0 100644
--- a/code/modules/surgery/lobectomy.dm
+++ b/code/modules/surgery/lobectomy.dm
@@ -22,7 +22,7 @@
name = "excise damaged lung node"
implements = list(
TOOL_SCALPEL = 95,
- /obj/item/melee/transforming/energy/sword = 33,
+ /obj/item/melee/energy/sword = 33,
/obj/item/melee/knife = 40,
/obj/item/shard = 25)
time = 4.2 SECONDS
diff --git a/code/modules/surgery/mechanical.dm b/code/modules/surgery/mechanical.dm
index 939675fac518..20fd6b9b0b77 100644
--- a/code/modules/surgery/mechanical.dm
+++ b/code/modules/surgery/mechanical.dm
@@ -33,7 +33,7 @@
TOOL_CAUTERY = 60,
TOOL_HEMOSTAT = 60,
TOOL_RETRACTOR = 60,
- /obj/item/melee/transforming/energy = 40,
+ /obj/item/melee/energy = 40,
/obj/item/gun/energy/laser = 20)
time = 2 SECONDS
missinghpbonus = 10
@@ -49,7 +49,7 @@
/datum/surgery_step/heal/mechanic/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/repairtype
- if(tool.tool_behaviour == TOOL_WELDER || tool.tool_behaviour == TOOL_CAUTERY || istype(tool, /obj/item/melee/transforming/energy) || istype(tool, /obj/item/gun/energy/laser))
+ if(tool.tool_behaviour == TOOL_WELDER || tool.tool_behaviour == TOOL_CAUTERY || istype(tool, /obj/item/melee/energy) || istype(tool, /obj/item/gun/energy/laser))
brutehealing = 5
burnhealing = 0
repairtype = "dents"
diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm
index 39fb1d71b258..a3df7efc62ae 100644
--- a/code/modules/surgery/organic_steps.dm
+++ b/code/modules/surgery/organic_steps.dm
@@ -4,7 +4,7 @@
name = "make incision"
implements = list(
TOOL_SCALPEL = 100,
- /obj/item/melee/transforming/energy/sword = 40,
+ /obj/item/melee/energy/sword = 40,
/obj/item/melee/knife = 40,
/obj/item/shard = 25,
/obj/item = 15) //any sharp item
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 665086d1981d..27ccf1421a3f 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -242,7 +242,7 @@
/obj/item/organ/cyberimp/arm/esword
name = "arm-mounted energy blade"
desc = "An illegal and highly dangerous cybernetic implant that can project a deadly blade of concentrated energy."
- items_to_create = list(/obj/item/melee/transforming/energy/blade/hardlight)
+ items_to_create = list(/obj/item/melee/energy/blade/hardlight)
/obj/item/organ/cyberimp/arm/medibeam
name = "integrated medical beamgun"
@@ -280,7 +280,7 @@
/obj/item/organ/cyberimp/arm/combat
name = "combat cybernetics implant"
desc = "A powerful cybernetic implant that contains combat modules built into the user's arm."
- items_to_create = list(/obj/item/melee/transforming/energy/blade/hardlight, /obj/item/gun/medbeam, /obj/item/borg/stun, /obj/item/assembly/flash/armimplant)
+ items_to_create = list(/obj/item/melee/energy/blade/hardlight, /obj/item/gun/medbeam, /obj/item/borg/stun, /obj/item/assembly/flash/armimplant)
/obj/item/organ/cyberimp/arm/combat/Initialize()
. = ..()
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index d4fc2f68e4f6..f854449b3598 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -53,18 +53,22 @@
var/gas_stimulation_min = 0.002 //Nitryl, Stimulum and Freon
var/cold_message = "your face freezing and an icicle forming"
- var/cold_level_1_threshold = 260
- var/cold_level_2_threshold = 200
- var/cold_level_3_threshold = 120
+ var/chilly_message = "chilly air"
+ var/chlly_threshold = T20C-7
+ var/cold_level_1_threshold = 240
+ var/cold_level_2_threshold = 220
+ var/cold_level_3_threshold = 200
var/cold_level_1_damage = COLD_GAS_DAMAGE_LEVEL_1 //Keep in mind with gas damage levels, you can set these to be negative, if you want someone to heal, instead.
var/cold_level_2_damage = COLD_GAS_DAMAGE_LEVEL_2
var/cold_level_3_damage = COLD_GAS_DAMAGE_LEVEL_3
var/cold_damage_type = BURN
var/hot_message = "your face burning and a searing heat"
- var/heat_level_1_threshold = 360
- var/heat_level_2_threshold = 400
- var/heat_level_3_threshold = 1000
+ var/warm_message = "warm air"
+ var/warm_threshold = T20C+10
+ var/heat_level_1_threshold = 316
+ var/heat_level_2_threshold = 323
+ var/heat_level_3_threshold = 343
var/heat_level_1_damage = HEAT_GAS_DAMAGE_LEVEL_1
var/heat_level_2_damage = HEAT_GAS_DAMAGE_LEVEL_2
var/heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3
@@ -72,6 +76,9 @@
var/crit_stabilizing_reagent = /datum/reagent/medicine/epinephrine
+ ///Can we smell odors? If false then we don't smell certain gases
+ var/can_smell = TRUE
+
/obj/item/organ/lungs/New()
. = ..()
populate_gas_info()
@@ -216,6 +223,9 @@
H.reagents.add_reagent(R, breath.get_moles(gas) * 2) // 2 represents molarity of O2, we don't have citadel molarity
mole_adjustments[gas] = (gas in mole_adjustments) ? mole_adjustments[gas] - breath.get_moles(gas) : -breath.get_moles(gas)
+ if(can_smell)
+ handle_smell(breath, H)
+
for(var/gas in mole_adjustments)
breath.adjust_moles(gas, mole_adjustments[gas])
@@ -252,36 +262,18 @@
H.hallucination += 5
H.reagents.add_reagent(/datum/reagent/bz_metabolites,1)
- // Nitryl
- var/nitryl_pp = PP(breath,GAS_NITRYL)
- if (prob(nitryl_pp))
- to_chat(H, " Your mouth feels like it's burning!")
- if (nitryl_pp >40)
- H.emote("gasp")
- H.adjustFireLoss(10)
- if (prob(nitryl_pp/2))
- to_chat(H, " Your throat closes up!")
- H.silent = max(H.silent, 3)
- else
- H.adjustFireLoss(nitryl_pp/4)
- gas_breathed = breath.get_moles(GAS_NITRYL)
- if (gas_breathed > gas_stimulation_min)
- H.reagents.add_reagent(/datum/reagent/nitryl,1)
-
- breath.adjust_moles(GAS_NITRYL, -gas_breathed)
-
// Freon
var/freon_pp = PP(breath,GAS_FREON)
- if (prob(nitryl_pp))
+ if (prob(freon_pp))
to_chat(H, " Your mouth feels like it's burning!")
if (freon_pp >40)
H.emote("gasp")
- H.adjustFireLoss(15)
+ H.adjustOxyLoss(15)
if (prob(freon_pp/2))
to_chat(H, " Your throat closes up!")
H.silent = max(H.silent, 3)
else
- H.adjustFireLoss(freon_pp/4)
+ H.adjustOxyLoss(freon_pp/4)
gas_breathed = breath.get_moles(GAS_FREON)
if (gas_breathed > gas_stimulation_min)
H.reagents.add_reagent(/datum/reagent/freon,1)
@@ -291,15 +283,15 @@
// Chlorine
var/chlorine_pp = PP(breath,GAS_CHLORINE)
if (prob(chlorine_pp))
- to_chat(H, " Your lungs feel awful!")
- if (chlorine_pp >40)
+ to_chat(H, span_alert("Your lungs feel awful!"))
+ if (chlorine_pp >20)
H.emote("gasp")
- H.adjustFireLoss(5)
+ H.adjustOxyLoss(5)
if (prob(chlorine_pp/2))
- to_chat(H, " Your throat closes up!")
+ to_chat(H, span_alert("Your throat closes up!"))
H.silent = max(H.silent, 3)
else
- H.adjustFireLoss(round(chlorine_pp/8))
+ H.adjustOxyLoss(round(chlorine_pp/8))
gas_breathed = breath.get_moles(GAS_CHLORINE)
if (gas_breathed > gas_stimulation_min)
H.reagents.add_reagent(/datum/reagent/chlorine,1)
@@ -308,24 +300,145 @@
// Hydrogen Chloride
var/hydrogen_chloride_pp = PP(breath,GAS_HYDROGEN_CHLORIDE)
if (prob(hydrogen_chloride_pp))
- to_chat(H, " Your lungs feel terrible!")
+ to_chat(H, span_alert("Your lungs feel terrible!"))
if (hydrogen_chloride_pp >20)
H.emote("gasp")
- H.adjustFireLoss(10)
+ H.adjustOxyLoss(10)
if (prob(hydrogen_chloride_pp/2))
- to_chat(H, "Your throat closes up!")
+ to_chat(H, span_alert("Your throat closes up!"))
H.silent = max(H.silent, 3)
else
- H.adjustFireLoss(round(hydrogen_chloride_pp/4))
+ H.adjustOxyLoss(round(hydrogen_chloride_pp/4))
if (gas_breathed > gas_stimulation_min)
H.reagents.add_reagent(/datum/reagent/hydrogen_chloride)
- // Stimulum
- gas_breathed = PP(breath,GAS_STIMULUM)
+ breath.adjust_moles(GAS_HYDROGEN_CHLORIDE, -gas_breathed)
+
+ // Carbon Monoxide
+ var/carbon_monoxide_pp = PP(breath,GAS_CO)
+ if (carbon_monoxide_pp > gas_stimulation_min)
+ H.reagents.add_reagent(/datum/reagent/carbon_monoxide, 1)
+ var/datum/reagent/carbon_monoxide/monoxide_reagent = H.reagents.has_reagent(/datum/reagent/carbon_monoxide)
+ if(monoxide_reagent.volume > 10)
+ monoxide_reagent.metabolization_rate = (10 - carbon_monoxide_pp)
+ else
+ monoxide_reagent.metabolization_rate = monoxide_reagent::metabolization_rate
+ switch(carbon_monoxide_pp)
+ if (0 to 20)
+ monoxide_reagent.accumulation = min(monoxide_reagent.accumulation,50)
+ if (20 to 100)
+ monoxide_reagent.accumulation = min(monoxide_reagent.accumulation, 150)
+ H.reagents.add_reagent(/datum/reagent/carbon_monoxide,2)
+ if (100 to 200)
+ monoxide_reagent.accumulation = min(monoxide_reagent.accumulation, 250)
+ H.reagents.add_reagent(/datum/reagent/carbon_monoxide,4)
+ if (200 to 400)
+ monoxide_reagent.accumulation = min(monoxide_reagent.accumulation, 250)
+ H.reagents.add_reagent(/datum/reagent/carbon_monoxide,8)
+ if (400 to INFINITY)
+ monoxide_reagent.accumulation = max(monoxide_reagent.accumulation, 450)
+ H.reagents.add_reagent(/datum/reagent/carbon_monoxide,16)
+ else
+ var/datum/reagent/carbon_monoxide/monoxide_reagent = H.reagents.has_reagent(/datum/reagent/carbon_monoxide)
+ if(monoxide_reagent)
+ monoxide_reagent.accumulation = min(monoxide_reagent.accumulation, 150)
+ monoxide_reagent.metabolization_rate = 10 //purges 10 per tick
+ breath.adjust_moles(GAS_CO, -gas_breathed)
+
+ // Sulfur Dioxide
+ var/sulfur_dioxide_pp = PP(breath,GAS_SO2)
+ if (prob(sulfur_dioxide_pp) && !HAS_TRAIT(H, TRAIT_ANALGESIA))
+ to_chat(H, span_alert("It hurts to breath."))
+ if (sulfur_dioxide_pp >40)
+ H.emote("gasp")
+ H.adjustOxyLoss(5)
+ if (prob(sulfur_dioxide_pp/2))
+ to_chat(H, span_alert("Your throat closes up!"))
+ H.silent = max(H.silent, 3)
+ else
+ H.adjustOxyLoss(round(sulfur_dioxide_pp/8))
+ gas_breathed = breath.get_moles(GAS_SO2)
+ if (gas_breathed > gas_stimulation_min)
+ H.reagents.add_reagent(/datum/reagent/sulfur_dioxide,1)
+
+ breath.adjust_moles(GAS_SO2, -gas_breathed)
+
+ // Ozone
+ var/ozone_pp = PP(breath,GAS_O3)
+ if (prob(ozone_pp))
+ to_chat(H, span_alert("Your heart feels funny."))
+ if (ozone_pp >40)
+ H.emote("gasp")
+ H.adjustOxyLoss(5)
+ if (prob(ozone_pp/2))
+ to_chat(H, span_alert("Your throat closes up!"))
+ H.silent = max(H.silent, 3)
+ gas_breathed = breath.get_moles(GAS_O3)
+ if (gas_breathed > gas_stimulation_min)
+ H.reagents.add_reagent(/datum/reagent/ozone,1)
+
+ breath.adjust_moles(GAS_O3, -gas_breathed)
+
+ // Ammonia
+ var/ammonia_pp = PP(breath,GAS_AMMONIA)
+ if (prob(ammonia_pp)*2)
+ to_chat(H, span_alert("Your lungs feel terrible!"))
+
+ if (ammonia_pp > 10)
+ H.emote("gasp")
+ H.adjustOxyLoss(5)
+ H.adjustOxyLoss(round(ammonia_pp/8))
+ if (prob(ammonia_pp/2))
+ to_chat(H, span_alert("Your throat burns!"))
+ H.silent = max(H.silent, 2)
+ else
+ H.adjustOxyLoss(round(ammonia_pp/8))
+ gas_breathed = breath.get_moles(GAS_AMMONIA)
if (gas_breathed > gas_stimulation_min)
- var/existing = H.reagents.get_reagent_amount(/datum/reagent/stimulum)
- H.reagents.add_reagent(/datum/reagent/stimulum, max(0, 5 - existing))
- breath.adjust_moles(GAS_STIMULUM, -gas_breathed)
+ if(prob(25))//unlike the chlorine reagent ammonia doesnt do lung damage do we handle it here instead
+ H.adjustOrganLoss(ORGAN_SLOT_LUNGS,2*1.6)
+ //ammonia is actually disposed of naturally by humans, but extremely poorly by non mammals, maybe we can make it toxic ONLY to certain species (plural) sometime?
+ H.reagents.add_reagent(/datum/reagent/ammonia,1)
+
+ breath.adjust_moles(GAS_AMMONIA, -gas_breathed)
+
+///handles the smell a few gases have
+/obj/item/organ/lungs/proc/handle_smell(datum/gas_mixture/breath, mob/living/carbon/human/H)
+ var/pressure = breath.return_pressure()
+ var/total_moles = breath.total_moles()
+
+ var/list/gases_id = breath.get_gases()
+ var/list/gases = list()
+
+ for(var/ID as anything in gases_id)
+ LAZYADD(gases, GLOB.gas_data.datums[ID])
+ for(var/datum/gas/checked_gas as anything in gases)
+ if(!istype(checked_gas))
+ continue
+ if(!checked_gas.odor_power || !checked_gas.odor)
+ continue
+
+ var/odor_pp = PP(breath,checked_gas.id) * checked_gas.odor_power
+
+ if(odor_pp > 8) //level 3
+ if(checked_gas.odor[4])
+ to_chat(H, checked_gas.odor[4])
+ if(checked_gas.odor_emotes && prob(20))
+ H.emote("cough")
+
+ else if(odor_pp > 2) //level 2
+ if(checked_gas.odor[3])
+ to_chat(H, checked_gas.odor[3])
+ if(checked_gas.odor_emotes && prob(5))
+ H.emote("cough")
+
+ else if(odor_pp > gas_stimulation_min) //level 1
+ if(checked_gas.odor[2])
+ to_chat(H, checked_gas.odor[2]) // danger becuse this might be over safety threshold in the case of ammonia
+
+ else if (prob(odor_pp)*20) //level 0
+ if(checked_gas.odor[1])
+ to_chat(H, checked_gas.odor[1])
/obj/item/organ/lungs/proc/handle_too_little_breath(mob/living/carbon/human/H = null, breath_pp = 0, safe_breath_min = 0, true_pp = 0) // MOD_CELADON -> mod_celadon\fixes\code\lungs.dm
. = 0
@@ -347,35 +460,114 @@
H.failed_last_breath = TRUE
-/obj/item/organ/lungs/proc/handle_breath_temperature(datum/gas_mixture/breath, mob/living/carbon/human/H) // called by human/life, handles temperatures
+/obj/item/organ/lungs/proc/handle_breath_temperature(datum/gas_mixture/breath, mob/living/carbon/human/breather) // called by human/life, handles temperatures
+ if(!breath)
+ return
var/breath_temperature = breath.return_temperature()
- if(!HAS_TRAIT(H, TRAIT_RESISTCOLD)) // COLD DAMAGE
- var/cold_modifier = H.dna.species.coldmod
+ if(!HAS_TRAIT(breather, TRAIT_RESISTCOLD)) // COLD DAMAGE
+ var/cold_modifier = breather.dna.species.coldmod
+ var/breath_effect_prob = 0
+ var/part_count = 0
if(breath_temperature < cold_level_3_threshold)
- H.apply_damage_type(cold_level_3_damage*cold_modifier, cold_damage_type)
+ breather.apply_damage(cold_level_3_damage * cold_modifier, cold_damage_type, spread_damage = TRUE)
+ breath_effect_prob = 100
+ part_count = 8
if(breath_temperature > cold_level_3_threshold && breath_temperature < cold_level_2_threshold)
- H.apply_damage_type(cold_level_2_damage*cold_modifier, cold_damage_type)
+ breather.apply_damage(cold_level_2_damage * cold_modifier, cold_damage_type, spread_damage = TRUE)
+ breath_effect_prob = 75
+ part_count = 5
if(breath_temperature > cold_level_2_threshold && breath_temperature < cold_level_1_threshold)
- H.apply_damage_type(cold_level_1_damage*cold_modifier, cold_damage_type)
- if(breath_temperature < cold_level_1_threshold)
- if(prob(20))
- to_chat(H, " You feel [cold_message] in your [name]!")
+ breather.apply_damage(cold_level_1_damage * cold_modifier, cold_damage_type, spread_damage = TRUE)
+ breath_effect_prob = 50
+ part_count = 3
+ if(breath_temperature > cold_level_1_threshold)
+ breath_effect_prob = 25
+ part_count = 2
- if(!HAS_TRAIT(H, TRAIT_RESISTHEAT)) // HEAT DAMAGE
- var/heat_modifier = H.dna.species.heatmod
+ if(breath_temperature < cold_level_1_threshold)
+ if(prob(sqrt(breath_effect_prob) * 6))
+ to_chat(breather, " You feel [cold_message] in your [name]!")
+ else if(breath_temperature < chlly_threshold)
+ if(!breath_effect_prob)
+ breath_effect_prob = 20
+ part_count = 1
+ if(prob(sqrt(breath_effect_prob) * 6))
+ to_chat(breather, " You feel [chilly_message] in your [name].")
+ if(breath_temperature < chlly_threshold)
+ if(breath_effect_prob)
+ // Breathing into your mask, no particle. We can add fogged up glasses later
+ if(breather.is_mouth_covered())
+ return
+ // Even though breathing via internals TECHNICALLY exhales into the environment, we'll still block it
+ if(breather.internal)
+ return
+
+ if(!HAS_TRAIT(breather, TRAIT_RESISTHEAT)) // HEAT DAMAGE
+ var/heat_modifier = breather.dna.species.heatmod
+ var/heat_message_prob = 0
if(breath_temperature > heat_level_1_threshold && breath_temperature < heat_level_2_threshold)
- H.apply_damage_type(heat_level_1_damage*heat_modifier, heat_damage_type)
+ breather.apply_damage(heat_level_1_damage * heat_modifier, heat_damage_type, spread_damage = TRUE)
+ heat_message_prob = 100
if(breath_temperature > heat_level_2_threshold && breath_temperature < heat_level_3_threshold)
- H.apply_damage_type(heat_level_2_damage*heat_modifier, heat_damage_type)
+ breather.apply_damage(heat_level_2_damage * heat_modifier, heat_damage_type, spread_damage = TRUE)
+ heat_message_prob = 75
if(breath_temperature > heat_level_3_threshold)
- H.apply_damage_type(heat_level_3_damage*heat_modifier, heat_damage_type)
+ breather.apply_damage(heat_level_3_damage * heat_modifier, heat_damage_type, spread_damage = TRUE)
+ heat_message_prob = 50
if(breath_temperature > heat_level_1_threshold)
- if(prob(20))
- to_chat(H, " You feel [hot_message] in your [name]!")
+ heat_message_prob = 25
+
+ if(breath_temperature > heat_level_1_threshold)
+ if(prob(sqrt(heat_message_prob) * 6))
+ to_chat(breather, " You feel [hot_message] in your [name]!")
+ else if(breath_temperature > warm_threshold)
+ if(!heat_message_prob)
+ heat_message_prob = 20
+ if(prob(sqrt(heat_message_prob) * 6))
+ to_chat(breather, " You feel [warm_message] in your [name].")
+
+
// The air you breathe out should match your body temperature
- breath.set_temperature(H.bodytemperature)
+ breath.set_temperature(breather.bodytemperature)
+
+/// Creates a particle effect off the mouth of the passed mob.
+/obj/item/organ/lungs/proc/emit_breath_particle(mob/living/carbon/human/breather, particle_type, part_count)
+ ASSERT(ispath(particle_type, /particles))
+
+ var/obj/effect/abstract/particle_holder/holder = new(breather, particle_type)
+ var/particles/breath_particle = holder.particles
+ var/breath_dir = breather.dir
+
+ var/list/particle_grav = list(0, 0.1, 0)
+ var/list/particle_pos = list(0, 10, 0)
+ if(breath_dir & NORTH)
+ particle_grav[2] = 0.2
+ breath_particle.rotation = pick(-45, 45)
+ // Layer it behind the mob since we're facing away from the camera
+ holder.pixel_w -= 4
+ holder.pixel_y += 4
+ if(breath_dir & WEST)
+ particle_grav[1] = -0.2
+ particle_pos[1] = -5
+ breath_particle.rotation = -45
+ if(breath_dir & EAST)
+ particle_grav[1] = 0.2
+ particle_pos[1] = 5
+ breath_particle.rotation = 45
+ if(breath_dir & SOUTH)
+ particle_grav[2] = 0.2
+ breath_particle.rotation = pick(-45, 45)
+ // Shouldn't be necessary but just for parity
+ holder.pixel_w += 4
+ holder.pixel_y -= 4
+
+ breath_particle.gravity = particle_grav
+ breath_particle.position = particle_pos
+ breath_particle.count = part_count
+
+ QDEL_IN(holder, breath_particle.lifespan)
/obj/item/organ/lungs/on_life()
. = ..()
@@ -400,6 +592,8 @@
breathing_class = BREATH_PLASMA
+ can_smell = FALSE
+
/obj/item/organ/lungs/plasmaman/populate_gas_info()
..()
gas_max -= GAS_PLASMA
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 72b7fba9d2da..190271a53503 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -242,3 +242,10 @@
*/
/obj/item/organ/proc/get_availability(datum/species/S)
return TRUE
+
+// [CELADON-ADD] - CELADON_EMOTES
+/obj/item/organ/proc/is_robotic()
+ if(status & ORGAN_ROBOTIC)
+ return TRUE
+ return FALSE
+// [/CELADON-ADD]
diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm
index add91cbeac96..4bb8588b4dc4 100644
--- a/code/modules/surgery/organs/stomach.dm
+++ b/code/modules/surgery/organs/stomach.dm
@@ -48,46 +48,53 @@
/obj/item/organ/stomach/proc/handle_disgust(mob/living/carbon/human/H)
if(H.disgust)
var/pukeprob = 5 + 0.05 * H.disgust
- if(H.disgust >= DISGUST_LEVEL_GROSS)
- if(prob(10))
- H.stuttering += 1
- H.confused += 2
- if(prob(10) && !H.stat)
- to_chat(H, " You feel kind of iffy...")
- H.jitteriness = max(H.jitteriness - 3, 0)
- if(H.disgust >= DISGUST_LEVEL_VERYGROSS)
- // [CELADON - EDIT] - CELADON_LANIUS
- if(is_species(H, /datum/species/lanius))
- H.confused += 2.5
- H.stuttering += 1
- if (prob(15))
- to_chat(H, " You feel something strange inside your core..")
- H.adjust_nutrition(-10)
- // if(prob(pukeprob)) //iT hAndLeS mOrE ThaN PukInG // [CELADON - EDIT] - ORIGANAL
- else if(prob(pukeprob))
- // [/CELADON - EDIT]
- H.confused += 2.5
- H.stuttering += 1
- H.vomit(10, 0, 1, 0, 1, 0)
- H.Dizzy(5)
- if(H.disgust >= DISGUST_LEVEL_DISGUSTED)
- if(prob(25))
- H.blur_eyes(3) //We need to add more shit down here
+ switch(H.disgust)
+ if(0 to DISGUST_LEVEL_GROSS)
+ //throw alerts
+ H.clear_alert("disgust")
+ SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "disgust")
+ //do our stupid bullshit
+ if(prob(10))
+ H.stuttering += 1
+ H.confused += 2
+ if(!H.stat)
+ to_chat(H, span_warning("You feel queasy..."))
+ H.jitteriness = max(H.jitteriness - 3, 0)
+ if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS)
+ //throw alerts
+ H.throw_alert("disgust", /atom/movable/screen/alert/gross)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/gross)
+ //do the nausea stuff
+ // [CELADON - EDIT] - CELADON_LANIUS
+ // if(prob(pukeprob)) //iT hAndLeS mOrE ThaN PukInG // [CELADON - EDIT] - ORIGANAL
+ if(prob(pukeprob))
+ // [/CELADON - EDIT]
+ H.vomit(10, 0, 0, 0, 1, 0)
+ H.confused += 2.5
+ H.stuttering += 1
+ H.Dizzy(5)
+ if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED)
+ //do the thing
+ H.throw_alert("disgust", /atom/movable/screen/alert/verygross)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/verygross)
+ //you're not gonna believe it we do the other thing too
+
+ if(prob(pukeprob))
+ H.blur_eyes(3)
+ if(prob(25))
+ H.manual_emote(pick("tears up!", "whimpers!", "chokes!"))
+ H.vomit(20, 0, 1, 1, 1, 0)
+ H.confused += 2.5
+ H.stuttering += 1
+ if(DISGUST_LEVEL_DISGUSTED to DISGUST_LEVEL_MAXEDOUT)
+ H.throw_alert("disgust", /atom/movable/screen/alert/disgusted)
+ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/disgusted)
+
+ //profusely vomiting.
+ if(prob(pukeprob))
+ H.vomit(40, 0, 1, 1, 1, 0)
H.adjust_disgust(-0.5 * disgust_metabolism)
- switch(H.disgust)
- if(0 to DISGUST_LEVEL_GROSS)
- H.clear_alert("disgust")
- SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "disgust")
- if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS)
- H.throw_alert("disgust", /atom/movable/screen/alert/gross)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/gross)
- if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED)
- H.throw_alert("disgust", /atom/movable/screen/alert/verygross)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/verygross)
- if(DISGUST_LEVEL_DISGUSTED to INFINITY)
- H.throw_alert("disgust", /atom/movable/screen/alert/disgusted)
- SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/disgusted)
/obj/item/organ/stomach/Remove(mob/living/carbon/M, special = 0)
var/mob/living/carbon/human/H = owner
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index 10aad97cd021..b50128de64ac 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -302,7 +302,7 @@
/obj/item/organ/tongue/robot/emp_act(severity)
owner.apply_effect(EFFECT_STUTTER, 120)
- owner.emote("scream")
+ owner.force_scream()
to_chat(owner, " Alert: Vocal cords are malfunctioning.")
/obj/item/organ/tongue/robot/handle_speech(datum/source, list/speech_args)
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 6a5a344b177e..4c69dd532a89 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -35,13 +35,13 @@
/datum/action/item_action/organ_action/colossus
name = "Voice of God"
- var/obj/item/organ/vocal_cords/colossus/cords = null
-
-/datum/action/item_action/organ_action/colossus/New()
- ..()
- cords = target
/datum/action/item_action/organ_action/colossus/IsAvailable()
+ if(!istype(target, /obj/item/organ/vocal_cords/colossus))
+ return FALSE
+
+ var/obj/item/organ/vocal_cords/colossus/cords = target
+
if(world.time < cords.next_command)
return FALSE
if(!owner)
@@ -58,6 +58,7 @@
/datum/action/item_action/organ_action/colossus/Trigger()
. = ..()
if(!IsAvailable())
+ var/obj/item/organ/vocal_cords/colossus/cords = target
if(world.time < cords.next_command)
to_chat(owner, " You must wait [DisplayTimeText(cords.next_command - world.time)] before Speaking again.")
return
@@ -99,10 +100,7 @@
var/log_message = uppertext(message)
if(!span_list || !span_list.len)
- if(iscultist(user))
- span_list = list("narsiesmall")
- else
- span_list = list()
+ span_list = list()
user.say(message, spans = span_list, sanitize = FALSE)
@@ -135,10 +133,6 @@
if(user.mind.assigned_role == "Mime")
power_multiplier *= 0.5
- //Cultists are closer to their gods and are more powerful, but they'll give themselves away
- if(iscultist(user))
- power_multiplier *= 2
-
//Try to check if the speaker specified a name or a job to focus on
var/list/specific_listeners = list()
var/found_string = null
@@ -148,15 +142,8 @@
for(var/V in listeners)
var/mob/living/L = V
- var/datum/antagonist/devil/devilinfo = is_devil(L)
- if(devilinfo && findtext(message, devilinfo.truename))
- var/start = findtext(message, devilinfo.truename)
- listeners = list(L) //Devil names are unique.
- power_multiplier *= 5 //if you're a devil and god himself addressed you, you fucked up
- //Cut out the name so it doesn't trigger commands
- message = copytext(message, 1, start) + copytext(message, start + length(devilinfo.truename))
- break
- else if(findtext(message, L.real_name, 1, length(L.real_name) + 1))
+
+ if(findtext(message, L.real_name, 1, length(L.real_name) + 1))
specific_listeners += L //focus on those with the specified name
//Cut out the name so it doesn't trigger commands
found_string = L.real_name
@@ -301,14 +288,14 @@
cooldown = COOLDOWN_DAMAGE
for(var/V in listeners)
var/mob/living/L = V
- L.adjust_bodytemperature(50 * power_multiplier)
+ L.adjust_bodytemperature(5 * power_multiplier)
//COLD
else if((findtext(message, cold_words)))
cooldown = COOLDOWN_DAMAGE
for(var/V in listeners)
var/mob/living/L = V
- L.adjust_bodytemperature(-50 * power_multiplier)
+ L.adjust_bodytemperature(-5 * power_multiplier)
//REPULSE
else if((findtext(message, repulse_words)))
@@ -331,11 +318,7 @@
for(var/V in listeners)
var/mob/living/L = V
var/text = ""
- if(is_devil(L))
- var/datum/antagonist/devil/devilinfo = is_devil(L)
- text = devilinfo.truename
- else
- text = L.real_name
+ text = L.real_name
addtimer(CALLBACK(L, TYPE_PROC_REF(/atom/movable, say), text), 5 * i)
i++
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index d0a352ebd91b..3ec1e1e14180 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -11,7 +11,7 @@
custom_materials = list(/datum/material/iron=6000, /datum/material/glass=3000)
flags_1 = CONDUCT_1
item_flags = SURGICAL_TOOL
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
tool_behaviour = TOOL_RETRACTOR
toolspeed = 1
@@ -19,7 +19,6 @@
desc = "Micro-mechanical manipulator for retracting stuff."
toolspeed = 0.5
-
/obj/item/hemostat
name = "hemostat"
desc = "A tiny needle-eye has been machined into one of the clamps to streamline the application of ligature."
@@ -33,7 +32,7 @@
custom_materials = list(/datum/material/iron=5000, /datum/material/glass=2500)
flags_1 = CONDUCT_1
item_flags = SURGICAL_TOOL
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
attack_verb = list("attacked", "pinched")
tool_behaviour = TOOL_HEMOSTAT
toolspeed = 1
@@ -42,7 +41,6 @@
desc = "Tiny servos power a pair of pincers to stop bleeding."
toolspeed = 0.5
-
/obj/item/cautery
name = "cautery"
desc = "An obtuse, rectangular design is just big enough to accomodate this cautery's incredibly durable battery."
@@ -56,7 +54,7 @@
custom_materials = list(/datum/material/iron=2500, /datum/material/glass=750)
flags_1 = CONDUCT_1
item_flags = SURGICAL_TOOL
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
attack_verb = list("burnt")
tool_behaviour = TOOL_CAUTERY
toolspeed = 1
@@ -97,7 +95,6 @@
w_class = WEIGHT_CLASS_SMALL
toolspeed = 0.5
-
/obj/item/scalpel
name = "scalpel"
desc = "The handle of the scalpel is an awkward ergonomic mold, designed to encourage proper form. A blade release button on the end allows for easy cleaning and replacement."
@@ -111,7 +108,7 @@
flags_1 = CONDUCT_1
item_flags = SURGICAL_TOOL | EYE_STAB
force = 10
- w_class = WEIGHT_CLASS_TINY
+ w_class = WEIGHT_CLASS_SMALL
throwforce = 5
throw_speed = 3
throw_range = 5
diff --git a/code/modules/tgs/README.md b/code/modules/tgs/README.md
index 6319028d8106..35ca73d7e9a8 100644
--- a/code/modules/tgs/README.md
+++ b/code/modules/tgs/README.md
@@ -1,6 +1,6 @@
# DMAPI Internals
-This folder should be placed on it's own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified.
+This folder should be placed on its own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified.
- [includes.dm](./includes.dm) is the file that should be included by DM code, it handles including the rest.
- The [core](./core) folder includes all code not directly part of any API version.
diff --git a/code/modules/tgs/core/README.md b/code/modules/tgs/core/README.md
index b82d8f49e297..965e21b549a3 100644
--- a/code/modules/tgs/core/README.md
+++ b/code/modules/tgs/core/README.md
@@ -3,7 +3,7 @@
This folder contains all DMAPI code not directly involved in an API.
- [_definitions.dm](./definitions.dm) contains defines needed across DMAPI internals.
+- [byond_world_export.dm](./byond_world_export.dm) contains the default `/datum/tgs_http_handler` implementation which uses `world.Export()`.
- [core.dm](./core.dm) contains the implementations of the `/world/proc/TgsXXX()` procs. Many map directly to the `/datum/tgs_api` functions. It also contains the /datum selection and setup code.
- [datum.dm](./datum.dm) contains the `/datum/tgs_api` declarations that all APIs must implement.
- [tgs_version.dm](./tgs_version.dm) contains the `/datum/tgs_version` definition
--
diff --git a/code/modules/tgs/core/byond_world_export.dm b/code/modules/tgs/core/byond_world_export.dm
new file mode 100644
index 000000000000..6ef8d841b8f7
--- /dev/null
+++ b/code/modules/tgs/core/byond_world_export.dm
@@ -0,0 +1,22 @@
+/datum/tgs_http_handler/byond_world_export
+
+/datum/tgs_http_handler/byond_world_export/PerformGet(url)
+ // This is an infinite sleep until we get a response
+ var/export_response = world.Export(url)
+ TGS_DEBUG_LOG("byond_world_export: Export complete")
+
+ if(!export_response)
+ TGS_ERROR_LOG("byond_world_export: Failed request: [url]")
+ return new /datum/tgs_http_result(null, FALSE)
+
+ var/content = export_response["CONTENT"]
+ if(!content)
+ TGS_ERROR_LOG("byond_world_export: Failed request, missing content!")
+ return new /datum/tgs_http_result(null, FALSE)
+
+ var/response_json = TGS_FILE2TEXT_NATIVE(content)
+ if(!response_json)
+ TGS_ERROR_LOG("byond_world_export: Failed request, failed to load content!")
+ return new /datum/tgs_http_result(null, FALSE)
+
+ return new /datum/tgs_http_result(response_json, TRUE)
diff --git a/code/modules/tgs/core/core.dm b/code/modules/tgs/core/core.dm
index 15622228e91f..63cb5a2c3514 100644
--- a/code/modules/tgs/core/core.dm
+++ b/code/modules/tgs/core/core.dm
@@ -1,4 +1,4 @@
-/world/TgsNew(datum/tgs_event_handler/event_handler, minimum_required_security_level = TGS_SECURITY_ULTRASAFE)
+/world/TgsNew(datum/tgs_event_handler/event_handler, minimum_required_security_level = TGS_SECURITY_ULTRASAFE, datum/tgs_http_handler/http_handler = null)
var/current_api = TGS_READ_GLOBAL(tgs)
if(current_api)
TGS_ERROR_LOG("API datum already set (\ref[current_api] ([current_api]))! Was TgsNew() called more than once?")
@@ -55,7 +55,10 @@
TGS_ERROR_LOG("Invalid parameter for event_handler: [event_handler]")
event_handler = null
- var/datum/tgs_api/new_api = new api_datum(event_handler, version)
+ if(!http_handler)
+ http_handler = new /datum/tgs_http_handler/byond_world_export
+
+ var/datum/tgs_api/new_api = new api_datum(event_handler, version, http_handler)
TGS_WRITE_GLOBAL(tgs, new_api)
diff --git a/code/modules/tgs/core/datum.dm b/code/modules/tgs/core/datum.dm
index f734fd0527f0..3ca53e9bf7c6 100644
--- a/code/modules/tgs/core/datum.dm
+++ b/code/modules/tgs/core/datum.dm
@@ -6,7 +6,7 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null)
var/list/warned_deprecated_command_runs
-/datum/tgs_api/New(datum/tgs_event_handler/event_handler, datum/tgs_version/version)
+/datum/tgs_api/New(datum/tgs_event_handler/event_handler, datum/tgs_version/version, datum/tgs_http_handler/http_handler)
..()
src.event_handler = event_handler
src.version = version
diff --git a/code/modules/tgs/includes.dm b/code/modules/tgs/includes.dm
index 23b714f9d064..f5118ed55a3c 100644
--- a/code/modules/tgs/includes.dm
+++ b/code/modules/tgs/includes.dm
@@ -1,4 +1,5 @@
#include "core\_definitions.dm"
+#include "core\byond_world_export.dm"
#include "core\core.dm"
#include "core\datum.dm"
#include "core\tgs_version.dm"
diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm
index f4806f7adb97..29ea239ad84d 100644
--- a/code/modules/tgs/v5/__interop_version.dm
+++ b/code/modules/tgs/v5/__interop_version.dm
@@ -1 +1 @@
-"5.9.0"
+"5.10.0"
diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm
index 92c7a8388a71..a47bfd78000b 100644
--- a/code/modules/tgs/v5/_defines.dm
+++ b/code/modules/tgs/v5/_defines.dm
@@ -95,6 +95,7 @@
#define DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION "newServerVersion"
#define DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE "broadcastMessage"
+#define DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT "clientCount"
#define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE "commandResponse"
#define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE "commandResponseMessage"
#define DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES "chatResponses"
diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm
index 95b8edd3ee5c..3e328fc7c27d 100644
--- a/code/modules/tgs/v5/api.dm
+++ b/code/modules/tgs/v5/api.dm
@@ -31,9 +31,12 @@
var/detached = FALSE
-/datum/tgs_api/v5/New()
+ var/datum/tgs_http_handler/http_handler
+
+/datum/tgs_api/v5/New(datum/tgs_event_handler/event_handler, datum/tgs_version/version, datum/tgs_http_handler/http_handler)
. = ..()
interop_version = version
+ src.http_handler = http_handler
TGS_DEBUG_LOG("V5 API created: [json_encode(args)]")
/datum/tgs_api/v5/ApiVersion()
@@ -50,7 +53,9 @@
version = null // we want this to be the TGS version, not the interop version
// sleep once to prevent an issue where world.Export on the first tick can hang indefinitely
+ TGS_DEBUG_LOG("Starting Export bug prevention sleep tick. time:[world.time] sleep_offline:[world.sleep_offline]")
sleep(world.tick_lag)
+ TGS_DEBUG_LOG("Export bug prevention sleep complete")
var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands(), DMAPI5_PARAMETER_TOPIC_PORT = GetTopicPort()))
if(!istype(bridge_response))
diff --git a/code/modules/tgs/v5/bridge.dm b/code/modules/tgs/v5/bridge.dm
index 0c5e701a32b6..62201fcc9e58 100644
--- a/code/modules/tgs/v5/bridge.dm
+++ b/code/modules/tgs/v5/bridge.dm
@@ -78,27 +78,24 @@
WaitForReattach(FALSE)
TGS_DEBUG_LOG("Bridge request start")
- // This is an infinite sleep until we get a response
- var/export_response = world.Export(bridge_request)
+ var/datum/tgs_http_result/result = http_handler.PerformGet(bridge_request)
TGS_DEBUG_LOG("Bridge request complete")
- if(!export_response)
- TGS_ERROR_LOG("Failed bridge request: [bridge_request]")
+ if(isnull(result))
+ TGS_ERROR_LOG("Failed bridge request, handler returned null!")
return
- var/content = export_response["CONTENT"]
- if(!content)
- TGS_ERROR_LOG("Failed bridge request, missing content!")
+ if(!istype(result) || result.type != /datum/tgs_http_result)
+ TGS_ERROR_LOG("Failed bridge request, handler returned non-[/datum/tgs_http_result]!")
return
- var/response_json = TGS_FILE2TEXT_NATIVE(content)
- if(!response_json)
- TGS_ERROR_LOG("Failed bridge request, failed to load content!")
+ if(!result.success)
+ TGS_DEBUG_LOG("Failed bridge request, HTTP request failed!")
return
- var/list/bridge_response = json_decode(response_json)
+ var/list/bridge_response = json_decode(result.response_text)
if(!bridge_response)
- TGS_ERROR_LOG("Failed bridge request, bad json: [response_json]")
+ TGS_ERROR_LOG("Failed bridge request, bad json: [result.response_text]")
return
var/error = bridge_response[DMAPI5_RESPONSE_ERROR_MESSAGE]
diff --git a/code/modules/tgs/v5/topic.dm b/code/modules/tgs/v5/topic.dm
index e1f2cb638578..59e5e63e5cd4 100644
--- a/code/modules/tgs/v5/topic.dm
+++ b/code/modules/tgs/v5/topic.dm
@@ -149,7 +149,9 @@
if(DMAPI5_TOPIC_COMMAND_HEALTHCHECK)
if(event_handler && event_handler.receive_health_checks)
event_handler.HandleEvent(TGS_EVENT_HEALTH_CHECK)
- return TopicResponse()
+ var/list/health_check_response = TopicResponse()
+ health_check_response[DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT] = TGS_CLIENT_COUNT
+ return health_check_response;
if(DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH)
detached = FALSE
diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm
index 237207fdfd05..acd19dfa6411 100644
--- a/code/modules/tgs/v5/undefs.dm
+++ b/code/modules/tgs/v5/undefs.dm
@@ -18,7 +18,6 @@
#undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER
#undef DMAPI5_PARAMETER_CUSTOM_COMMANDS
-#undef DMAPI5_PARAMETER_TOPIC_PORT
#undef DMAPI5_CHUNK
#undef DMAPI5_CHUNK_PAYLOAD
@@ -95,6 +94,7 @@
#undef DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION
#undef DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE
+#undef DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT
#undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE
#undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE
#undef DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES
diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm
index 1a6fcb37e429..44fbffd917ce 100644
--- a/code/modules/tgui_panel/tgui_panel.dm
+++ b/code/modules/tgui_panel/tgui_panel.dm
@@ -49,7 +49,6 @@
get_asset_datum(/datum/asset/simple/tgui_panel),
))
window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/fontawesome))
- window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/tgfont))
window.send_asset(get_asset_datum(/datum/asset/spritesheet/chat))
request_telemetry()
addtimer(CALLBACK(src, PROC_REF(on_initialize_timed_out)), 5 SECONDS)
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 4b4e10edd7ac..3195d86e7fb7 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -41,6 +41,13 @@
/// Intended to be used in the manner of `TEST_FOCUS(/datum/unit_test/math)`
#define TEST_FOCUS(test_path) ##test_path { focus = TRUE; }
+/// Logs a noticable message on GitHub, but will not mark as an error.
+/// Use this when something shouldn't happen and is of note, but shouldn't block CI.
+/// Does not mark the test as failed.
+#define TEST_NOTICE(source, message) source.log_for_test((##message), "notice", __FILE__, __LINE__)
+/// TEST_NOTICE but more important
+#define TEST_WARNING(source, message) source.log_for_test((##message), "warning", __FILE__, __LINE__)
+
/// Constants indicating unit test completion status
#define UNIT_TEST_PASSED 0
#define UNIT_TEST_FAILED 1
@@ -62,10 +69,9 @@
#define TEST_OUTPUT_GREEN(text) (text)
#endif
-
#ifdef BASIC_TESTS
-//#include "icons/inhands.dm"
+#include "icons/inhands.dm"
#include "icons/missing_icons.dm"
#include "icons/spritesheets.dm"
#include "icons/worn_icons.dm"
@@ -78,10 +84,10 @@
#include "connect_loc.dm"
#include "biome_lists.dm"
#include "emoting.dm"
+#include "gun_sanity.dm"
#include "keybinding_init.dm"
#include "machine_disassembly.dm"
#include "open_air.dm"
-#include "outfit_names.dm"
#include "outfit_sanity.dm"
#include "overmap.dm"
#include "pills.dm"
diff --git a/code/modules/unit_tests/create_and_destroy.dm b/code/modules/unit_tests/create_and_destroy.dm
index 9aee2ca10624..ed3d9c6ed0a7 100644
--- a/code/modules/unit_tests/create_and_destroy.dm
+++ b/code/modules/unit_tests/create_and_destroy.dm
@@ -13,8 +13,6 @@
/turf/template_noop,
//Never meant to be created, errors out the ass for mobcode reasons
/mob/living/carbon,
- //And another
- /obj/item/slimecross/recurring,
//This should be obvious
/obj/machinery/doomsday_device,
//Template type
@@ -35,8 +33,6 @@
/obj/machinery/power/shuttle/engine/liquid,
//needs a template
/obj/effect/landmark/subship,
- //needs a friend :(
- /obj/effect/mob_spawn/human/demonic_friend,
//needs a derg
/obj/structure/carp_rift,
//doesn't have icons
@@ -145,14 +141,12 @@
// Drastically lower the amount of time it takes to GC, since we don't have clients that can hold it up.
SSgarbage.collection_timeout[GC_QUEUE_CHECK] = 10 SECONDS
- //Prevent the garbage subsystem from harddeling anything, if only to save time
- SSgarbage.collection_timeout[GC_QUEUE_HARDDELETE] = 10000 HOURS
//Clear it, just in case
cached_contents.Cut()
var/list/queues_we_care_about = list()
- // All up to harddel
- for(var/i in 1 to GC_QUEUE_HARDDELETE - 1)
+ // All of em, I want hard deletes too, since we rely on the debug info from them
+ for(var/i in 1 to GC_QUEUE_HARDDELETE)
queues_we_care_about += i
//Now that we've qdel'd everything, let's sleep until the gc has processed all the shit we care about
@@ -162,6 +156,7 @@
time_needed += SSgarbage.collection_timeout[index]
var/start_time = world.time
+ var/real_start_time = REALTIMEOFDAY
var/garbage_queue_processed = FALSE
sleep(time_needed)
@@ -183,7 +178,7 @@
garbage_queue_processed = TRUE
break
- if(world.time > start_time + time_needed + 30 MINUTES) //If this gets us gitbanned I'm going to laugh so hard
+ if(REALTIMEOFDAY > real_start_time + time_needed + 30 MINUTES) //If this gets us gitbanned I'm going to laugh so hard
TEST_FAIL("Something has gone horribly wrong, the garbage queue has been processing for well over 30 minutes. What the hell did you do")
break
@@ -202,6 +197,9 @@
TEST_FAIL("[item.name] failed to respect force deletion [item.no_respect_force] times out of a total del count of [item.qdels]")
if(item.no_hint)
TEST_FAIL("[item.name] failed to return a qdel hint [item.no_hint] times out of a total del count of [item.qdels]")
+ if(LAZYLEN(item.extra_details))
+ var/details = item.extra_details.Join("\n")
+ TEST_FAIL("[item.name] failed with extra info: \n[details]")
cache_for_sonic_speed = SSatoms.BadInitializeCalls
for(var/path in cache_for_sonic_speed)
@@ -216,4 +214,3 @@
SSticker.delay_end = FALSE
//This shouldn't be needed, but let's be polite
SSgarbage.collection_timeout[GC_QUEUE_CHECK] = GC_CHECK_QUEUE
- SSgarbage.collection_timeout[GC_QUEUE_HARDDELETE] = GC_DEL_QUEUE
diff --git a/code/modules/unit_tests/find_reference_sanity.dm b/code/modules/unit_tests/find_reference_sanity.dm
index 67b6072d3b96..f6736ccb1d58 100644
--- a/code/modules/unit_tests/find_reference_sanity.dm
+++ b/code/modules/unit_tests/find_reference_sanity.dm
@@ -15,6 +15,8 @@
return ..()
/atom/movable/ref_test
+ // Gotta make sure we do a full check
+ references_to_clear = INFINITY
var/atom/movable/ref_test/self_ref
/atom/movable/ref_test/Destroy(force)
@@ -27,8 +29,8 @@
SSgarbage.should_save_refs = TRUE
//Sanity check
- victim.DoSearchVar(testbed, "Sanity Check", search_time = 1) //We increment search time to get around an optimization
- TEST_ASSERT(!victim.found_refs.len, "The ref-tracking tool found a ref where none existed")
+ victim.DoSearchVar(testbed, "Sanity Check") //We increment search time to get around an optimization
+ TEST_ASSERT(!LAZYLEN(victim.found_refs), "The ref-tracking tool found a ref where none existed")
SSgarbage.should_save_refs = FALSE
/datum/unit_test/find_reference_baseline/Run()
@@ -41,11 +43,11 @@
testbed.test_list += victim
testbed.test_assoc_list["baseline"] = victim
- victim.DoSearchVar(testbed, "First Run", search_time = 2)
+ victim.DoSearchVar(testbed, "First Run")
- TEST_ASSERT(victim.found_refs["test"], "The ref-tracking tool failed to find a regular value")
- TEST_ASSERT(victim.found_refs[testbed.test_list], "The ref-tracking tool failed to find a list entry")
- TEST_ASSERT(victim.found_refs[testbed.test_assoc_list], "The ref-tracking tool failed to find an assoc list value")
+ TEST_ASSERT(LAZYACCESS(victim.found_refs, "test"), "The ref-tracking tool failed to find a regular value")
+ TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_list), "The ref-tracking tool failed to find a list entry")
+ TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_assoc_list), "The ref-tracking tool failed to find an assoc list value")
SSgarbage.should_save_refs = FALSE
/datum/unit_test/find_reference_exotic/Run()
@@ -58,12 +60,12 @@
testbed.vis_contents += victim
testbed.test_assoc_list[victim] = TRUE
- victim.DoSearchVar(testbed, "Second Run", search_time = 3)
+ victim.DoSearchVar(testbed, "Second Run")
//This is another sanity check
- TEST_ASSERT(!victim.found_refs[testbed.overlays], "The ref-tracking tool found an overlays entry? That shouldn't be possible")
- TEST_ASSERT(victim.found_refs[testbed.vis_contents], "The ref-tracking tool failed to find a vis_contents entry")
- TEST_ASSERT(victim.found_refs[testbed.test_assoc_list], "The ref-tracking tool failed to find an assoc list key")
+ TEST_ASSERT(!LAZYACCESS(victim.found_refs, testbed.overlays), "The ref-tracking tool found an overlays entry? That shouldn't be possible")
+ TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.vis_contents), "The ref-tracking tool failed to find a vis_contents entry")
+ TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_assoc_list), "The ref-tracking tool failed to find an assoc list key")
SSgarbage.should_save_refs = FALSE
/datum/unit_test/find_reference_esoteric/Run()
@@ -78,11 +80,11 @@
var/list/to_find_assoc = list(victim)
testbed.test_assoc_list["Nesting"] = to_find_assoc
- victim.DoSearchVar(victim, "Third Run Self", search_time = 4)
- victim.DoSearchVar(testbed, "Third Run Testbed", search_time = 4)
- TEST_ASSERT(victim.found_refs["self_ref"], "The ref-tracking tool failed to find a self reference")
- TEST_ASSERT(victim.found_refs[to_find], "The ref-tracking tool failed to find a nested list entry")
- TEST_ASSERT(victim.found_refs[to_find_assoc], "The ref-tracking tool failed to find a nested assoc list entry")
+ victim.DoSearchVar(victim, "Third Run Self")
+ victim.DoSearchVar(testbed, "Third Run Testbed")
+ TEST_ASSERT(LAZYACCESS(victim.found_refs, "self_ref"), "The ref-tracking tool failed to find a self reference")
+ TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find), "The ref-tracking tool failed to find a nested list entry")
+ TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find_assoc), "The ref-tracking tool failed to find a nested assoc list entry")
SSgarbage.should_save_refs = FALSE
/datum/unit_test/find_reference_null_key_entry/Run()
@@ -93,8 +95,8 @@
//Calm before the storm
testbed.test_assoc_list = list(null = victim)
- victim.DoSearchVar(testbed, "Fourth Run", search_time = 5)
- TEST_ASSERT(testbed.test_assoc_list, "The ref-tracking tool failed to find a null key'd assoc list entry")
+ victim.DoSearchVar(testbed, "Fourth Run")
+ TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_assoc_list), "The ref-tracking tool failed to find a null key'd assoc list entry")
/datum/unit_test/find_reference_assoc_investigation/Run()
var/atom/movable/ref_test/victim = allocate(/atom/movable/ref_test)
@@ -107,9 +109,9 @@
var/list/to_find_null_assoc_nested = list(victim)
testbed.test_assoc_list[null] = to_find_null_assoc_nested
- victim.DoSearchVar(testbed, "Fifth Run", search_time = 6)
- TEST_ASSERT(victim.found_refs[to_find_in_key], "The ref-tracking tool failed to find a nested assoc list key")
- TEST_ASSERT(victim.found_refs[to_find_null_assoc_nested], "The ref-tracking tool failed to find a null key'd nested assoc list entry")
+ victim.DoSearchVar(testbed, "Fifth Run")
+ TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find_in_key), "The ref-tracking tool failed to find a nested assoc list key")
+ TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find_null_assoc_nested), "The ref-tracking tool failed to find a null key'd nested assoc list entry")
SSgarbage.should_save_refs = FALSE
/datum/unit_test/find_reference_static_investigation/Run()
@@ -126,7 +128,7 @@
for(var/key in global.vars)
global_vars[key] = global.vars[key]
- victim.DoSearchVar(global_vars, "Sixth Run", search_time = 7)
+ victim.DoSearchVar(global_vars, "Sixth Run")
- TEST_ASSERT(victim.found_refs[global_vars], "The ref-tracking tool failed to find a natively global variable")
+ TEST_ASSERT(LAZYACCESS(victim.found_refs, global_vars), "The ref-tracking tool failed to find a natively global variable")
SSgarbage.should_save_refs = FALSE
diff --git a/code/modules/unit_tests/gun_sanity.dm b/code/modules/unit_tests/gun_sanity.dm
new file mode 100644
index 000000000000..36630dfea8dc
--- /dev/null
+++ b/code/modules/unit_tests/gun_sanity.dm
@@ -0,0 +1,17 @@
+/datum/unit_test/gun_sanity/Run()
+ for(var/gun_path in subtypesof(/obj/item/gun))
+ var/obj/item/gun/target_gun = new gun_path()
+ if(target_gun.default_ammo_type)
+ if(!ispath(target_gun.default_ammo_type))
+ TEST_FAIL("The default ammo ([target_gun.default_ammo_type]) in [gun_path] is not a type")
+
+ if(!(target_gun.default_ammo_type in target_gun.allowed_ammo_types))
+ TEST_FAIL("The default ammo ([target_gun.default_ammo_type]) in [gun_path] in not in its allowed ammo types")
+
+ if(ispath(gun_path, /obj/item/gun/ballistic))
+ if(!(target_gun.magazine?.type == target_gun.default_ammo_type))
+ TEST_FAIL("[gun_path]'s mag ([target_gun.magazine?.type]) does not equal its default_ammo_type")
+ else
+ if(target_gun.internal_magazine)
+ TEST_FAIL("[gun_path] with an internal mag has no mag")
+ qdel(target_gun)
diff --git a/code/modules/unit_tests/icons/inhands.dm b/code/modules/unit_tests/icons/inhands.dm
index 858c6d2f2840..b3e5265e2f0b 100644
--- a/code/modules/unit_tests/icons/inhands.dm
+++ b/code/modules/unit_tests/icons/inhands.dm
@@ -26,7 +26,7 @@
//Add EVEN MORE paths if needed here!
//generate_possible_icon_states_list("your/folder/path/inhands/")
- for(var/obj/item/item_path as anything in subtypesof(/obj/item))
+ for(var/obj/item/item_path as anything in (subtypesof(/obj/item)))
if(initial(item_path.item_flags) & ABSTRACT)
continue
@@ -53,7 +53,7 @@
match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'")
if(!(skip_left || skip_right) && !lefthand_file && !righthand_file)
- TEST_FAIL("Missing both icon files for [item_path].\n\titem_state = \"[item_state]\"[match_message]")
+ TEST_NOTICE(src, "Missing both icon files for [item_path].\n\titem_state = \"[item_state]\"[match_message]")
continue
var/missing_left
@@ -80,7 +80,7 @@
if(!match_message && right_fallback && left_fallback)
fallback_log_message += "\n\t[item_path] has invalid value, using fallback icon.\n\titem_state = \"[item_state]\""
continue
- TEST_FAIL("Missing inhand sprites for [item_path] in both '[lefthand_file]' & '[righthand_file]'.\n\titem_state = \"[item_state]\"[match_message]")
+ TEST_NOTICE(src, "Missing inhand sprites for [item_path] in both '[lefthand_file]' & '[righthand_file]'.\n\titem_state = \"[item_state]\"[match_message]")
else if(missing_left)
TEST_FAIL("Missing left inhand sprite for [item_path] in '[lefthand_file]'[left_fallback ? ", using fallback icon" : null].\n\titem_state = \"[item_state]\"[match_message]")
else if(missing_right)
@@ -90,5 +90,5 @@
TEST_FAIL("Invalid item_state values should be set to null if there isn't a valid icon.[fallback_log_message]")
if(unset_inhand_var_message)
- log_test("\tNotice - Possible inhand icon matches found. It is best to be explicit with inhand sprite values.[unset_inhand_var_message]")
+ TEST_NOTICE(src, "Possible inhand icon matches found. It is best to be explicit with inhand sprite values.[unset_inhand_var_message]")
diff --git a/code/modules/unit_tests/icons/missing_icons.dm b/code/modules/unit_tests/icons/missing_icons.dm
index f548d2844a0f..36343da89c25 100644
--- a/code/modules/unit_tests/icons/missing_icons.dm
+++ b/code/modules/unit_tests/icons/missing_icons.dm
@@ -54,4 +54,3 @@
for(var/file_place in possible_icon_states[icon_state])
match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'")
TEST_FAIL("Missing icon_state for [obj_path] in '[icon]'.\n\ticon_state = \"[icon_state]\"[match_message]")
-
diff --git a/code/modules/unit_tests/icons/worn_icons.dm b/code/modules/unit_tests/icons/worn_icons.dm
index 673526cc9f68..84e1663407bc 100644
--- a/code/modules/unit_tests/icons/worn_icons.dm
+++ b/code/modules/unit_tests/icons/worn_icons.dm
@@ -5,6 +5,7 @@
/// Make sure this location is also present in tools/deploy.sh
/// If you need additional paths ontop of this second one, you can add another generate_possible_icon_states_list("your/folder/path/") below the if(additional_icon_location) block in Run(), and make sure to add that path to tools/deploy.sh as well.
var/additional_icon_location = null
+ var/required_test = TRUE
/datum/unit_test/mob_overlay_icons/proc/generate_possible_icon_states_list(directory_path)
if(!directory_path)
@@ -16,6 +17,9 @@
else
possible_icon_states += generate_possible_icon_states_list("[directory_path][file_path]")
+/datum/unit_test/mob_overlay_icons/proc/types_to_search()
+ return subtypesof(/obj/item/clothing)
+
/datum/unit_test/mob_overlay_icons/Run()
generate_possible_icon_states_list()
if(additional_icon_location)
@@ -23,7 +27,7 @@
var/list/already_warned_icons = list()
- for(var/obj/item/item_path as anything in (subtypesof(/obj/item/clothing)))
+ for(var/obj/item/item_path as anything in types_to_search())
var/cached_slot_flags = initial(item_path.slot_flags)
if(!cached_slot_flags || (cached_slot_flags & ITEM_SLOT_LPOCKET) || (cached_slot_flags & ITEM_SLOT_RPOCKET) || initial(item_path.item_flags) & ABSTRACT)
continue
@@ -45,7 +49,10 @@
if(mob_overlay_icon) //easiest to check since we override everything. this automatically includes downstream support.
if(!(icon_state in icon_states(mob_overlay_icon, 1)))
- TEST_FAIL("[item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in mob_overlay_icon override file, '[mob_overlay_icon]'[match_message]")
+ if(required_test)
+ TEST_FAIL("[item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in mob_overlay_icon override file, '[mob_overlay_icon]'[match_message]")
+ else
+ TEST_NOTICE(src, "[item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in mob_overlay_icon override file, '[mob_overlay_icon]'[match_message]")
continue
var/icon_file //checks against all the default icon locations if one isn't defined.
@@ -61,15 +68,6 @@
fail_reasons += "[item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
spacer = "\n\t"
- /*
- if(cached_slot_flags & ITEM_SLOT_ID)
- icon_file = 'icons/mob/clothing/id.dmi'
- if(!(icon_state in icon_states(icon_file, 1)))
- already_warned_icons += icon_state
- fail_reasons += "[spacer][item_path] using invalid [mob_overlay_state ? "mob_overlay_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
- spacer = "\n\t"
- */
-
if(cached_slot_flags & ITEM_SLOT_GLOVES)
icon_file = 'icons/mob/clothing/hands.dmi'
if(!(icon_state in icon_states(icon_file, 1)))
@@ -117,4 +115,13 @@
spacer = "\n\t"
if(fail_reasons)
- TEST_FAIL(fail_reasons)
+ if(required_test)
+ TEST_FAIL(fail_reasons)
+ else
+ TEST_NOTICE(src, fail_reasons)
+
+/datum/unit_test/mob_overlay_icons/not_clothing
+ required_test = FALSE
+
+/datum/unit_test/mob_overlay_icons/not_clothing/types_to_search()
+ return (subtypesof(/obj/item) - subtypesof(/obj/item/clothing))
diff --git a/code/modules/unit_tests/outfit_names.dm b/code/modules/unit_tests/outfit_names.dm
deleted file mode 100644
index b381bfeb7bf5..000000000000
--- a/code/modules/unit_tests/outfit_names.dm
+++ /dev/null
@@ -1,12 +0,0 @@
-/datum/unit_test/outfit_names/Run()
- var/list/outfit_names = list()
-
- for(var/datum/outfit/outfit_type as anything in subtypesof(/datum/outfit))
- var/name = initial(outfit_type.name)
-
- if(name in outfit_names)
- TEST_FAIL("Outfit name [name] is not unique: [outfit_type], [outfit_names[name]]")
-
- outfit_names[name] = outfit_type
-
-
diff --git a/code/modules/unit_tests/outfit_sanity.dm b/code/modules/unit_tests/outfit_sanity.dm
index 4dc12b4dc6e3..6fc875d94837 100644
--- a/code/modules/unit_tests/outfit_sanity.dm
+++ b/code/modules/unit_tests/outfit_sanity.dm
@@ -6,7 +6,7 @@
if (outfit.random != TRUE) \
TEST_FAIL("[outfit.name]'s [#outfit_key] is invalid! Could not equip a [outfit.##outfit_key] into that slot."); \
else \
- log_world("[outfit.name]'s [#outfit_key] is invalid! Could not equip a [outfit.##outfit_key] into that slot."); \
+ TEST_NOTICE(src, "[outfit.name]'s [#outfit_key] is invalid! Could not equip a [outfit.##outfit_key] into that slot."); \
} \
}
@@ -26,6 +26,7 @@
var/prototype_name = initial(prototype_outfit.name)
var/mob/living/carbon/human/H = allocate(/mob/living/carbon/human)
+ var/list/outfit_names = list()
for (var/outfit_type in subtypesof(/datum/outfit))
// Only make one human and keep undressing it because it's much faster
for (var/obj/item/I in H.get_equipped_items(include_pockets = TRUE))
@@ -33,8 +34,12 @@
var/datum/outfit/outfit = new outfit_type
- if(outfit.name == prototype_name)
+ var/outfit_name = outfit.name
+ if(outfit_name == prototype_name)
TEST_FAIL("[outfit.type]'s name is invalid! Uses default outfit name!")
+ if(outfit_name in outfit_names)
+ TEST_FAIL("Outfit name [outfit_name] is not unique: [outfit_type], [outfit_names[outfit_name]]")
+ outfit_names[outfit_name] = outfit_type
outfit.pre_equip(H, TRUE)
CHECK_OUTFIT_SLOT(uniform, ITEM_SLOT_ICLOTHING)
@@ -67,7 +72,6 @@
if (outfit.random != TRUE)
TEST_FAIL("[outfit.name]'s backpack_contents are invalid! Couldn't add [path] to backpack.")
else
- log_world("[outfit.name]'s backpack_contents are invalid! Couldn't add [path] to backpack.")
-
+ TEST_NOTICE(src, "[outfit.name]'s backpack_contents are invalid! Couldn't add [path] to backpack.")
#undef CHECK_OUTFIT_SLOT
diff --git a/code/modules/unit_tests/say.dm b/code/modules/unit_tests/say.dm
index d3fa6e6cdfc7..c725fcdc6dd8 100644
--- a/code/modules/unit_tests/say.dm
+++ b/code/modules/unit_tests/say.dm
@@ -8,7 +8,7 @@
test("Hello", "Hello", list())
test(";HELP", "HELP", list(MODE_HEADSET = TRUE))
test(";%Never gonna give you up", "Never gonna give you up", list(MODE_HEADSET = TRUE, MODE_SING = TRUE))
- test(".c Gun plz", "Gun plz", list(RADIO_KEY = RADIO_KEY_COMMAND, RADIO_EXTENSION = RADIO_CHANNEL_COMMAND))
+ test(".c Gun plz", "Gun plz", list(RADIO_KEY = RADIO_KEY_EMERGENCY, RADIO_EXTENSION = RADIO_CHANNEL_EMERGENCY))
test("...What", "...What", list())
/datum/unit_test/get_message_mods/proc/test(message, expected_message, list/expected_mods)
diff --git a/code/modules/unit_tests/ship_outpost_placement.dm b/code/modules/unit_tests/ship_outpost_placement.dm
index 48bbd6a181e3..0762af79e304 100644
--- a/code/modules/unit_tests/ship_outpost_placement.dm
+++ b/code/modules/unit_tests/ship_outpost_placement.dm
@@ -3,7 +3,7 @@
// disabled or intended as subshuttles
for(var/name as anything in SSmapping.shuttle_templates)
var/datum/map_template/shuttle/map = SSmapping.shuttle_templates[name]
- log_world("Loading [map.name]")
+ log_test("Loading [map.name]")
try
// they'll spawn in empty space, and won't be docked
new /datum/overmap/ship/controlled(list("x" = 1, "y" = 1), map)
@@ -13,10 +13,10 @@
for(var/outpost_type in subtypesof(/datum/overmap/outpost))
var/datum/overmap/outpost/test_outpost = new outpost_type()
- log_world("Testing [test_outpost.type]")
+ log_test("Testing [test_outpost.type]")
for(var/datum/overmap/ship/controlled/cur_ship as anything in SSovermap.controlled_ships)
- log_world(" - Docking [cur_ship.source_template.name]")
+ log_test(" - Docking [cur_ship.source_template.name]")
// already-docked ships are ignored.
// this was added to stop runtimes when subshuttles, which were docked to their parent ship, attempted to dock to the outpost as part of this test.
diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm
index 7240adb33855..18b5b12e7f48 100644
--- a/code/modules/unit_tests/unit_test.dm
+++ b/code/modules/unit_tests/unit_test.dm
@@ -85,38 +85,58 @@ GLOBAL_VAR(test_log)
allocated += instance
return instance
+/// Logs a test message. Will use GitHub action syntax found at https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions
+/datum/unit_test/proc/log_for_test(text, priority, file, line, test_path)
+ // Need to escape the text to properly support newlines.
+ var/annotation_text = replacetext(text, "%", "%25")
+ annotation_text = replacetext(annotation_text, "\n", "%0A")
+
+ log_world("::[priority] file=[file],line=[line],title=[test_path]: [type]::[annotation_text]")
+
/proc/RunUnitTest(test_path, list/test_results)
var/datum/unit_test/test = new test_path
GLOB.current_test = test
var/duration = REALTIMEOFDAY
+ log_world("::group::[test_path]")
test.Run()
duration = REALTIMEOFDAY - duration
GLOB.current_test = null
GLOB.failed_any_test |= !test.succeeded
- var/list/log_entry = list(
- "[test.succeeded ? TEST_OUTPUT_GREEN("PASS") : TEST_OUTPUT_RED("FAIL")]: [test_path] [duration / 10]s",
- )
+ var/list/log_entry = list()
var/list/fail_reasons = test.fail_reasons
+ var/test_output_desc = "[test_path]"
+ var/message = ""
+
for(var/reasonID in 1 to LAZYLEN(fail_reasons))
var/text = fail_reasons[reasonID][1]
var/file = fail_reasons[reasonID][2]
var/line = fail_reasons[reasonID][3]
- /// Github action annotation.
- log_world("::error file=[file],line=[line],title=[test_path]::[text]")
+ test.log_for_test(text, "error", file, line, test_path)
// Normal log message
- log_entry += "\tREASON #[reasonID]: [text] at [file]:[line]"
+ log_entry += "\tFAILURE #[reasonID]: [text] at [file]:[line]"
+
+ if(length(log_entry))
+ message = log_entry.Join("\n")
+ log_test(message)
- var/message = log_entry.Join("\n")
- log_test(message)
+ test_output_desc += " [duration / 10]s"
+ if (test.succeeded)
+ log_world("[TEST_OUTPUT_GREEN("PASS")] [test_output_desc]")
- test_results[test_path] = list("status" = test.succeeded ? UNIT_TEST_PASSED : UNIT_TEST_FAILED, "message" = message, "name" = test_path)
+ log_world("::endgroup::")
+
+ if (!test.succeeded)
+ log_world("::error::[TEST_OUTPUT_RED("FAIL")] [test_output_desc]")
+
+ var/final_status = test.succeeded ? UNIT_TEST_PASSED : UNIT_TEST_FAILED
+ test_results[test_path] = list("status" = final_status, "message" = message, "name" = test_path)
qdel(test)
@@ -141,6 +161,10 @@ GLOBAL_VAR(test_log)
CHECK_TICK //We check tick first because the unit test we run last may be so expensive that checking tick will lock up this loop forever
RunUnitTest(unit_path, test_results)
+ var/file_name = "data/unit_tests.json"
+ fdel(file_name)
+ file(file_name) << json_encode(test_results)
+
SSticker.force_ending = TRUE
//We have to call this manually because del_text can preceed us, and SSticker doesn't fire in the post game
SSticker.declare_completion()
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 877f1f11d854..0cf5a1258964 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -360,7 +360,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Bananium Energy Sword"
desc = "An energy sword that deals no damage, but will slip anyone it contacts, be it by melee attack, thrown \
impact, or just stepping on it. Beware friendly fire, as even anti-slip shoes will not protect against it."
- item = /obj/item/melee/transforming/energy/sword/bananium
+ item = /obj/item/melee/energy/sword/bananium
cost = 3
surplus = 0
include_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -417,7 +417,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Energy Sword"
desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be \
pocketed when inactive. Activating it produces a loud, distinctive noise."
- item = /obj/item/melee/transforming/energy/sword/saber
+ item = /obj/item/melee/energy/sword/saber
cost = 8
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -445,16 +445,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/clothing/gloves/rapid
cost = 8
-/datum/uplink_item/dangerous/guardian
- name = "Holoparasites"
- desc = "Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, they require an \
- organic host as a home base and source of fuel. Holoparasites come in various types and share damage with their host."
- item = /obj/item/storage/box/syndie_kit/guardian
- cost = 18
- surplus = 0
- exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- restricted = TRUE
-
/datum/uplink_item/dangerous/machinegun
name = "L6 Squad Automatic Weapon"
desc = "A fully-loaded Aussec Armoury belt-fed machine gun. \
@@ -869,7 +859,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/ammo/toydarts
name = "Box of Riot Darts"
desc = "A box of 40 Donksoft riot darts, for reloading any compatible foam dart magazine. Don't forget to share!"
- item = /obj/item/ammo_box/foambox/riot
+ item = /obj/item/storage/box/ammo/foam_darts/riot
cost = 2
surplus = 0
illegal_tech = FALSE
@@ -1140,14 +1130,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
for hit-and-run style attacks. Features an incendiary carbine, flash bang launcher, teleporter, ion thrusters and a Tesla energy array."
item = /obj/mecha/combat/gygax/dark/loaded
cost = 80
-
-/datum/uplink_item/support/honker
- name = "Dark H.O.N.K."
- desc = "A clown combat mech equipped with bombanana peel and tearstache grenade launchers, as well as the ubiquitous HoNkER BlAsT 5000."
- item = /obj/mecha/combat/honker/dark/loaded
- cost = 80
- include_modes = list(/datum/game_mode/nuclear/clown_ops)
-
/datum/uplink_item/support/touro
name = "Touro Exosuit"
desc = "A well-armored and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring \
@@ -1516,15 +1498,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
item = /obj/item/clothing/glasses/thermal/syndi
cost = 4
-/datum/uplink_item/device_tools/potion
- name = "Syndicate Sentience Potion"
- item = /obj/item/slimepotion/slime/sentience/nuclear
- desc = "A potion recovered at great risk by undercover Syndicate operatives and then subsequently modified with Syndicate technology. \
- Using it will make any animal sentient, and bound to serve you, as well as implanting an internal radio for communication and an internal ID card for opening doors."
- cost = 4
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
- restricted = TRUE
-
/datum/uplink_item/device_tools/guerillagloves
name = "Guerilla Gloves"
desc = "A pair of highly robust combat gripper gloves that excels at performing takedowns at close range, with an added lining of insulation. Careful not to hit a wall!"
@@ -1791,13 +1764,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
restricted_roles = list("Curator")
limited_stock = 1 //please don't spam deadchat
-/datum/uplink_item/role_restricted/cultconstructkit
- name = "Cult Construct Kit"
- desc = "Recovered from an abandoned Nar'sie cult lair two construct shells and a stash of empty soulstones was found. These were purified to prevent occult contamination and have been put in a belt so they may be used as an accessible source of disposable minions. The construct shells have been packaged into two beacons for rapid and portable deployment."
- item = /obj/item/storage/box/syndie_kit/cultconstructkit
- cost = 20
- restricted_roles = list("Chaplain")
-
/datum/uplink_item/role_restricted/lawnmower
name = "Gas powered lawn mower"
desc = "A lawn mower is a machine utilizing one or more revolving blades to cut a grass surface to an even height, or bodies if that's your thing"
diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm
index a785ba5985d7..bd0a0f04c84d 100644
--- a/code/modules/vehicles/atv.dm
+++ b/code/modules/vehicles/atv.dm
@@ -40,7 +40,6 @@
/obj/vehicle/ridden/atv/turret/Initialize()
. = ..()
turret = new(loc)
- turret.base = src
/obj/vehicle/ridden/atv/turret/Moved()
. = ..()
diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm
index d4a9aff2d8b2..ad1d3750aa9b 100644
--- a/code/modules/vehicles/pimpin_ride.dm
+++ b/code/modules/vehicles/pimpin_ride.dm
@@ -83,7 +83,7 @@
//For those who want to play farm simulator 503
/obj/vehicle/ridden/lawnmower
- name = "Donk! Co. TM Deluxe Lawnmower 3003"
+ name = "John J. Jimbler Ultra-Mega-Mower"
desc = "Equipped with reliable safeties to prevent accidents in the workplace. The safety light is on."
icon = 'icons/obj/vehicles.dmi'
icon_state = "lawnmower"
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index afabdc06f0f7..d16f767108dc 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -56,7 +56,6 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
integrity_failure = 0.33
armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
circuit = /obj/item/circuitboard/machine/vendor
- var/datum/weakref/payment_account_ref
light_power = 0.5
light_range = MINIMUM_USEFUL_LIGHT_RANGE
clicksound = 'sound/machines/pda_button1.ogg'
@@ -139,9 +138,9 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
///Does this machine accept mining points?
var/mining_point_vendor = FALSE
///Default price of items if not overridden
- var/default_price = 25
+ var/default_price = 15
///Default price of premium items if not overridden
- var/extra_price = 50
+ var/extra_price = 30
///Whether our age check is currently functional
var/age_restrictions = TRUE
@@ -194,6 +193,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
Radio = new /obj/item/radio(src)
Radio.listening = 0
+ if(istype(get_area(src.loc), /area/outpost) || istype(get_area(src.loc), /area/ruin))
+ all_items_free = FALSE
/obj/machinery/vending/Destroy()
QDEL_NULL(wires)
@@ -565,7 +566,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
L.client.give_award(/datum/award/achievement/misc/vendor_squish, L) // good job losing a fight with an inanimate object idiot
L.Paralyze(60)
- L.emote("scream")
+ L.force_scream()
playsound(L, 'sound/effects/blobattack.ogg', 40, TRUE)
playsound(L, 'sound/effects/splat.ogg', 50, TRUE)
@@ -815,16 +816,26 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
// else
// account.adjust_money(-price_to_use, "vendor_purchase")
// SSblackbox.record_feedback("amount", "vending_spent", price_to_use) // CELADON-EDIT - ORIGINAL
- var/datum/bank_account/account = C.registered_account
- if(price_to_use)
- if(account.has_money(price_to_use))
- var/datum/bank_account/owner = private_a
- if(owner)
- owner.transfer_money(account, price_to_use)
- else
- account.adjust_money(-price_to_use, "vendor_purchase")
- SSblackbox.record_feedback("amount", "vending_spent", price_to_use)
+ // var/datum/bank_account/account = C.registered_account
+ // if(price_to_use)
+ // if(account.has_money(price_to_use))
+ // var/datum/bank_account/owner = private_a
+ // if(owner)
+ // owner.transfer_money(account, price_to_use)
+ // else
+ // account.adjust_money(-price_to_use, "vendor_purchase")
+ // SSblackbox.record_feedback("amount", "vending_spent", price_to_use) // НАШЕ
// [/CELADON-EDIT]
+ var/datum/bank_account/account = C.registered_account
+ if(coin_records.Find(R) || hidden_records.Find(R))
+ price_to_use = R.custom_premium_price ? R.custom_premium_price : extra_price
+ if(price_to_use && !account.has_money(price_to_use))
+ say("You do not possess the funds to purchase [R.name].")
+ flick(icon_deny,src)
+ vend_ready = TRUE
+ return
+ account.adjust_money(-price_to_use, CREDIT_LOG_VENDOR_PURCHASE)
+ SSblackbox.record_feedback("amount", "vending_spent", price_to_use)
log_econ("[price_to_use] credits were inserted into [src] by [H] to buy [R].")
if(last_shopper != REF(usr) || purchase_message_cooldown < world.time)
say("Thank you for shopping with [src]!")
@@ -834,9 +845,13 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
if(icon_vend) //Show the vending animation if needed
flick(icon_vend,src)
playsound(src, 'sound/machines/machine_vend.ogg', 50, TRUE, extrarange = -3)
- new R.product_path(get_turf(src))
+ var/obj/item/vended_item = new R.product_path(get_turf(src))
if(R.max_amount >= 0)
R.amount--
+ if(usr.CanReach(src) && usr.put_in_hands(vended_item))
+ to_chat(usr, span_notice("You take [R.name] out of the slot."))
+ else
+ to_chat(usr, span_warning("[capitalize(R.name)] falls onto the floor!"))
SSblackbox.record_feedback("nested tally", "vending_machine_usage", 1, list("[type]", "[R.product_path]"))
vend_ready = TRUE
@@ -1088,7 +1103,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
if(owner)
owner.transfer_money(account, S.custom_price)
else
- account.adjust_money(-S.custom_price, "vendor_purchase")
+ account.adjust_money(-S.custom_price, CREDIT_LOG_VENDOR_PURCHASE)
SSblackbox.record_feedback("amount", "vending_spent", S.custom_price)
log_econ("[S.custom_price] credits were spent on [src] buying a [S] by [owner.account_holder], owned by [private_a.account_holder].")
vending_machine_input[N] = max(vending_machine_input[N] - 1, 0)
diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm
index cb3cd0053d8a..44715238ed9f 100644
--- a/code/modules/vending/assist.dm
+++ b/code/modules/vending/assist.dm
@@ -22,7 +22,7 @@
/obj/item/circuitboard/machine/vendor = 3)
refill_canister = /obj/item/vending_refill/assist
product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
- default_price = 125
+ default_price = 50
extra_price = 100
light_mask = "generic-light-mask"
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 295133290c16..5caf3995643c 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -56,7 +56,7 @@
/obj/item/clothing/under/costume/schoolgirl/green = 1,
/obj/item/clothing/under/costume/schoolgirl/orange = 1,
/obj/item/clothing/head/kitty = 1,
- /obj/item/clothing/under/dress/skirt = 1,
+ /obj/item/clothing/under/dress/skirt/color = 1,
/obj/item/clothing/head/beret = 1,
/obj/item/clothing/head/cowboy = 1, //WS - Yee Haw
/obj/item/clothing/accessory/waistcoat = 1,
@@ -130,8 +130,8 @@
/obj/item/shield/riot/roman/fake = 1,
/obj/item/skub = 1)
refill_canister = /obj/item/vending_refill/autodrobe
- default_price = 180
- extra_price = 360
+ default_price = 90
+ extra_price = 180
light_mask="theater-light-mask"
/obj/machinery/vending/autodrobe/canLoadItem(obj/item/I,mob/user)
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index 7477fba82619..67471c869142 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -77,8 +77,8 @@
product_ads = "Drink up!;Booze is good for you!;Alcohol is everyone's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 53 FSC!;Award-winning wine!;Maximum alcohol!;Everyone loves beer.;A toast for progress!"
req_access = list(ACCESS_BAR)
refill_canister = /obj/item/vending_refill/boozeomat
- default_price = 120
- extra_price = 200
+ default_price = 10
+ extra_price = 15
light_mask = "boozeomat-light-mask"
/obj/machinery/vending/boozeomat/all_access
diff --git a/code/modules/vending/cartridge.dm b/code/modules/vending/cartridge.dm
index b2608b6556f4..b69f40525ac9 100644
--- a/code/modules/vending/cartridge.dm
+++ b/code/modules/vending/cartridge.dm
@@ -14,8 +14,8 @@
/obj/item/cartridge/captain = 3,
/obj/item/cartridge/quartermaster = 10)
refill_canister = /obj/item/vending_refill/cart
- default_price = 250
- extra_price = 500
+ default_price = 200
+ extra_price = 300
light_mask="cart-light-mask"
/obj/item/vending_refill/cart
diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm
index 65437f3bb4ec..3bbb10afb9c9 100644
--- a/code/modules/vending/cigarette.dm
+++ b/code/modules/vending/cigarette.dm
@@ -25,8 +25,8 @@
/obj/item/storage/fancy/cigarettes/cigars/cohiba = 1,
/obj/item/clothing/mask/vape/cigar = 3)
refill_canister = /obj/item/vending_refill/cigarette
- default_price = 75
- extra_price = 250
+ default_price = 10
+ extra_price = 20
light_mask = "cigs-light-mask"
/obj/machinery/vending/cigarette/syndicate
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index b7840f9ba9c0..a4d492b748d7 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -61,14 +61,17 @@
/obj/item/clothing/under/pants/track = 2,
/obj/item/clothing/shoes/sneakers/black = 4,
/obj/item/clothing/head/wig/natural = 4,
- /obj/item/clothing/under/dress/skirt/plaid = 2,
- /obj/item/clothing/under/dress/skirt/plaid/blue = 2,
- /obj/item/clothing/under/dress/skirt/plaid/green = 2,
- /obj/item/clothing/under/dress/skirt/plaid/purple = 2,
- /obj/item/clothing/under/dress/skirt = 2,
- /obj/item/clothing/under/dress/skirt/blue = 2,
- /obj/item/clothing/under/dress/skirt/red = 2,
- /obj/item/clothing/under/dress/skirt/purple = 2,
+ /obj/item/clothing/under/dress/skirt/color = 2,
+ /obj/item/clothing/under/dress/skirt/color/blue = 2,
+ /obj/item/clothing/under/dress/skirt/color/red = 2,
+ /obj/item/clothing/under/dress/skirt/color/purple = 2,
+ /obj/item/clothing/under/dress/skirt/color/white = 2,
+ /obj/item/clothing/under/dress/skirt/pinafore = 2,
+ /obj/item/clothing/under/dress/skirt/pinafore/maroon = 2,
+ /obj/item/clothing/under/dress/skirt/pinafore/cerulean = 2,
+ /obj/item/clothing/under/dress/skirt/pinafore/plaid = 2,
+ /obj/item/clothing/under/dress/skirt/pinafore/plaid/green = 2,
+ /obj/item/clothing/under/dress/skirt/pinafore/plaid/brown = 2,
/obj/item/clothing/under/suit/white/skirt = 2,
/obj/item/clothing/under/rank/command/captain/suit/skirt = 2,
/obj/item/clothing/under/rank/command/head_of_personnel/suit/skirt = 2,
@@ -97,6 +100,8 @@
/obj/item/clothing/under/dress/sailor = 1,
/obj/item/clothing/under/dress/redeveninggown = 1,
/obj/item/clothing/under/dress/blacktango = 1,
+ /obj/item/clothing/under/dress/one_shoulder = 1,
+ /obj/item/clothing/under/dress/white_dress = 1,
/obj/item/clothing/suit/ianshirt = 1,
/obj/item/clothing/shoes/laceup = 2,
/obj/item/clothing/shoes/sandal = 2,
diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm
index 9c4851c134a5..f56336a0d44c 100644
--- a/code/modules/vending/coffee.dm
+++ b/code/modules/vending/coffee.dm
@@ -13,8 +13,8 @@
/obj/item/reagent_containers/food/drinks/cafelatte = 3,
/obj/item/reagent_containers/food/drinks/soylatte = 3)
refill_canister = /obj/item/vending_refill/coffee
- default_price = 45
- extra_price = 150
+ default_price = 5
+ extra_price = 15
light_mask = "coffee-light-mask"
light_color = COLOR_DARK_MODERATE_ORANGE
diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm
index 017fd02334ca..5fc4e8da8ea3 100644
--- a/code/modules/vending/cola.dm
+++ b/code/modules/vending/cola.dm
@@ -26,25 +26,13 @@
/obj/item/reagent_containers/food/drinks/soda_cans/xeno_energy = 1,
/obj/item/reagent_containers/food/drinks/soda_cans/crosstalk = 1)
refill_canister = /obj/item/vending_refill/cola
- default_price = 45
- extra_price = 200
-
+ default_price = 5
+ extra_price = 15
/obj/item/vending_refill/cola
machine_name = "RobustMore Softdrinks"
icon_state = "refill_cola"
-/obj/machinery/vending/cola/random
- name = "\improper Random Drinkies"
- icon_state = "random_cola"
- desc = "Uh oh!"
-
-/obj/machinery/vending/cola/random/Initialize()
- ..()
- var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random)
- new T(loc)
- return INITIALIZE_HINT_QDEL
-
/obj/machinery/vending/cola/blue
icon_state = "Cola_Machine"
light_mask = "cola-light-mask"
diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm
index b5a9d073e8fa..1050e14de93f 100644
--- a/code/modules/vending/engineering.dm
+++ b/code/modules/vending/engineering.dm
@@ -29,8 +29,8 @@
/obj/item/stock_parts/matter_bin = 5,
/obj/item/stock_parts/manipulator = 5)
refill_canister = /obj/item/vending_refill/engineering
- default_price = 450
- extra_price = 500
+ default_price = 200
+ extra_price = 400
light_mask = "engi-light-mask"
/obj/item/vending_refill/engineering
diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm
index fb096656c1c3..c3b3e175d183 100644
--- a/code/modules/vending/engivend.dm
+++ b/code/modules/vending/engivend.dm
@@ -22,7 +22,7 @@
/obj/item/construction/rcd/loaded = 2,
/obj/item/storage/box/smart_metal_foam = 1)
refill_canister = /obj/item/vending_refill/engivend
- default_price = 450
+ default_price = 250
extra_price = 500
light_mask = "engivend-light-mask"
diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm
index 06069e4db764..931611da1df9 100644
--- a/code/modules/vending/liberation_toy.dm
+++ b/code/modules/vending/liberation_toy.dm
@@ -10,14 +10,14 @@
/obj/item/gun/ballistic/automatic/toy/pistol = 10,
/obj/item/gun/ballistic/shotgun/toy = 10,
/obj/item/toy/sword = 10,
- /obj/item/ammo_box/foambox = 20,
+ /obj/item/storage/box/ammo/foam_darts = 20,
/obj/item/toy/foamblade = 10,
/obj/item/toy/balloon/syndicate = 10,
/obj/item/clothing/suit/syndicatefake = 5,
/obj/item/clothing/head/syndicatefake = 5) //OPS IN DORMS oh wait it's just an assistant
contraband = list(
/obj/item/gun/ballistic/shotgun/toy/crossbow = 10, //Congrats, you unlocked the +18 setting!
- /obj/item/ammo_box/foambox/riot = 20,
+ /obj/item/storage/box/ammo/foam_darts/riot = 20,
/obj/item/toy/katana = 10,
/obj/item/dualsaber/toy = 5,
/obj/item/toy/cards/deck/syndicate = 10) //Gambling and it hurts, making it a +18 item
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index 5a35a75a4495..ec96150e92df 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -36,8 +36,8 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/medical
- default_price = 250
- extra_price = 500
+ default_price = 150
+ extra_price = 400
light_mask = "med-light-mask"
/obj/item/vending_refill/medical
diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm
index dd498ffded07..41f97ab888a4 100644
--- a/code/modules/vending/medical_wall.dm
+++ b/code/modules/vending/medical_wall.dm
@@ -21,8 +21,8 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/wallmed
- default_price = 250
- extra_price = 500
+ default_price = 200
+ extra_price = 400
tiltable = FALSE
light_mask = "wallmed-light-mask"
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index 37a51b27bb89..8ffd760c9533 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -12,8 +12,6 @@
/obj/item/assembly/flash/handheld = 5,
/obj/item/storage/box/evidence = 6,
/obj/item/flashlight/seclite = 4,
- /obj/item/ammo_box/c9mm/rubbershot = 3,
- /obj/item/ammo_box/c9mm = 1,
/obj/item/stock_parts/cell/gun = 3,
/obj/item/clothing/glasses/sunglasses = 2)
premium = list(
@@ -107,7 +105,7 @@
premium = list()
voucher_items = list(
"Tactical Energy Gun" = /obj/item/gun/energy/e_gun/hades,
- "Combat Shotgun" = /obj/item/gun/ballistic/shotgun/automatic/combat)
+ "Combat Shotgun" = /obj/item/gun/ballistic/shotgun/automatic/m11)
/obj/machinery/vending/security/marine/syndicate
icon_state = "syndicate-marine"
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index 45d76a4754fa..034d9df27ba4 100644
--- a/code/modules/vending/snack.dm
+++ b/code/modules/vending/snack.dm
@@ -16,27 +16,16 @@
/obj/item/storage/box/gum = 3,
/obj/item/reagent_containers/food/snacks/energybar = 6,
/obj/item/reagent_containers/food/snacks/syndicake = 6,
- /obj/item/reagent_containers/food/snacks/candy/bronx = 1)
+ )
refill_canister = /obj/item/vending_refill/snack
canload_access_list = list(ACCESS_KITCHEN)
- default_price = 60
- extra_price = 160
+ default_price = 5
+ extra_price = 10
input_display_header = "Chef's Food Selection"
/obj/item/vending_refill/snack
machine_name = "RobustMore DrinkFoods LLC"
-/obj/machinery/vending/snack/random
- name = "\improper Random Snackies"
- icon_state = "random_snack"
- desc = "Uh oh!"
-
-/obj/machinery/vending/snack/random/Initialize()
- ..()
- var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random)
- new T(loc)
- return INITIALIZE_HINT_QDEL
-
/obj/machinery/vending/snack/blue
icon_state = "snackblue"
diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm
index 08af917aa86a..3ee07932fddd 100644
--- a/code/modules/vending/toys.dm
+++ b/code/modules/vending/toys.dm
@@ -12,7 +12,7 @@
/obj/item/gun/ballistic/automatic/toy/pistol = 10,
/obj/item/gun/ballistic/shotgun/toy = 10,
/obj/item/toy/sword = 10,
- /obj/item/ammo_box/foambox = 20,
+ /obj/item/storage/box/ammo/foam_darts = 20,
/obj/item/toy/foamblade = 10,
/obj/item/toy/balloon/syndicate = 10,
/obj/item/clothing/suit/syndicatefake = 5,
@@ -23,7 +23,7 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/donksoft
- default_price = 150
+ default_price = 100
extra_price = 300
/obj/item/vending_refill/donksoft
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index e6db60047da0..4dac5845fe13 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -2,8 +2,8 @@
icon_state = "refill_clothes"
/obj/machinery/vending/wardrobe
- default_price = 350
- extra_price = 450
+ default_price = 200
+ extra_price = 500
input_display_header = "Returned Clothing"
light_mask = "wardrobe-light-mask"
diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm
index 98a5331b2744..d4335680a513 100644
--- a/code/modules/vending/youtool.dm
+++ b/code/modules/vending/youtool.dm
@@ -25,5 +25,5 @@
/obj/item/clothing/gloves/color/yellow = 1)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
- default_price = 125
- extra_price = 350
+ default_price = 75
+ extra_price = 250
diff --git a/config/config.txt b/config/config.txt
index 7a348b2c9cc0..d81d1a7e63cc 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -6,7 +6,6 @@ $include dbconfig.txt
$include comms.txt
$include resources.txt
$include interviews.txt
-$include atmos_mix.txt
# You can use the @ character at the beginning of a config option to lock it from being edited in-game
# Example usage:
@@ -156,9 +155,6 @@ LOG_CLONING
## log shuttle actions
LOG_SHUTTLE
-## Enable the demo subsystem
-# DEMOS_ENABLED
-
## Log all timers on timer auto reset
# LOG_TIMERS_ON_BUCKET_RESET
@@ -210,9 +206,6 @@ VOTE_AUTOTRANSFER_INTERVAL 18000
## disable abandon mob
#NORESPAWN
-## disables calling del(src) on newmobs if they logout before spawnin in
-# DONT_DEL_NEWMOB
-
## set a hosted by name for unix platforms
HOSTEDBY Yournamehere
@@ -300,8 +293,6 @@ CHECK_RANDOMIZER
# INVOKE_YOUTUBEDL youtube-dl
## In-game features
-##Toggle for having jobs load up from the .txt
-# LOAD_JOBS_FROM_TXT
## Uncomment this to forbid admins from possessing the singularity.
#FORBID_SINGULO_POSSESSION
@@ -399,7 +390,7 @@ NOTIFY_NEW_PLAYER_ACCOUNT_AGE 1
#AGGRESSIVE_CHANGELOG
## Comment this out if you've used the mass conversion sql proc for notes or want to stop converting notes
-AUTOCONVERT_NOTES
+#AUTOCONVERT_NOTES
## Comment this out to stop admin messages sent anytime an admin disconnects from a round in play, you can edit the messages in admin.dm
ANNOUNCE_ADMIN_LOGOUT
@@ -407,15 +398,6 @@ ANNOUNCE_ADMIN_LOGOUT
## Uncomment to have an admin message sent anytime an admin connects to a round in play, you can edit the messages in admin.dm
#ANNOUNCE_ADMIN_LOGIN
-## Map rotation
-## You should edit maps.txt to match your configuration when you enable this.
-MAPROTATION
-
-## Map voting
-## Allows players to vote with their preffered map setting
-## When it's set to zero, the map will be randomly picked each round
-PREFERENCE_MAP_VOTING 1
-
## AUTOADMIN
## The default admin rank
AUTOADMIN_RANK Game Master
diff --git a/config/game_options.txt b/config/game_options.txt
index 9c46eb7865f0..3dc42b17a69c 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -93,16 +93,10 @@ PROBABILITY TRAITORBRO 2
PROBABILITY TRAITORCHAN 3
PROBABILITY INTERNAL_AFFAIRS 3
PROBABILITY NUCLEAR 2
-PROBABILITY REVOLUTION 2
-PROBABILITY CULT 2
PROBABILITY CHANGELING 2
PROBABILITY WIZARD 4
-PROBABILITY MONKEY 1
-PROBABILITY METEOR 0
PROBABILITY EXTENDED 1
PROBABILITY SECRET_EXTENDED 1
-PROBABILITY DEVIL 0
-PROBABILITY DEVIL_AGENTS 0
PROBABILITY CLOWNOPS 2
## You probably want to keep sandbox off by default for secret and random.
@@ -120,15 +114,11 @@ CONTINUOUS TRAITORBRO
CONTINUOUS TRAITORCHAN
CONTINUOUS INTERNAL_AFFAIRS
#CONTINUOUS NUCLEAR
-#CONTINUOUS REVOLUTION
-CONTINUOUS CULT
CONTINUOUS CHANGELING
CONTINUOUS WIZARD
-#CONTINUOUS MONKEY
##Note: do not toggle continuous off for these modes, as they have no antagonists and would thus end immediately!
-CONTINUOUS METEOR
CONTINUOUS EXTENDED
CONTINUOUS SECRET_EXTENDED
@@ -141,11 +131,8 @@ MIDROUND_ANTAG TRAITOR
MIDROUND_ANTAG TRAITORCHAN
MIDROUND_ANTAG INTERNAL_AFFAIRS
#MIDROUND_ANTAG NUCLEAR
-#MIDROUND_ANTAG REVOLUTION
-MIDROUND_ANTAG CULT
MIDROUND_ANTAG CHANGELING
MIDROUND_ANTAG WIZARD
-#MIDROUND_ANTAG MONKEY
## Uncomment these for overrides of the minimum / maximum number of players in a round type.
## If you set any of these occasionally check to see if you still need them as the modes
@@ -168,39 +155,17 @@ MIDROUND_ANTAG WIZARD
#MIN_POP NUCLEAR 0
#MAX_POP NUCLEAR -1
-#MIN_POP REVOLUTION 20
-#MAX_POP REVOLUTION -1
-
-#MIN_POP CULT 24
-#MAX_POP CULT -1
-
#MIN_POP CHANGELING 15
#MAX_POP CHANGELING -1
#MIN_POP WIZARD 20
#MAX_POP WIZARD -1
-#MIN_POP MONKEY 20
-#MAX_POP MONKEY -1
-
-#MIN_POP METEOR 0
-#MAX_POP METEOR -1
-
-#MIN_POP DEVIL 0
-#MAX_POP DEVIL -1
-
-#MIN_POP DEVIL_AGENTS 25
-#MAX_POP DEVIL_AGENTS -1
-
## Setting at least one mode to be playable at 0/1 players is required.
#MIN_POP EXTENDED 0
#MAX_POP EXTENDED -1
-
-## The amount of time it takes for the emergency shuttle to be called, from round start.
-SHUTTLE_REFUEL_DELAY 12000
-
## Variables calculate how number of antagonists will scale to population.
## Used as (Antagonists = Population / Coeff)
## Set to 0 to disable scaling and use default numbers instead.
@@ -272,19 +237,6 @@ ALLOW_AI_MULTICAM
## Uncomment to prevent the peacekeeper cyborg module from being chosen
#DISABLE_PEACEBORG
-## AWAY MISSIONS ###
-
-## Uncomment to load the virtual reality hub map
-#VIRTUAL_REALITY
-
-## Uncomment to load one of the missions from awaymissionconfig.txt at roundstart.
-#ROUNDSTART_AWAY
-
-## How long the delay is before the Away Mission gate opens. Default is half an hour.
-## 600 is one minute.
-GATEWAY_DELAY 18000
-
-
## ACCESS ###
## If the number of players ready at round starts exceeds this threshold, JOBS_HAVE_MINIMAL_ACCESS will automatically be enabled. Otherwise, it will be disabled.
@@ -333,8 +285,8 @@ NEAR_DEATH_EXPERIENCE
## ROUNDSTART SILICON LAWS ###
## This controls what the AI's laws are at the start of the round.
-## Set to 0/commented out for "off", silicons will just start with Asimov.
-## Set to 1 for "custom", silicons will start with the custom laws defined in silicon_laws.txt. (If silicon_laws.txt is empty, the AI will spawn with asimov and Custom boards will auto-delete.)
+## Set to 0/commented out for "off", silicons will start with no laws.
+## Set to 1 for "custom", silicons will start with the custom laws defined in silicon_laws.txt. (If silicon_laws.txt is empty, the AI will spawn with Asimov and Custom boards will auto-delete.)
## Set to 2 for "random", silicons will start with a random lawset picked from random laws specified below.
## Set to 3 for "weighted random", using values in "silicon_weights.txt", a law will be selected, with weights specifed in that file.
DEFAULT_LAWS 2
@@ -470,9 +422,6 @@ ROUNDSTART_RACES jelly
## The amount of loadout items players are allowed to spawn with. Default 10
MAX_LOADOUT_ITEMS 10
-##Overflow job. Default is assistant
-OVERFLOW_JOB Assistant
-
## Overflow slot cap. Set to -1 for unlimited. If limited, it will still open up if every other job is full.
OVERFLOW_CAP -1
@@ -480,9 +429,6 @@ OVERFLOW_CAP -1
## This is disabled by default to make testing quicker, should be enabled on production servers or testing servers messing with lighting
#STARLIGHT
-## Uncomment to bring back old grey suit assistants instead of the now default rainbow colored assistants.
-#GREY_ASSISTANTS
-
## Midround Antag (aka Mulligan antag) config options ###
## A time, in minutes, after which the midround antag system stops attempting to run and continuous rounds end immediately upon completion.
@@ -515,17 +461,6 @@ BOMBCAP 20
## LagHell (7, 14, 28)
#BOMBCAP 28
-
-## Lavaland "Budget"
-## Lavaland ruin spawning has an imaginary budget to spend on ruins, where
-## a less lootfilled or smaller or less round effecting ruin costs less to
-## spawn, while the converse is true. Alter this number to affect the amount
-## of ruins.
-LAVALAND_BUDGET 60
-
-## Space Ruin Budged
-Space_Budget 16
-
## How many wirechewing rodents you want to spawn on exposed maintenane wires at the start of the round. You may wish to set this to 0 if you're testing powernets.
MICE_ROUNDSTART 10
@@ -534,12 +469,6 @@ MICE_ROUNDSTART 10
SMUGGLER_SATCHELS 3
-## If the percentage of players alive (doesn't count conversions) drops below this threshold the emergency shuttle will be forcefully called (provided it can be)
-#EMERGENCY_SHUTTLE_AUTOCALL_THRESHOLD 0.2
-
-## Determines if players are allowed to print integrated circuits, uncomment to allow.
-#IC_PRINTING
-
## Uncomment to allow roundstart quirk selection in the character setup menu.
## This used to be named traits, hence the config name, but it handles quirks, not the other kind of trait!
ROUNDSTART_TRAITS
@@ -547,9 +476,6 @@ ROUNDSTART_TRAITS
## Uncomment to disable human moods.
#DISABLE_HUMAN_MOOD
-## Enable night shifts ##
-#ENABLE_NIGHT_SHIFTS
-
## Enable randomized shift start times##
#RANDOMIZE_SHIFT_TIME
@@ -562,9 +488,6 @@ MONKEYCAP 64
## A cap on how many mice can be bred via cheese wedges
RATCAP 64
-## Maximum fine for a citation
-MAXFINE 2000
-
## Enable the capitalist agenda on your server.
ECONOMY
diff --git a/dependencies.sh b/dependencies.sh
index 6f5a61810a81..b702df60dacd 100755
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -24,7 +24,7 @@ export SPACEMAN_DMM_VERSION=suite-1.8
export PYTHON_VERSION=3.9.0
#auxmos repository
-export AUXMOS_REPO=https://github.com/Putnam3145/auxmos
+export AUXMOS_REPO=https://github.com/shiptest-ss13/auxmos
#auxmos version
-export AUXMOS_VERSION=v2.5.1
+export AUXMOS_VERSION=v2.5.5.3
diff --git a/html/changelogs/archive/2019-03.yml b/html/changelogs/archive/2019-03.yml
index b5fd83b8ae4c..af4cd2063ffc 100644
--- a/html/changelogs/archive/2019-03.yml
+++ b/html/changelogs/archive/2019-03.yml
@@ -430,7 +430,7 @@
- bugfix: Rolling a 17 on the d20 of fate no longer gives you an empty box.
Basilman:
- bugfix: fixed runtime from selectin missing bodypart due to ran_zone
- - code_imp: changed how ran_zone selects a zone from a switch to pickweight
+ - code_imp: changed how ran_zone selects a zone from a switch to pick_weight
Kierany9:
- bugfix: Added a 15 second grace period after death to prevent people from avoiding
a hivemind host's Reclaim by succumbing.
diff --git a/icons/effects/anomalies.dmi b/icons/effects/anomalies.dmi
index e1671b816ec5..c716fc799097 100644
Binary files a/icons/effects/anomalies.dmi and b/icons/effects/anomalies.dmi differ
diff --git a/icons/effects/blood.dmi b/icons/effects/blood.dmi
index aed7e9b4fbf4..ed74435fb0a6 100644
Binary files a/icons/effects/blood.dmi and b/icons/effects/blood.dmi differ
diff --git a/icons/effects/blood_vox.dmi b/icons/effects/blood_vox.dmi
deleted file mode 100644
index d6d8f1c80208..000000000000
Binary files a/icons/effects/blood_vox.dmi and /dev/null differ
diff --git a/icons/effects/icons.dmi b/icons/effects/icons.dmi
new file mode 100644
index 000000000000..0d62217efbf2
Binary files /dev/null and b/icons/effects/icons.dmi differ
diff --git a/icons/effects/landmarks_static.dmi b/icons/effects/landmarks_static.dmi
deleted file mode 100644
index 05301f14a831..000000000000
Binary files a/icons/effects/landmarks_static.dmi and /dev/null differ
diff --git a/icons/effects/mapping/docking_ports.dmi b/icons/effects/mapping/docking_ports.dmi
new file mode 100644
index 000000000000..96909d7bd0f3
Binary files /dev/null and b/icons/effects/mapping/docking_ports.dmi differ
diff --git a/icons/effects/mapping/landmarks_static.dmi b/icons/effects/mapping/landmarks_static.dmi
new file mode 100644
index 000000000000..3e51e3f9a6e5
Binary files /dev/null and b/icons/effects/mapping/landmarks_static.dmi differ
diff --git a/icons/effects/mapping/mapping_helpers.dmi b/icons/effects/mapping/mapping_helpers.dmi
new file mode 100644
index 000000000000..430ac86c6db5
Binary files /dev/null and b/icons/effects/mapping/mapping_helpers.dmi differ
diff --git a/icons/effects/mapping/random_spawners.dmi b/icons/effects/mapping/random_spawners.dmi
new file mode 100644
index 000000000000..d6e06fb140d0
Binary files /dev/null and b/icons/effects/mapping/random_spawners.dmi differ
diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi
deleted file mode 100644
index 50e88be487b0..000000000000
Binary files a/icons/effects/mapping_helpers.dmi and /dev/null differ
diff --git a/icons/effects/particles/smoke.dmi b/icons/effects/particles/smoke.dmi
index 4a3239499b96..99123beeb59a 100644
Binary files a/icons/effects/particles/smoke.dmi and b/icons/effects/particles/smoke.dmi differ
diff --git a/icons/hud/screen_alert.dmi b/icons/hud/screen_alert.dmi
index 99de0dbf9441..6e12eadc662b 100644
Binary files a/icons/hud/screen_alert.dmi and b/icons/hud/screen_alert.dmi differ
diff --git a/icons/misc/overmap.dmi b/icons/misc/overmap.dmi
index f0c9f6e44677..94ac33e29584 100644
Binary files a/icons/misc/overmap.dmi and b/icons/misc/overmap.dmi differ
diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi
index 7e87f94fd183..2cf6dbff2416 100644
Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index 5ca5b6bd045d..53910743285b 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/ears.dmi b/icons/mob/clothing/ears.dmi
index e7376425f545..f973447b6f46 100644
Binary files a/icons/mob/clothing/ears.dmi and b/icons/mob/clothing/ears.dmi differ
diff --git a/icons/mob/clothing/faction/nanotrasen/mask.dmi b/icons/mob/clothing/faction/nanotrasen/mask.dmi
new file mode 100644
index 000000000000..47824c7a69f7
Binary files /dev/null and b/icons/mob/clothing/faction/nanotrasen/mask.dmi differ
diff --git a/icons/mob/clothing/faction/nanotrasen/mask_kepori.dmi b/icons/mob/clothing/faction/nanotrasen/mask_kepori.dmi
new file mode 100644
index 000000000000..cf3a4392972e
Binary files /dev/null and b/icons/mob/clothing/faction/nanotrasen/mask_kepori.dmi differ
diff --git a/icons/mob/clothing/faction/nanotrasen/vox.dmi b/icons/mob/clothing/faction/nanotrasen/vox.dmi
new file mode 100644
index 000000000000..c5793cc61076
Binary files /dev/null and b/icons/mob/clothing/faction/nanotrasen/vox.dmi differ
diff --git a/icons/mob/clothing/faction/ngr/mask.dmi b/icons/mob/clothing/faction/ngr/mask.dmi
index 0baead0a39b1..298cf3ed8303 100644
Binary files a/icons/mob/clothing/faction/ngr/mask.dmi and b/icons/mob/clothing/faction/ngr/mask.dmi differ
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
index 0afcd0ad26c5..f191314a13b0 100644
Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index d2970f6b9ead..638398b7b649 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index 8affe54d81d4..cebe3a9f847b 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index b595f529b7ee..ef694ddd6116 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/under/color.dmi b/icons/mob/clothing/under/color.dmi
index 8bda1f9c7d6c..d87321f4f018 100644
Binary files a/icons/mob/clothing/under/color.dmi and b/icons/mob/clothing/under/color.dmi differ
diff --git a/icons/mob/clothing/under/command.dmi b/icons/mob/clothing/under/command.dmi
index 6ed86df85dab..4935f41abc82 100644
Binary files a/icons/mob/clothing/under/command.dmi and b/icons/mob/clothing/under/command.dmi differ
diff --git a/icons/mob/clothing/under/dress.dmi b/icons/mob/clothing/under/dress.dmi
deleted file mode 100644
index a67fcb85331f..000000000000
Binary files a/icons/mob/clothing/under/dress.dmi and /dev/null differ
diff --git a/icons/mob/clothing/under/dresses/dress.dmi b/icons/mob/clothing/under/dresses/dress.dmi
new file mode 100644
index 000000000000..318b67abbb19
Binary files /dev/null and b/icons/mob/clothing/under/dresses/dress.dmi differ
diff --git a/icons/mob/clothing/under/dresses/dress_kepori.dmi b/icons/mob/clothing/under/dresses/dress_kepori.dmi
new file mode 100644
index 000000000000..d6b8e2dfad78
Binary files /dev/null and b/icons/mob/clothing/under/dresses/dress_kepori.dmi differ
diff --git a/icons/mob/clothing/under/suits.dmi b/icons/mob/clothing/under/suits.dmi
index c7eceebc3540..cf2178188307 100644
Binary files a/icons/mob/clothing/under/suits.dmi and b/icons/mob/clothing/under/suits.dmi differ
diff --git a/icons/mob/clothing/under/syndicate.dmi b/icons/mob/clothing/under/syndicate.dmi
index cc5e484b89c4..eb93d4b3530d 100644
Binary files a/icons/mob/clothing/under/syndicate.dmi and b/icons/mob/clothing/under/syndicate.dmi differ
diff --git a/icons/mob/hair_gradients.dmi b/icons/mob/hair_gradients.dmi
index df0fd1b6f744..7537193b1314 100644
Binary files a/icons/mob/hair_gradients.dmi and b/icons/mob/hair_gradients.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index a819dd3ca780..0c0efee7cbb7 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/inhands/64x64_lefthand.dmi b/icons/mob/inhands/64x64_lefthand.dmi
index 50a17a22d470..64efd1262a22 100644
Binary files a/icons/mob/inhands/64x64_lefthand.dmi and b/icons/mob/inhands/64x64_lefthand.dmi differ
diff --git a/icons/mob/inhands/64x64_righthand.dmi b/icons/mob/inhands/64x64_righthand.dmi
index bbeddf915282..e91c7830c614 100644
Binary files a/icons/mob/inhands/64x64_righthand.dmi and b/icons/mob/inhands/64x64_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/axes_lefthand.dmi b/icons/mob/inhands/weapons/axes_lefthand.dmi
index 3b95d17cdc78..accff4a2bb7f 100644
Binary files a/icons/mob/inhands/weapons/axes_lefthand.dmi and b/icons/mob/inhands/weapons/axes_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/axes_righthand.dmi b/icons/mob/inhands/weapons/axes_righthand.dmi
index 1f5273d20d30..79a3b19b7798 100644
Binary files a/icons/mob/inhands/weapons/axes_righthand.dmi and b/icons/mob/inhands/weapons/axes_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/bombs_lefthand.dmi b/icons/mob/inhands/weapons/bombs_lefthand.dmi
index 4772c01a2284..c434190de82b 100644
Binary files a/icons/mob/inhands/weapons/bombs_lefthand.dmi and b/icons/mob/inhands/weapons/bombs_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/bombs_righthand.dmi b/icons/mob/inhands/weapons/bombs_righthand.dmi
index 9046e788d297..f4cc72aeff79 100644
Binary files a/icons/mob/inhands/weapons/bombs_righthand.dmi and b/icons/mob/inhands/weapons/bombs_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/chainsaw_lefthand.dmi b/icons/mob/inhands/weapons/chainsaw_lefthand.dmi
index 5235f1510102..658f772c9c75 100644
Binary files a/icons/mob/inhands/weapons/chainsaw_lefthand.dmi and b/icons/mob/inhands/weapons/chainsaw_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/chainsaw_righthand.dmi b/icons/mob/inhands/weapons/chainsaw_righthand.dmi
index 0800a5273156..21035a077de9 100644
Binary files a/icons/mob/inhands/weapons/chainsaw_righthand.dmi and b/icons/mob/inhands/weapons/chainsaw_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi
index ff71ba99e3c0..fd76394a835a 100644
Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/polearms_lefthand.dmi b/icons/mob/inhands/weapons/polearms_lefthand.dmi
index afe36277e9f5..f7a1aa75a665 100644
Binary files a/icons/mob/inhands/weapons/polearms_lefthand.dmi and b/icons/mob/inhands/weapons/polearms_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/polearms_righthand.dmi b/icons/mob/inhands/weapons/polearms_righthand.dmi
index b72556f0b135..1fae6b8eb45d 100644
Binary files a/icons/mob/inhands/weapons/polearms_righthand.dmi and b/icons/mob/inhands/weapons/polearms_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/staves_lefthand.dmi b/icons/mob/inhands/weapons/staves_lefthand.dmi
index da61d8df47ea..151e9645b371 100644
Binary files a/icons/mob/inhands/weapons/staves_lefthand.dmi and b/icons/mob/inhands/weapons/staves_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/staves_righthand.dmi b/icons/mob/inhands/weapons/staves_righthand.dmi
index 3cb569627eaa..8df69b74cc36 100644
Binary files a/icons/mob/inhands/weapons/staves_righthand.dmi and b/icons/mob/inhands/weapons/staves_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi
index 49732e254e41..fc5ed5ee90b2 100644
Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi
index 9797eb3ee366..6e04504c3fb7 100644
Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ
diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi
index ec6900432306..28ace37f4170 100644
Binary files a/icons/mob/pets.dmi and b/icons/mob/pets.dmi differ
diff --git a/icons/mob/simple_frontiersman.dmi b/icons/mob/simple_frontiersman.dmi
index c5b9962fd236..76532a9b45e9 100644
Binary files a/icons/mob/simple_frontiersman.dmi and b/icons/mob/simple_frontiersman.dmi differ
diff --git a/icons/mob/simple_human.dmi b/icons/mob/simple_human.dmi
index 133544acc999..080343345783 100644
Binary files a/icons/mob/simple_human.dmi and b/icons/mob/simple_human.dmi differ
diff --git a/icons/mob/species/kepori/kepori_overlays.dmi b/icons/mob/species/kepori/kepori_overlays.dmi
new file mode 100644
index 000000000000..29406cb32aeb
Binary files /dev/null and b/icons/mob/species/kepori/kepori_overlays.dmi differ
diff --git a/icons/mob/species/kepori/onmob_mask_kepori.dmi b/icons/mob/species/kepori/onmob_mask_kepori.dmi
index d455cf0bd3e5..51391bd773c2 100644
Binary files a/icons/mob/species/kepori/onmob_mask_kepori.dmi and b/icons/mob/species/kepori/onmob_mask_kepori.dmi differ
diff --git a/icons/mob/species/kepori/onmob_suit_kepori.dmi b/icons/mob/species/kepori/onmob_suit_kepori.dmi
index ae5750dd0558..18b8c9bceaa3 100644
Binary files a/icons/mob/species/kepori/onmob_suit_kepori.dmi and b/icons/mob/species/kepori/onmob_suit_kepori.dmi differ
diff --git a/icons/mob/species/kepori/onmob_uniform_kepori.dmi b/icons/mob/species/kepori/onmob_uniform_kepori.dmi
index f6d35ec4c795..e2450f7a749d 100644
Binary files a/icons/mob/species/kepori/onmob_uniform_kepori.dmi and b/icons/mob/species/kepori/onmob_uniform_kepori.dmi differ
diff --git a/icons/mob/species/misc/digitigrade.dmi b/icons/mob/species/misc/digitigrade.dmi
index 8736b8057f14..9c93fb623596 100644
Binary files a/icons/mob/species/misc/digitigrade.dmi and b/icons/mob/species/misc/digitigrade.dmi differ
diff --git a/icons/mob/species/misc/digitigrade_shoes.dmi b/icons/mob/species/misc/digitigrade_shoes.dmi
index 9d08980b1e58..fb3dd6693471 100644
Binary files a/icons/mob/species/misc/digitigrade_shoes.dmi and b/icons/mob/species/misc/digitigrade_shoes.dmi differ
diff --git a/icons/mob/species/vox/bodyparts.dmi b/icons/mob/species/vox/bodyparts.dmi
index fb098fa01d80..20e39116a8e0 100644
Binary files a/icons/mob/species/vox/bodyparts.dmi and b/icons/mob/species/vox/bodyparts.dmi differ
diff --git a/icons/mob/species/vox/onmob_hands_vox.dmi b/icons/mob/species/vox/onmob_hands_vox.dmi
index 977e9a71a7c5..40e5d9896da1 100644
Binary files a/icons/mob/species/vox/onmob_hands_vox.dmi and b/icons/mob/species/vox/onmob_hands_vox.dmi differ
diff --git a/icons/mob/species/vox/onmob_head_vox.dmi b/icons/mob/species/vox/onmob_head_vox.dmi
index 6b150380891f..027b3bd4d011 100644
Binary files a/icons/mob/species/vox/onmob_head_vox.dmi and b/icons/mob/species/vox/onmob_head_vox.dmi differ
diff --git a/icons/mob/species/vox/onmob_mask_vox.dmi b/icons/mob/species/vox/onmob_mask_vox.dmi
index 7aa3dfb2e046..e005fabe5e27 100644
Binary files a/icons/mob/species/vox/onmob_mask_vox.dmi and b/icons/mob/species/vox/onmob_mask_vox.dmi differ
diff --git a/icons/mob/species/vox/onmob_suit_vox.dmi b/icons/mob/species/vox/onmob_suit_vox.dmi
index 47e2b625c116..d43891315e7a 100644
Binary files a/icons/mob/species/vox/onmob_suit_vox.dmi and b/icons/mob/species/vox/onmob_suit_vox.dmi differ
diff --git a/icons/mob/species/vox/onmob_uniform_vox.dmi b/icons/mob/species/vox/onmob_uniform_vox.dmi
index 04c77c742128..9bafaedb2006 100644
Binary files a/icons/mob/species/vox/onmob_uniform_vox.dmi and b/icons/mob/species/vox/onmob_uniform_vox.dmi differ
diff --git a/icons/mob/species/vox/vox_overlays.dmi b/icons/mob/species/vox/vox_overlays.dmi
new file mode 100644
index 000000000000..f0fc59ec59dc
Binary files /dev/null and b/icons/mob/species/vox/vox_overlays.dmi differ
diff --git a/icons/mob/vox_parts.dmi b/icons/mob/species/vox/vox_parts.dmi
similarity index 100%
rename from icons/mob/vox_parts.dmi
rename to icons/mob/species/vox/vox_parts.dmi
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index ec5f14748540..633a49eda54c 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/ammo_bullets.dmi b/icons/obj/ammo_bullets.dmi
deleted file mode 100644
index 087cdd4c771e..000000000000
Binary files a/icons/obj/ammo_bullets.dmi and /dev/null differ
diff --git a/icons/obj/ammo_shotshells.dmi b/icons/obj/ammo_shotshells.dmi
deleted file mode 100644
index 55b00cdd0b21..000000000000
Binary files a/icons/obj/ammo_shotshells.dmi and /dev/null differ
diff --git a/icons/obj/ammunition/ammo.dmi b/icons/obj/ammunition/ammo.dmi
new file mode 100644
index 000000000000..26b7fd826793
Binary files /dev/null and b/icons/obj/ammunition/ammo.dmi differ
diff --git a/icons/obj/ammunition/ammo_boxes.dmi b/icons/obj/ammunition/ammo_boxes.dmi
new file mode 100644
index 000000000000..ac963d46212b
Binary files /dev/null and b/icons/obj/ammunition/ammo_boxes.dmi differ
diff --git a/icons/obj/ammunition/ammo_bullets.dmi b/icons/obj/ammunition/ammo_bullets.dmi
new file mode 100644
index 000000000000..6ac65ff5bb66
Binary files /dev/null and b/icons/obj/ammunition/ammo_bullets.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 17bab47dc9ef..486b7be4e6f3 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/chemical/chem_jug.dmi b/icons/obj/chemical/chem_jug.dmi
index d872ba00ff1d..e5ab15a43e14 100644
Binary files a/icons/obj/chemical/chem_jug.dmi and b/icons/obj/chemical/chem_jug.dmi differ
diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi
index ecf54fb9f61a..fd66991eb776 100644
Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index d1857dbe878d..931f502def1d 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/clothing/faction/nanotrasen/mask.dmi b/icons/obj/clothing/faction/nanotrasen/mask.dmi
new file mode 100644
index 000000000000..8c175975bdf7
Binary files /dev/null and b/icons/obj/clothing/faction/nanotrasen/mask.dmi differ
diff --git a/icons/obj/clothing/faction/ngr/mask.dmi b/icons/obj/clothing/faction/ngr/mask.dmi
index c867f6f569d7..a276f37437bc 100644
Binary files a/icons/obj/clothing/faction/ngr/mask.dmi and b/icons/obj/clothing/faction/ngr/mask.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index ba27bd4c8166..25e6005778c2 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 52d9036e0211..f4a978b1c733 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 9685db38db1e..895cad1c91a8 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi
index 3109928ff7ae..0c4ba91632f7 100644
Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index e3ceffdb3329..63ec75a06a0b 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/under/SolGov.dmi b/icons/obj/clothing/under/SolGov.dmi
index 258c492e5305..ef03505ae1c3 100644
Binary files a/icons/obj/clothing/under/SolGov.dmi and b/icons/obj/clothing/under/SolGov.dmi differ
diff --git a/icons/obj/clothing/under/cargo.dmi b/icons/obj/clothing/under/cargo.dmi
index 471b45513297..820757a47ad3 100644
Binary files a/icons/obj/clothing/under/cargo.dmi and b/icons/obj/clothing/under/cargo.dmi differ
diff --git a/icons/obj/clothing/under/centcom.dmi b/icons/obj/clothing/under/centcom.dmi
index 3fd5a370973e..4522141772a8 100644
Binary files a/icons/obj/clothing/under/centcom.dmi and b/icons/obj/clothing/under/centcom.dmi differ
diff --git a/icons/obj/clothing/under/color.dmi b/icons/obj/clothing/under/color.dmi
index 7a616f4c3362..d9c37e30212c 100644
Binary files a/icons/obj/clothing/under/color.dmi and b/icons/obj/clothing/under/color.dmi differ
diff --git a/icons/obj/clothing/under/command.dmi b/icons/obj/clothing/under/command.dmi
index 17b8285232fc..ca0c7735979e 100644
Binary files a/icons/obj/clothing/under/command.dmi and b/icons/obj/clothing/under/command.dmi differ
diff --git a/icons/obj/clothing/under/dress.dmi b/icons/obj/clothing/under/dress.dmi
index 7cb59b080c3f..491ae9d6988f 100644
Binary files a/icons/obj/clothing/under/dress.dmi and b/icons/obj/clothing/under/dress.dmi differ
diff --git a/icons/obj/clothing/under/engineering.dmi b/icons/obj/clothing/under/engineering.dmi
index a05a369e94e7..34581d3dfcc9 100644
Binary files a/icons/obj/clothing/under/engineering.dmi and b/icons/obj/clothing/under/engineering.dmi differ
diff --git a/icons/obj/clothing/under/misc.dmi b/icons/obj/clothing/under/misc.dmi
index 8d68510d3780..66d52fb35499 100644
Binary files a/icons/obj/clothing/under/misc.dmi and b/icons/obj/clothing/under/misc.dmi differ
diff --git a/icons/obj/clothing/under/rnd.dmi b/icons/obj/clothing/under/rnd.dmi
index 8093b0a19504..e6c138a8b00b 100644
Binary files a/icons/obj/clothing/under/rnd.dmi and b/icons/obj/clothing/under/rnd.dmi differ
diff --git a/icons/obj/clothing/under/security.dmi b/icons/obj/clothing/under/security.dmi
index 67e8868958f4..449964637b3a 100644
Binary files a/icons/obj/clothing/under/security.dmi and b/icons/obj/clothing/under/security.dmi differ
diff --git a/icons/obj/clothing/under/service.dmi b/icons/obj/clothing/under/service.dmi
index b6aad157b3cc..a6a0ea8b49ba 100644
Binary files a/icons/obj/clothing/under/service.dmi and b/icons/obj/clothing/under/service.dmi differ
diff --git a/icons/obj/clothing/under/shorts_pants.dmi b/icons/obj/clothing/under/shorts_pants.dmi
index 948fc01d4c83..1d319b25f693 100644
Binary files a/icons/obj/clothing/under/shorts_pants.dmi and b/icons/obj/clothing/under/shorts_pants.dmi differ
diff --git a/icons/obj/clothing/under/suits.dmi b/icons/obj/clothing/under/suits.dmi
index 453cb656de89..bda067487f9e 100644
Binary files a/icons/obj/clothing/under/suits.dmi and b/icons/obj/clothing/under/suits.dmi differ
diff --git a/icons/obj/clothing/under/syndicate.dmi b/icons/obj/clothing/under/syndicate.dmi
index 1a2fcad74b84..4c3f0b5fc26a 100644
Binary files a/icons/obj/clothing/under/syndicate.dmi and b/icons/obj/clothing/under/syndicate.dmi differ
diff --git a/icons/obj/deskflags.dmi b/icons/obj/deskflags.dmi
index 6a950bcebc4e..10f24d037fd7 100644
Binary files a/icons/obj/deskflags.dmi and b/icons/obj/deskflags.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index d7a44b667a0c..468069b7c228 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/drinks/drinks.dmi b/icons/obj/drinks/drinks.dmi
index 2ab3cd0db5ef..67447e75ee3d 100644
Binary files a/icons/obj/drinks/drinks.dmi and b/icons/obj/drinks/drinks.dmi differ
diff --git a/icons/obj/food/donuts.dmi b/icons/obj/food/donuts.dmi
index 07c8d7ed162c..31b4d3188f39 100644
Binary files a/icons/obj/food/donuts.dmi and b/icons/obj/food/donuts.dmi differ
diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi
index 2998913f59b2..0bc1904bc6d4 100644
Binary files a/icons/obj/grenade.dmi and b/icons/obj/grenade.dmi differ
diff --git a/icons/obj/guns/attachments.dmi b/icons/obj/guns/attachments.dmi
index c06a2c7e109c..83232d3427e7 100644
Binary files a/icons/obj/guns/attachments.dmi and b/icons/obj/guns/attachments.dmi differ
diff --git a/icons/obj/guns/cell_latch.dmi b/icons/obj/guns/cell_latch.dmi
new file mode 100644
index 000000000000..6372df688776
Binary files /dev/null and b/icons/obj/guns/cell_latch.dmi differ
diff --git a/icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi b/icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi
index e0567289abf6..5d24f6a88770 100644
Binary files a/icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi and b/icons/obj/guns/manufacturer/clip_lanchester/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/hunterspride/48x32.dmi b/icons/obj/guns/manufacturer/hunterspride/48x32.dmi
index 70bbef00e1af..6c3851f0ca7f 100644
Binary files a/icons/obj/guns/manufacturer/hunterspride/48x32.dmi and b/icons/obj/guns/manufacturer/hunterspride/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/hunterspride/lefthand.dmi b/icons/obj/guns/manufacturer/hunterspride/lefthand.dmi
index 6471cef8b5eb..febc543be1b5 100644
Binary files a/icons/obj/guns/manufacturer/hunterspride/lefthand.dmi and b/icons/obj/guns/manufacturer/hunterspride/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/hunterspride/onmob.dmi b/icons/obj/guns/manufacturer/hunterspride/onmob.dmi
index 361899e3c523..539b811aacd6 100644
Binary files a/icons/obj/guns/manufacturer/hunterspride/onmob.dmi and b/icons/obj/guns/manufacturer/hunterspride/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/hunterspride/righthand.dmi b/icons/obj/guns/manufacturer/hunterspride/righthand.dmi
index fbf4f7cf3fbf..ec9a8a53ba7f 100644
Binary files a/icons/obj/guns/manufacturer/hunterspride/righthand.dmi and b/icons/obj/guns/manufacturer/hunterspride/righthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/inteq/48x32.dmi b/icons/obj/guns/manufacturer/inteq/48x32.dmi
index 021ff448ecb5..74adceab3ba1 100644
Binary files a/icons/obj/guns/manufacturer/inteq/48x32.dmi and b/icons/obj/guns/manufacturer/inteq/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/inteq/lefthand.dmi b/icons/obj/guns/manufacturer/inteq/lefthand.dmi
index 84707c2e5cdc..7ed89aacf95e 100644
Binary files a/icons/obj/guns/manufacturer/inteq/lefthand.dmi and b/icons/obj/guns/manufacturer/inteq/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/inteq/righthand.dmi b/icons/obj/guns/manufacturer/inteq/righthand.dmi
index 481731992655..d7668fe0437b 100644
Binary files a/icons/obj/guns/manufacturer/inteq/righthand.dmi and b/icons/obj/guns/manufacturer/inteq/righthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi b/icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi
index bac0ccc8f210..66d714e245ee 100644
Binary files a/icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi and b/icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi b/icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi
index 24ac86c3e0b5..f91c263424ef 100644
Binary files a/icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi and b/icons/obj/guns/manufacturer/nanotrasen_sharplite/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi b/icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi
index b6831ec9696a..ef01a242944d 100644
Binary files a/icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi and b/icons/obj/guns/manufacturer/nanotrasen_sharplite/righthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi b/icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi
new file mode 100644
index 000000000000..7425d2544575
Binary files /dev/null and b/icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi differ
diff --git a/icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi b/icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi
new file mode 100644
index 000000000000..1442d4c75a62
Binary files /dev/null and b/icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi differ
diff --git a/icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi b/icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi
new file mode 100644
index 000000000000..9b0c1e524f76
Binary files /dev/null and b/icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi differ
diff --git a/icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi b/icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi
new file mode 100644
index 000000000000..58fd6ab48f2a
Binary files /dev/null and b/icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi differ
diff --git a/icons/obj/hazard.dmi b/icons/obj/hazard.dmi
index 5c350c5afb9b..f9df336f607d 100644
Binary files a/icons/obj/hazard.dmi and b/icons/obj/hazard.dmi differ
diff --git a/icons/obj/landmine.dmi b/icons/obj/landmine.dmi
index dd19fd9d3991..40b3e3e4ba12 100644
Binary files a/icons/obj/landmine.dmi and b/icons/obj/landmine.dmi differ
diff --git a/icons/obj/lavaland/artefacts.dmi b/icons/obj/lavaland/artefacts.dmi
index 6793b0c10cb8..4239f83aa0e9 100644
Binary files a/icons/obj/lavaland/artefacts.dmi and b/icons/obj/lavaland/artefacts.dmi differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index ae86489bb340..45e0a73c898a 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/module.dmi b/icons/obj/module.dmi
index 49c818b217d0..e7f379175a5e 100644
Binary files a/icons/obj/module.dmi and b/icons/obj/module.dmi differ
diff --git a/icons/obj/nutanks.dmi b/icons/obj/nutanks.dmi
index 94e4c7288512..b8a584ef4609 100644
Binary files a/icons/obj/nutanks.dmi and b/icons/obj/nutanks.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 8479c100f1b0..628c19d63e43 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/platform.dmi b/icons/obj/platform.dmi
new file mode 100644
index 000000000000..a1923bdace27
Binary files /dev/null and b/icons/obj/platform.dmi differ
diff --git a/icons/obj/railing.dmi b/icons/obj/railing.dmi
index 9243199cd865..09b8f0fbd62d 100644
Binary files a/icons/obj/railing.dmi and b/icons/obj/railing.dmi differ
diff --git a/icons/obj/shards.dmi b/icons/obj/shards.dmi
index bdf8bc6e8839..1632e2a08368 100644
Binary files a/icons/obj/shards.dmi and b/icons/obj/shards.dmi differ
diff --git a/icons/obj/statue.dmi b/icons/obj/statue.dmi
index cfb783ef1b10..7e9be0eed189 100644
Binary files a/icons/obj/statue.dmi and b/icons/obj/statue.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 5353677357cf..d9c488a1fe85 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/structures/handrail.dmi b/icons/obj/structures/handrail.dmi
index 1a8d98d6697d..4326fccaf9e7 100644
Binary files a/icons/obj/structures/handrail.dmi and b/icons/obj/structures/handrail.dmi differ
diff --git a/icons/obj/structures/signs/wallflags.dmi b/icons/obj/structures/signs/wallflags.dmi
index 837e442f27ca..94dfc2144e66 100644
Binary files a/icons/obj/structures/signs/wallflags.dmi and b/icons/obj/structures/signs/wallflags.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 816d3671a8d9..e213c294d669 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi
index d331d2852361..ab07fb775a04 100644
Binary files a/icons/obj/syringe.dmi and b/icons/obj/syringe.dmi differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index 731cd15fcfb8..b265239b2c7f 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 6905749d1e52..a2a6e29e2c46 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/obj/wallmounts.dmi b/icons/obj/wallmounts.dmi
index 96e0c28e715c..236d94fbfb52 100644
Binary files a/icons/obj/wallmounts.dmi and b/icons/obj/wallmounts.dmi differ
diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi
index a9f32f001798..f18adf30b10d 100644
Binary files a/icons/obj/watercloset.dmi and b/icons/obj/watercloset.dmi differ
diff --git a/icons/obj/weapon/axe.dmi b/icons/obj/weapon/axe.dmi
index 0ff8a4364833..ff735abf5ebe 100644
Binary files a/icons/obj/weapon/axe.dmi and b/icons/obj/weapon/axe.dmi differ
diff --git a/icons/obj/weapon/baton.dmi b/icons/obj/weapon/baton.dmi
index c39a8b4e073b..4c63ef28b8aa 100644
Binary files a/icons/obj/weapon/baton.dmi and b/icons/obj/weapon/baton.dmi differ
diff --git a/icons/obj/weapon/blunt.dmi b/icons/obj/weapon/blunt.dmi
index 480515bbd794..013f4fd1db2b 100644
Binary files a/icons/obj/weapon/blunt.dmi and b/icons/obj/weapon/blunt.dmi differ
diff --git a/icons/obj/weapon/energy.dmi b/icons/obj/weapon/energy.dmi
index 5100d715923a..79742da9d23c 100644
Binary files a/icons/obj/weapon/energy.dmi and b/icons/obj/weapon/energy.dmi differ
diff --git a/icons/obj/weapon/knife.dmi b/icons/obj/weapon/knife.dmi
deleted file mode 100644
index 2e95a9154512..000000000000
Binary files a/icons/obj/weapon/knife.dmi and /dev/null differ
diff --git a/icons/obj/weapon/knives/knife.dmi b/icons/obj/weapon/knives/knife.dmi
new file mode 100644
index 000000000000..f8a7929c54bf
Binary files /dev/null and b/icons/obj/weapon/knives/knife.dmi differ
diff --git a/icons/obj/weapon/knives/knife_world.dmi b/icons/obj/weapon/knives/knife_world.dmi
new file mode 100644
index 000000000000..e2049e6ab413
Binary files /dev/null and b/icons/obj/weapon/knives/knife_world.dmi differ
diff --git a/icons/obj/weapon/spear.dmi b/icons/obj/weapon/spear.dmi
index 98b3761430ed..384f1c751bcf 100644
Binary files a/icons/obj/weapon/spear.dmi and b/icons/obj/weapon/spear.dmi differ
diff --git a/icons/obj/weapon/sword.dmi b/icons/obj/weapon/sword.dmi
index dc8fd8fd5d7d..915be217a2af 100644
Binary files a/icons/obj/weapon/sword.dmi and b/icons/obj/weapon/sword.dmi differ
diff --git a/icons/obj/world/landmine.dmi b/icons/obj/world/landmine.dmi
new file mode 100644
index 000000000000..be8db65a3f5f
Binary files /dev/null and b/icons/obj/world/landmine.dmi differ
diff --git a/icons/obj/world/melee.dmi b/icons/obj/world/melee.dmi
deleted file mode 100644
index ff8e2114e827..000000000000
Binary files a/icons/obj/world/melee.dmi and /dev/null differ
diff --git a/icons/stamp_icons/large_stamp-artificer.png b/icons/stamp_icons/large_stamp-artificer.png
deleted file mode 100644
index 058a4407428c..000000000000
Binary files a/icons/stamp_icons/large_stamp-artificer.png and /dev/null differ
diff --git a/icons/stamp_icons/large_stamp-biodynamics.png b/icons/stamp_icons/large_stamp-biodynamics.png
new file mode 100644
index 000000000000..0d09b4f37c00
Binary files /dev/null and b/icons/stamp_icons/large_stamp-biodynamics.png differ
diff --git a/icons/stamp_icons/large_stamp-centcom.png b/icons/stamp_icons/large_stamp-centcom.png
deleted file mode 100644
index 6250cbff885a..000000000000
Binary files a/icons/stamp_icons/large_stamp-centcom.png and /dev/null differ
diff --git a/icons/stamp_icons/large_stamp-inteq_artificer.png b/icons/stamp_icons/large_stamp-inteq_artificer.png
new file mode 100644
index 000000000000..fc75d381200e
Binary files /dev/null and b/icons/stamp_icons/large_stamp-inteq_artificer.png differ
diff --git a/icons/stamp_icons/large_stamp-inteq_corpsman.png b/icons/stamp_icons/large_stamp-inteq_corpsman.png
new file mode 100644
index 000000000000..22b4f97c7e4c
Binary files /dev/null and b/icons/stamp_icons/large_stamp-inteq_corpsman.png differ
diff --git a/icons/stamp_icons/large_stamp-maa.png b/icons/stamp_icons/large_stamp-inteq_maa.png
similarity index 100%
rename from icons/stamp_icons/large_stamp-maa.png
rename to icons/stamp_icons/large_stamp-inteq_maa.png
diff --git a/icons/stamp_icons/large_stamp-vanguard.png b/icons/stamp_icons/large_stamp-inteq_vanguard.png
similarity index 100%
rename from icons/stamp_icons/large_stamp-vanguard.png
rename to icons/stamp_icons/large_stamp-inteq_vanguard.png
diff --git a/icons/stamp_icons/large_stamp-ngr.png b/icons/stamp_icons/large_stamp-ngr.png
new file mode 100644
index 000000000000..dfc75056911e
Binary files /dev/null and b/icons/stamp_icons/large_stamp-ngr.png differ
diff --git a/icons/stamp_icons/large_stamp-ngr_captain.png b/icons/stamp_icons/large_stamp-ngr_captain.png
new file mode 100644
index 000000000000..46ca33b76853
Binary files /dev/null and b/icons/stamp_icons/large_stamp-ngr_captain.png differ
diff --git a/icons/stamp_icons/large_stamp-ngr_ensign.png b/icons/stamp_icons/large_stamp-ngr_ensign.png
new file mode 100644
index 000000000000..9e7bc9056789
Binary files /dev/null and b/icons/stamp_icons/large_stamp-ngr_ensign.png differ
diff --git a/icons/stamp_icons/large_stamp-ngr_foreman.png b/icons/stamp_icons/large_stamp-ngr_foreman.png
new file mode 100644
index 000000000000..09b34ab632e1
Binary files /dev/null and b/icons/stamp_icons/large_stamp-ngr_foreman.png differ
diff --git a/icons/stamp_icons/large_stamp-ngr_lieutenant.png b/icons/stamp_icons/large_stamp-ngr_lieutenant.png
new file mode 100644
index 000000000000..f96be7a5ee56
Binary files /dev/null and b/icons/stamp_icons/large_stamp-ngr_lieutenant.png differ
diff --git a/icons/stamp_icons/large_stamp-ns_captain.png b/icons/stamp_icons/large_stamp-ns_captain.png
new file mode 100644
index 000000000000..8a453eece6df
Binary files /dev/null and b/icons/stamp_icons/large_stamp-ns_captain.png differ
diff --git a/icons/stamp_icons/large_stamp-ns_generic.png b/icons/stamp_icons/large_stamp-ns_generic.png
new file mode 100644
index 000000000000..e5f6c0865544
Binary files /dev/null and b/icons/stamp_icons/large_stamp-ns_generic.png differ
diff --git a/icons/stamp_icons/large_stamp-ns_sup_dir.png b/icons/stamp_icons/large_stamp-ns_sup_dir.png
new file mode 100644
index 000000000000..88d898b862c2
Binary files /dev/null and b/icons/stamp_icons/large_stamp-ns_sup_dir.png differ
diff --git a/icons/stamp_icons/large_stamp-nt_captain.png b/icons/stamp_icons/large_stamp-nt_captain.png
new file mode 100644
index 000000000000..e5cca91631bb
Binary files /dev/null and b/icons/stamp_icons/large_stamp-nt_captain.png differ
diff --git a/icons/stamp_icons/large_stamp-nt_central.png b/icons/stamp_icons/large_stamp-nt_central.png
new file mode 100644
index 000000000000..fd045bfc030c
Binary files /dev/null and b/icons/stamp_icons/large_stamp-nt_central.png differ
diff --git a/icons/stamp_icons/large_stamp-nt_eng_dir.png b/icons/stamp_icons/large_stamp-nt_eng_dir.png
new file mode 100644
index 000000000000..53215352eb57
Binary files /dev/null and b/icons/stamp_icons/large_stamp-nt_eng_dir.png differ
diff --git a/icons/stamp_icons/large_stamp-nt_generic.png b/icons/stamp_icons/large_stamp-nt_generic.png
new file mode 100644
index 000000000000..7d1a66fb901d
Binary files /dev/null and b/icons/stamp_icons/large_stamp-nt_generic.png differ
diff --git a/icons/stamp_icons/large_stamp-nt_med_dir.png b/icons/stamp_icons/large_stamp-nt_med_dir.png
new file mode 100644
index 000000000000..11ec17c927d3
Binary files /dev/null and b/icons/stamp_icons/large_stamp-nt_med_dir.png differ
diff --git a/icons/stamp_icons/large_stamp-nt_officer.png b/icons/stamp_icons/large_stamp-nt_officer.png
new file mode 100644
index 000000000000..e3442672175c
Binary files /dev/null and b/icons/stamp_icons/large_stamp-nt_officer.png differ
diff --git a/icons/stamp_icons/large_stamp-nt_sci_dir.png b/icons/stamp_icons/large_stamp-nt_sci_dir.png
new file mode 100644
index 000000000000..50b01922ce5f
Binary files /dev/null and b/icons/stamp_icons/large_stamp-nt_sci_dir.png differ
diff --git a/icons/stamp_icons/large_stamp-vi_captain.png b/icons/stamp_icons/large_stamp-vi_captain.png
new file mode 100644
index 000000000000..0b1536102bf4
Binary files /dev/null and b/icons/stamp_icons/large_stamp-vi_captain.png differ
diff --git a/icons/stamp_icons/large_stamp-vi_generic.png b/icons/stamp_icons/large_stamp-vi_generic.png
new file mode 100644
index 000000000000..a9956adbad12
Binary files /dev/null and b/icons/stamp_icons/large_stamp-vi_generic.png differ
diff --git a/icons/stamp_icons/large_stamp-vi_loss_prevention.png b/icons/stamp_icons/large_stamp-vi_loss_prevention.png
new file mode 100644
index 000000000000..4e6ee3bcb311
Binary files /dev/null and b/icons/stamp_icons/large_stamp-vi_loss_prevention.png differ
diff --git a/icons/stamp_icons/large_stamp-vi_sec_dir.png b/icons/stamp_icons/large_stamp-vi_sec_dir.png
new file mode 100644
index 000000000000..2702e4d8017d
Binary files /dev/null and b/icons/stamp_icons/large_stamp-vi_sec_dir.png differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index 68d030ee383d..79ca6ed0ed87 100644
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/icons/turf/decals/decals.dmi b/icons/turf/decals/decals.dmi
index a62024cc8e0e..58ef66b36d20 100644
Binary files a/icons/turf/decals/decals.dmi and b/icons/turf/decals/decals.dmi differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 16cc956b5f73..d324bd882a30 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -43,14 +43,13 @@ em {font-style: normal; font-weight: bold;}
.binarysay a:active, .binarysay a:visited {color: #88ff88;}
.radio {color: #008000;}
.ntradio {color: #4e3399;}
-.comradio {color: #948f02;}
-.pirradio {color: #a30000;}
+.emrgradio {color: #a30000;}
+.pirradio {color: #948f02;}
.clipradio {color: #337296;}
.irmgradio {color: #885231;}
.pgfradio {color: #127a35;}
.syndradio {color: ##612425;}
.centcomradio {color: #686868;}
-.aiprivradio {color: #ff00ff;}
.redteamradio {color: #ff0000;}
.blueteamradio {color: #0000ff;}
diff --git a/mod_celadon/_components/__components.dme b/mod_celadon/_components/__components.dme
index 24ca01e2450f..e1cbabfe4da9 100644
--- a/mod_celadon/_components/__components.dme
+++ b/mod_celadon/_components/__components.dme
@@ -3,15 +3,15 @@
#include "__components.dm"
+// Изменения корня датумов
+#include "code/datum/species.dm"
+
+#include "code/mob/living.dm"
+
// Система оповещений ролей в Discord
#include "code/_components.dm"
// Оутфиты для ролей // Префиксы для кораблей ищи в дефайнах ~mod_celadon/names.dm
#include "code/_outfits.dm"
-// Emotes and Emote Panel
-#include "code/emotes/emotes_living.dm"
-#include "code/emotes/emotes.dm"
-#include "code/emotes/emote_panel.dm"
-
#endif
diff --git a/mod_celadon/_components/code/datum/species.dm b/mod_celadon/_components/code/datum/species.dm
new file mode 100644
index 000000000000..0228687f3296
--- /dev/null
+++ b/mod_celadon/_components/code/datum/species.dm
@@ -0,0 +1,8 @@
+/datum/species
+ var/bodyflags = 0
+
+/datum/species/vox
+ bodyflags = HAS_TAIL | TAIL_WAGGING
+
+/datum/species/lizard
+ bodyflags = HAS_TAIL | TAIL_WAGGING
diff --git a/mod_celadon/_components/code/emotes/emote_panel.dm b/mod_celadon/_components/code/emotes/emote_panel.dm
deleted file mode 100644
index 1b0e95dcb3d2..000000000000
--- a/mod_celadon/_components/code/emotes/emote_panel.dm
+++ /dev/null
@@ -1,408 +0,0 @@
-var/last_emote_time = 0
-var/timer = 20
-
-/proc/emote_with_delay(emote, delay)
- if (world.time - last_emote_time < delay)
- return
- usr.emote(emote)
- last_emote_time = world.time
-
-/mob/living/carbon/human/verb/emote_airguitar()
- set name = "~ Воображаемая гитара"
- set category = "Эмоции"
- emote_with_delay("airguitar", timer)
-
-/mob/living/carbon/human/verb/emote_blink()
- set name = "~ Моргать"
- set category = "Эмоции"
- emote_with_delay("blink", timer)
-
-/mob/living/carbon/human/verb/emote_blink_r()
- set name = "~ Быстро моргать"
- set category = "Эмоции"
- emote_with_delay("blink_r", timer)
-
-/mob/living/carbon/human/verb/emote_blush()
- set name = "~ Краснеть"
- set category = "Эмоции"
- emote_with_delay("blush", timer)
-
-/mob/living/carbon/human/verb/emote_bow()
- set name = "~ Поклон"
- set category = "Эмоции"
- emote_with_delay("bow", timer)
-
-/mob/living/carbon/human/verb/emote_burp()
- set name = "~ Рыгать"
- set category = "Эмоции"
- emote_with_delay("burp", timer)
-
-/mob/living/carbon/human/verb/emote_clap()
- set name = "> Хлопать"
- set category = "Эмоции"
- emote_with_delay("clap", timer)
-
-/mob/living/carbon/human/verb/emote_crack()
- set name = "> Хрустнуть костяшками"
- set category = "Эмоции"
- emote_with_delay("crack", timer)
-
-/mob/living/carbon/human/verb/emote_cross()
- set name = "~ Скрестить руки"
- set category = "Эмоции"
- emote_with_delay("cross", timer)
-
-// /mob/living/carbon/human/verb/emote_mothchitter() // Moth
-// set name = "< Жужать >"
-// set category = "Эмоции"
-// emote_with_delay("mothchitter", timer)
-
-/mob/living/carbon/human/verb/emote_laugh()
- set name = "> Смеяться"
- set category = "Эмоции"
- emote_with_delay("laugh", timer)
-
-/mob/living/carbon/human/verb/collapse()
- set name = "> Споткнуться"
- set category = "Эмоции"
- emote_with_delay("collapse", timer)
-
-/mob/living/carbon/human/verb/cough()
- set name = "> Кашлять"
- set category = "Эмоции"
- emote_with_delay("cough", timer)
-
-/mob/living/carbon/human/verb/dance()
- set name = "~ Танцевать "
- set category = "Эмоции"
- emote_with_delay("dance", timer)
-
-/mob/living/carbon/human/verb/emote_drool()
- set name = "~ Пускать слюни"
- set category = "Эмоции"
- emote_with_delay("drool", timer)
-
-/mob/living/carbon/human/verb/emote_faint()
- set name = "> Потерять сознание"
- set category = "Эмоции"
- emote_with_delay("faint", timer)
-
-// /mob/living/carbon/human/verb/emote_flap() // Moth/Kepori
-// set name = "< Махнуть крыльями >"
-// set category = "Эмоции"
-// emote_with_delay("flap", timer)
-
-/mob/living/carbon/human/verb/emote_flip()
- set name = "> Сделать кувырок"
- set category = "Эмоции"
- emote_with_delay("flip", timer)
-
-// /mob/living/carbon/human/verb/aflap() // Moth/Kepori
-// set name = "< Взмахнуть крыльями > "
-// set category = "Эмоции"
-// emote_with_delay("aflap", timer)
-
-/mob/living/carbon/human/verb/emote_frown()
- set name = "~ Недовольно смотреть"
- set category = "Эмоции"
- emote_with_delay("frown", timer)
-
-/mob/living/carbon/human/verb/emote_gag()
- set name = "> Подавиться"
- set category = "Эмоции"
- emote_with_delay("gag", timer)
-
-/mob/living/carbon/human/verb/emote_gasp()
- set name = "> Задыхаться"
- set category = "Эмоции"
- emote_with_delay("gasp", timer)
-
-/mob/living/carbon/human/verb/emote_warcray()
- set name = "> Боевой клич"
- set category = "Эмоции"
- emote_with_delay("warcray", timer)
-
-/mob/living/carbon/human/verb/emote_giggle()
- set name = "> Хихикать"
- set category = "Эмоции"
- emote_with_delay("giggle", timer)
-
-/mob/living/carbon/human/verb/emote_grin()
- set name = "~ Ухмыльнуться"
- set category = "Эмоции"
- emote_with_delay("grin", timer)
-
-/mob/living/carbon/human/verb/emote_groan()
- set name = "> Стонать"
- set category = "Эмоции"
- emote_with_delay("groan", timer)
-
-/mob/living/carbon/human/verb/emote_growl()
- set name = "~ Рычать"
- set category = "Эмоции"
- emote_with_delay("growl", timer)
-
-/mob/living/carbon/human/verb/emote_grimace()
- set name = "~ Кривляться"
- set category = "Эмоции"
- emote_with_delay("grimace", timer)
-
-/mob/living/carbon/human/verb/emote_jump()
- set name = "~ Прыгать"
- set category = "Эмоции"
- emote_with_delay("jump", timer)
-
-/mob/living/carbon/human/verb/emote_kiss()
- set name = "> Воздушный поцелуй"
- set category = "Эмоции"
- emote_with_delay("kiss", timer)
-
-/mob/living/carbon/human/verb/emote_look()
- set name = "~ Смотреть"
- set category = "Эмоции"
- emote_with_delay("look", timer)
-
-/mob/living/carbon/human/verb/emote_nod()
- set name = "~ Кивнуть"
- set category = "Эмоции"
- emote_with_delay("nod", timer)
-
-/mob/living/carbon/human/verb/emote_msqueak()
- set name = "~ Пискнуть"
- set category = "Эмоции"
- emote_with_delay("msqueak", timer)
-
-/mob/living/carbon/human/verb/emote_peace()
- set name = "< Знак мира >"
- set category = "Эмоции"
- emote_with_delay("peace", timer)
-
-/mob/living/carbon/human/verb/emote_pout()
- set name = "~ Дуться"
- set category = "Эмоции"
- emote_with_delay("pout", timer)
-
-/mob/living/carbon/human/verb/emote_scowl()
- set name = "~ Хмуриться"
- set category = "Эмоции"
- emote_with_delay("scowl", timer)
-
-/mob/living/carbon/human/verb/emote_shake()
- set name = "~ Мотать головой"
- set category = "Эмоции"
- emote_with_delay("shake", timer)
-
-/mob/living/carbon/human/verb/emote_shiver()
- set name = "~ Трепетать"
- set category = "Эмоции"
- emote_with_delay("shiver", timer)
-
-/mob/living/carbon/human/verb/emote_slap()
- set name = "> Шлёпнуть"
- set category = "Эмоции"
- emote_with_delay("slap", timer)
-
-/mob/living/carbon/human/verb/emote_sigh()
- set name = "> Вздыхать"
- set category = "Эмоции"
- emote_with_delay("sigh", timer)
-
-/mob/living/carbon/human/verb/emote_smile()
- set name = "~ Улыбаться "
- set category = "Эмоции"
- emote_with_delay("smile", timer)
-
-/mob/living/carbon/human/verb/emote_sneeze()
- set name = "> Чихнуть"
- set category = "Эмоции"
- emote_with_delay("sneeze", timer)
-
-/mob/living/carbon/human/verb/emote_smug()
- set name = "~ Самодовольство"
- set category = "Эмоции"
- emote_with_delay("smug", timer)
-
-/mob/living/carbon/human/verb/emote_sniff()
- set name = "> Нюхать"
- set category = "Эмоции"
- emote_with_delay("sniff", timer)
-
-/mob/living/carbon/human/verb/emote_snore()
- set name = "> Храпеть"
- set category = "Эмоции"
- emote_with_delay("snore", timer)
-
-/mob/living/carbon/human/verb/emote_spin()
- set name = "> Кружиться"
- set category = "Эмоции"
- emote_with_delay("spin", timer)
-
-/mob/living/carbon/human/verb/emote_stare()
- set name = "~ Пялиться"
- set category = "Эмоции"
- emote_with_delay("stare", timer)
-
-/mob/living/carbon/human/verb/emote_strech()
- set name = "~ Потягиваться"
- set category = "Эмоции"
- emote_with_delay("strech", timer)
-
-/mob/living/carbon/human/verb/emote_sulk()
- set name = "~ Сердиться"
- set category = "Эмоции"
- emote_with_delay("sulk", timer)
-
-/mob/living/carbon/human/verb/emote_surprised()
- set name = "~ Удивиться"
- set category = "Эмоции"
- emote_with_delay("surprised", timer)
-
-/mob/living/carbon/human/verb/emote_surrender()
- set name = "< Сдаться >"
- set category = "Эмоции"
- emote_with_delay("surrender", timer)
-
-/mob/living/carbon/human/verb/emote_tremble()
- set name = "~ Дрожать"
- set category = "Эмоции"
- emote_with_delay("tremble", timer)
-
-/mob/living/carbon/human/verb/emote_twitch()
- set name = "~ Дёргаться"
- set category = "Эмоции"
- emote_with_delay("twitch", timer)
-
-/mob/living/carbon/human/verb/emote_twitch_s()
- set name = "~ Сильно дёргаться"
- set category = "Эмоции"
- emote_with_delay("twitch_s", timer)
-
-/mob/living/carbon/human/verb/emote_wave()
- set name = "~ Махать рукой"
- set category = "Эмоции"
- emote_with_delay("wave", timer)
-
-/mob/living/carbon/human/verb/emote_whimper()
- set name = "~ Хныкать"
- set category = "Эмоции"
- emote_with_delay("whimper", timer)
-
-/mob/living/carbon/human/verb/emote_wsmile()
- set name = "~ Слегка улыбнуться"
- set category = "Эмоции"
- emote_with_delay("wsmile", timer)
-
-/mob/living/carbon/human/verb/emote_yawn()
- set name = "> Зевать"
- set category = "Эмоции"
- emote_with_delay("yawn", timer)
-
-// /mob/living/carbon/human/verb/emote_gurgle() // Slime
-// set name = "< Хлюпать >"
-// set category = "Эмоции"
-// emote_with_delay("gurgle", timer)
-
-// /mob/living/carbon/human/verb/emote_clack() // Spider
-// set name = "< Щёлкнуть челюстью >"
-// set category = "Эмоции"
-// emote_with_delay("clack", timer)
-
-/mob/living/carbon/human/verb/cry()
- set name = "> Плакать"
- set category = "Эмоции"
- emote_with_delay("cry", timer)
-
-/mob/living/carbon/human/verb/emote_eyebrow()
- set name = "~ Приподнять бровь"
- set category = "Эмоции"
- emote_with_delay("eyebrow", timer)
-
-/mob/living/carbon/human/verb/emote_grumble()
- set name = "~ Ворчать"
- set category = "Эмоции"
- emote_with_delay("grumble", timer)
-
-/mob/living/carbon/human/verb/emote_mumble()
- set name = "~ Бормотать"
- set category = "Эмоции"
- emote_with_delay("mumble", timer)
-
-/mob/living/carbon/human/verb/emote_scream()
- set name = "> Кричать"
- set category = "Эмоции"
- emote_with_delay("scream", timer)
-
-/mob/living/carbon/human/verb/emote_purr()
- set name = "~ Мурчать"
- set category = "Эмоции"
- emote_with_delay("purr", timer)
-
-/mob/living/carbon/human/verb/emote_purrl()
- set name = "~ Мурчать дольше"
- set category = "Эмоции"
- emote_with_delay("purrl", timer)
-
-/mob/living/carbon/human/verb/emote_fpurr()
- set name = "~ Урчать"
- set category = "Эмоции"
- emote_with_delay("fox_purr", timer)
-
-/mob/living/carbon/human/verb/emote_bark()
- set name = "~ Гавкнуть"
- set category = "Эмоции"
- emote_with_delay("bark", timer)
-
-/mob/living/carbon/human/verb/emote_wbark()
- set name = "~ Дважды гавкнуть"
- set category = "Эмоции"
- emote_with_delay("wbark", timer)
-
-/mob/living/carbon/human/verb/emote_fhowl()
- set name = "~ Выть"
- set category = "Эмоции"
- emote_with_delay("howl", timer)
-
-/mob/living/carbon/human/verb/emote_hiss()
- set name = "~ Шипеть"
- set category = "Эмоции"
- emote_with_delay("hiss", timer)
-
-/mob/living/carbon/human/verb/emote_pale()
- set name = "~ Бледнеть"
- set category = "Эмоции"
- emote_with_delay("pale", timer)
-
-/mob/living/carbon/human/verb/emote_raise()
- set name = "< Поднять руки >"
- set category = "Эмоции"
- emote_with_delay("raise", timer)
-
-/mob/living/carbon/human/verb/emote_salute()
- set name = "~ Воинское приветствие"
- set category = "Эмоции"
- emote_with_delay("salute", timer)
-
-/mob/living/carbon/human/verb/emote_shame()
- set name = "~ Стыдиться"
- set category = "Эмоции"
- emote_with_delay("shame", timer)
-
-/mob/living/carbon/human/verb/emote_hoot()
- set name = "> Свистеть"
- set category = "Эмоции"
- emote_with_delay("hoot", timer)
-
-/mob/living/carbon/human/verb/emote_shrug()
- set name = "~ Пожать плечами"
- set category = "Эмоции"
- emote_with_delay("shrug", timer)
-
-/mob/living/carbon/human/verb/emote_wag() // Lizard, Tajara
- set name = "< Махать хвостом >"
- set category = "Эмоции"
- emote_with_delay("wag", timer)
-
-/mob/living/carbon/human/verb/emote_wink()
- set name = "~ Подмигнуть"
- set category = "Эмоции"
- emote_with_delay("wink", timer)
diff --git a/mod_celadon/_components/code/emotes/emotes.dm b/mod_celadon/_components/code/emotes/emotes.dm
deleted file mode 100644
index 14b5191497f9..000000000000
--- a/mod_celadon/_components/code/emotes/emotes.dm
+++ /dev/null
@@ -1,66 +0,0 @@
-/datum/emote/living/warcray
- key = "warcray"
- key_third_person = "warcray"
- message = "издаёт вдохновляющий крик!"
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/warcray/can_run_emote(mob/living/user, status_check = TRUE , intentional)
- . = ..()
- if(. && iscarbon(user))
- var/mob/living/carbon/C = user
- return !C.silent
-
-/datum/emote/living/warcray/get_sound(mob/living/user)
- if(!ishuman(user))
- return
- var/mob/living/carbon/human/H = user
- var/human_warcray = ishumanbasic(H)
- var/slime_warcray = isjellyperson(H)
- if((human_warcray||slime_warcray) && (!H.mind || !H.mind.miming))
- if(user.gender == FEMALE)
- return pick(
- 'mod_celadon/_storge_sounds/sound/voice/human_female_warcry_1.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/human_female_warcry_2.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/human_female_warcry_3.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/human_female_warcry_4.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/human_female_warcry_5.ogg')
- else
- return pick(
- 'mod_celadon/_storge_sounds/sound/voice/human_male_warcry_1.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/human_male_warcry_2.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/human_male_warcry_3.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/human_male_warcry_4.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/human_male_warcry_5.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/human_male_warcry_6.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/human_male_warcry_7.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/human_male_warcry_8.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/human_male_warcry_9.ogg')
- if(ismoth(H))
- if(prob(3))
- message = "издаёт вдохновляющий крик!"
- return 'mod_celadon/_storge_sounds/sound/voice/alastor_attack1-attackvoice.ogg'
- else
- message = "издаёт вдохновляющий крик!"
- return pick(
- 'mod_celadon/_storge_sounds/sound/voice/alastor_wing1.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/alastor_wing1_2.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/alastor_wing2.ogg',
- 'mod_celadon/_storge_sounds/sound/voice/alastor_wing2_2.ogg')
-
-/**
- * Perform a custom emote.
- *
- * * m_type: Type of message to send.
- * * message: Content of the message. If none is provided, the user will be prompted to choose the input.
- * * intentional: Whether or not the user intendeded to perform the emote.
- */
-/mob/proc/custom_emote(m_type = EMOTE_VISIBLE, message = null, intentional = FALSE)
- var/input = ""
- if(!message && !client)
- CRASH("An empty custom emote was called from a client-less mob.")
- else if(!message)
- input = sanitize(copytext_char(input(src,"Choose an emote to display.") as text|null, 1, MAX_MESSAGE_LEN))
- else
- input = message
-
- emote("me", m_type, input, intentional)
diff --git a/mod_celadon/_components/code/emotes/emotes_living.dm b/mod_celadon/_components/code/emotes/emotes_living.dm
deleted file mode 100644
index 30053822f5c4..000000000000
--- a/mod_celadon/_components/code/emotes/emotes_living.dm
+++ /dev/null
@@ -1,776 +0,0 @@
-
-/* EMOTE DATUMS */
-/datum/emote/living
- mob_type_allowed_typecache = /mob/living
- mob_type_blacklist_typecache = list(/mob/living/simple_animal/slime, /mob/living/brain)
-
-
-/// The time it takes for the blush visual to be removed
-#define BLUSH_DURATION 5.2 SECONDS
-
-/datum/emote/living/blush
- key = "blush"
- key_third_person = "blushes"
- message = "краснеет."
- emote_type = EMOTE_VISIBLE
- /// Timer for the blush visual to wear off
- var/blush_timer = TIMER_ID_NULL
-
-/datum/emote/living/blush/run_emote(mob/user, params, type_override, intentional)
- . = ..()
- if(. && isliving(user))
- var/mob/living/living_user = user
- ADD_TRAIT(living_user, TRAIT_BLUSHING, "[type]")
- living_user.update_body()
-
- // Use a timer to remove the blush effect after the BLUSH_DURATION has passed
- var/list/key_emotes = GLOB.emote_list["blush"]
- for(var/datum/emote/living/blush/living_emote in key_emotes)
- // The existing timer restarts if it's already running
- blush_timer = addtimer(CALLBACK(living_emote, PROC_REF(end_blush), living_user), BLUSH_DURATION, TIMER_UNIQUE | TIMER_OVERRIDE)
-
-/datum/emote/living/blush/proc/end_blush(mob/living/living_user)
- if(!QDELETED(living_user))
- REMOVE_TRAIT(living_user, TRAIT_BLUSHING, "[type]")
- living_user.update_body()
-
-#undef BLUSH_DURATION
-
-/datum/emote/living/bow
- key = "bow"
- key_third_person = "bows"
- message = "кланяется."
- message_param = "делает поклон в сторону %t."
- emote_type = EMOTE_VISIBLE
- hands_use_check = TRUE
-
-/datum/emote/living/burp
- key = "burp"
- key_third_person = "burps"
- message = "рыгает."
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/choke
- key = "choke"
- key_third_person = "chokes"
- message = "давится!"
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/cross
- key = "cross"
- key_third_person = "crosses"
- message = "скрещивает руки перед собой."
- emote_type = EMOTE_VISIBLE
- hands_use_check = TRUE
-
-/datum/emote/living/carbon/mothchitter
- key = "chitter"
- key_third_person = "chitters"
- message = "жужит."
- emote_type = EMOTE_AUDIBLE
- vary = TRUE
-
-/datum/emote/living/carbon/mothchitter/get_sound(mob/living/user)
- var/mob/living/carbon/human/H = user
- if(ismoth(H) | (istype(H, /mob/living/simple_animal/pet/mothroach)))
- return 'mod_celadon/_storge_sounds/sound/voice/moth/mothchitter.ogg'
-
-/datum/emote/living/chuckle
- key = "chuckle"
- key_third_person = "chuckles"
- message = "смеётся."
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/collapse
- key = "collapse"
- key_third_person = "collapses"
- message = "спотыкается и падает!"
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/collapse/run_emote(mob/user, params, type_override, intentional)
- . = ..()
- if(. && isliving(user))
- var/mob/living/L = user
- L.Unconscious(40)
-
-/datum/emote/living/cough
- key = "cough"
- key_third_person = "coughs"
- message = "кашляет!"
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/cough/can_run_emote(mob/user, status_check = TRUE , intentional)
- . = ..()
- if(HAS_TRAIT(user, TRAIT_SOOTHED_THROAT))
- return FALSE
-
-/datum/emote/living/cough/get_sound(mob/living/user)
- if(ishuman(user))
- if(user.gender == FEMALE)
- return pick('mod_celadon/_storge_sounds/sound/voice/cough_female_1.ogg', 'mod_celadon/_storge_sounds/sound/voice/cough_female_2.ogg')
- return pick('mod_celadon/_storge_sounds/sound/voice/cough_male_1.ogg', 'mod_celadon/_storge_sounds/sound/voice/cough_male_2.ogg', 'mod_celadon/_storge_sounds/sound/voice/cough_male_3.ogg')
- return ..()
-
-/datum/emote/living/carbon/human/cry/get_sound(mob/living/user)
- if(ishuman(user))
- if(user.gender == FEMALE)
- return pick('mod_celadon/_storge_sounds/sound/voice/cry_female_1.ogg', 'mod_celadon/_storge_sounds/sound/voice/cry_female_2.ogg', 'mod_celadon/_storge_sounds/sound/voice/cry_female_3.ogg')
- return pick('mod_celadon/_storge_sounds/sound/voice/cry_male_1.ogg', 'mod_celadon/_storge_sounds/sound/voice/cry_male_1.ogg')
- return ..()
-
-/datum/emote/living/dance
- key = "dance"
- key_third_person = "dances"
- message = "счастливо танцует."
- emote_type = EMOTE_VISIBLE
- hands_use_check = TRUE
-
-/datum/emote/living/deathgasp
- key = "deathgasp"
- key_third_person = "deathgasps"
- message = "seizes up and falls limp, their eyes dead and lifeless..."
- message_robot = "shudders violently for a moment before falling still, its eyes slowly darkening."
- message_AI = "screeches, its screen flickering as its systems slowly halt."
- message_alien = "lets out a waning guttural screech, and collapses onto the floor..."
- message_larva = "lets out a sickly hiss of air and falls limply to the floor..."
- message_monkey = "lets out a faint chimper as it collapses and stops moving..."
- message_ipc = "gives one shrill beep before falling limp, their monitor flashing blue before completely shutting off..."
- message_simple = "stops moving..."
- cooldown = (15 SECONDS)
- stat_allowed = HARD_CRIT
-
-/datum/emote/living/deathgasp/run_emote(mob/user, params, type_override, intentional)
- var/mob/living/simple_animal/S = user
- if(istype(S) && S.deathmessage)
- message_simple = S.deathmessage
- . = ..()
- message_simple = initial(message_simple)
-
- if(. && user.deathsound)
- if(isliving(user))
- var/mob/living/L = user
- if(!L.can_speak_vocal() || L.oxyloss >= 50)
- return //stop the sound if oxyloss too high/cant speak
- playsound(user, user.deathsound, 200, TRUE, TRUE)
-
-/datum/emote/living/drool
- key = "drool"
- key_third_person = "drools"
- message = "пускает слюни."
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/faint
- key = "faint"
- key_third_person = "faints"
- message = "теряет сознание и падает!"
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/faint/run_emote(mob/user, params, type_override, intentional)
- . = ..()
- if(. && isliving(user))
- var/mob/living/L = user
- L.SetSleeping(200)
-
-/datum/emote/living/flap
- key = "flap"
- key_third_person = "flaps"
- message = "взмахивает крыльями."
- emote_type = EMOTE_AUDIBLE
- hands_use_check = TRUE
- var/wing_time = 20
-
-/datum/emote/living/flap/run_emote(mob/user, params, type_override, intentional)
- . = ..()
- if(. && ishuman(user))
- var/mob/living/carbon/human/H = user
- var/open = FALSE
- if(H.dna.features["wings"] != "None")
- if("wingsopen" in H.dna.species.mutant_bodyparts)
- open = TRUE
- H.CloseWings()
- else
- H.OpenWings()
- addtimer(CALLBACK(H, open ? TYPE_PROC_REF(/mob/living/carbon/human, OpenWings) : TYPE_PROC_REF(/mob/living/carbon/human, CloseWings)), wing_time)
-
-/datum/emote/living/flap/aflap
- key = "aflap"
- key_third_person = "aflaps"
- message = "яростно взмахивает крыльями!"
- emote_type = EMOTE_AUDIBLE
- hands_use_check = TRUE
- wing_time = 10
-
-/datum/emote/living/frown
- key = "frown"
- key_third_person = "frowns"
- message = "недовольно смотрит."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/gag
- key = "gag"
- key_third_person = "gags"
- message = "давится."
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/gag/can_run_emote(mob/living/user, status_check = TRUE , intentional)
- . = ..()
- if(. && iscarbon(user))
- var/mob/living/carbon/C = user
- return !C.silent
-
-/datum/emote/living/gag/get_sound(mob/living/user)
- if(!ishuman(user))
- return
- var/mob/living/carbon/human/H = user
- var/human_gag= ishumanbasic(H)
- if(human_gag && (!H.mind || !H.mind.miming))
- if(user.gender == FEMALE)
- return pick('mod_celadon/_storge_sounds/sound/voice/human/gasp_female1.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_female2.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_female3.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_female4.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_female5.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_female6.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_female7.ogg')
- else
- return pick('mod_celadon/_storge_sounds/sound/voice/human/gasp_male1.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_male2.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_male3.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_male4.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_male5.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_male6.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_male7.ogg')
- if(ismoth(H))
- return 'mod_celadon/_storge_sounds/sound/voice/human/gasp_female3.ogg'
-
-
-/datum/emote/living/gasp
- key = "gasp"
- key_third_person = "gasps"
- message = "задыхается!"
- emote_type = EMOTE_AUDIBLE
- stat_allowed = HARD_CRIT
-
-/datum/emote/living/gasp/can_run_emote(mob/living/user, status_check = TRUE , intentional)
- . = ..()
- if(. && iscarbon(user))
- var/mob/living/carbon/C = user
- return !C.silent
-
-/datum/emote/living/gasp/get_sound(mob/living/user)
- if(!ishuman(user))
- return
- var/mob/living/carbon/human/H = user
- var/human_gasp = ishumanbasic(H)
- if(human_gasp && (!H.mind || !H.mind.miming))
- if(user.gender == FEMALE)
- return pick('mod_celadon/_storge_sounds/sound/voice/human/gasp_female1.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_female2.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_female3.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_female4.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_female5.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_female6.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_female7.ogg')
- else
- return pick('mod_celadon/_storge_sounds/sound/voice/human/gasp_male1.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_male2.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_male3.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_male4.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_male5.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_male6.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/gasp_male7.ogg')
- if(ismoth(H))
- return 'mod_celadon/_storge_sounds/sound/voice/human/gasp_female3.ogg'
-
-/datum/emote/living/giggle
- key = "giggle"
- key_third_person = "giggles"
- message = "хихикает."
- message_mime = "тихо хихикает!"
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/giggle/get_sound(mob/living/user)
- if(ishuman(user))
- if(user.gender == FEMALE)
- return pick('mod_celadon/_storge_sounds/sound/voice/giggle_female_1.ogg', 'mod_celadon/_storge_sounds/sound/voice/giggle_female_2.ogg', 'mod_celadon/_storge_sounds/sound/voice/giggle_female_3.ogg')
- return pick('mod_celadon/_storge_sounds/sound/voice/giggle_male_1.ogg', 'mod_celadon/_storge_sounds/sound/voice/giggle_male_2.ogg')
- return ..()
-
-/datum/emote/living/glare
- key = "glare"
- key_third_person = "glares"
- message = "ослепляет своим взглядом."
- message_param = "ослепляет своим взглядом %t."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/grin
- key = "grin"
- key_third_person = "grins"
- message = "ухмыляется."
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/groan
- key = "groan"
- key_third_person = "groans"
- message = "стонет!"
- message_mime = "издаёт тихий стон!"
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/groan/get_sound(mob/living/user)
- if(ishuman(user))
- if(user.gender == FEMALE)
- return pick('mod_celadon/_storge_sounds/sound/voice/moan_female_1.ogg', 'mod_celadon/_storge_sounds/sound/voice/moan_female_2.ogg', 'mod_celadon/_storge_sounds/sound/voice/moan_female_3.ogg')
- return pick('mod_celadon/_storge_sounds/sound/voice/moan_male_1.ogg', 'mod_celadon/_storge_sounds/sound/voice/moan_male_2.ogg', 'mod_celadon/_storge_sounds/sound/voice/moan_male_3.ogg')
- return ..()
-
-/datum/emote/living/growl
- key = "growl"
- key_third_person = "growls"
- message = "рычит!"
- message_mime = "тихо рычит!"
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/grimace
- key = "grimace"
- key_third_person = "grimaces"
- message = "корчит рожу."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/jump
- key = "jump"
- key_third_person = "jumps"
- message = "прыгает!"
- emote_type = EMOTE_AUDIBLE
- hands_use_check = TRUE
-
-/datum/emote/living/kiss
- key = "kiss"
- key_third_person = "kisses"
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/kiss/run_emote(mob/living/user, params, type_override, intentional)
- . = ..()
- if(!.)
- return
- var/kiss_type = /obj/item/kisser
-
- if(HAS_TRAIT(user, TRAIT_KISS_OF_DEATH))
- kiss_type = /obj/item/kisser/death
-
- var/obj/item/kiss_blower = new kiss_type(user)
- if(user.put_in_hands(kiss_blower))
- to_chat(user, span_notice("Вы приготовили свою руку для воздушного поцелуя."))
- else
- qdel(kiss_blower)
- to_chat(user, span_warning("В таком состоянии ты не можешь послать воздушный поцелуй."))
-
-/datum/emote/living/laugh
- key = "laugh"
- key_third_person = "laughs"
- message = "смеётся."
- message_mime = "тихо смеётся!"
- emote_type = EMOTE_AUDIBLE
- vary = TRUE
-
-/datum/emote/living/laugh/can_run_emote(mob/living/user, status_check = TRUE , intentional)
- . = ..()
- if(. && iscarbon(user))
- var/mob/living/carbon/C = user
- return !C.silent
-
-/datum/emote/living/laugh/get_sound(mob/living/user)
- if(!ishuman(user))
- return
- var/mob/living/carbon/human/H = user
- var/human_laugh = ishumanbasic(H)
- if(human_laugh && (!H.mind || !H.mind.miming))
- if(user.gender == FEMALE)
- return 'mod_celadon/_storge_sounds/sound/voice/human/womanlaugh.ogg'
- else
- return pick('mod_celadon/_storge_sounds/sound/voice/human/manlaugh1.ogg', 'mod_celadon/_storge_sounds/sound/voice/human/manlaugh2.ogg')
- if(ismoth(H))
- return 'mod_celadon/_storge_sounds/sound/voice/moth/mothlaugh.ogg'
-
-/datum/emote/living/look
- key = "look"
- key_third_person = "looks"
- message = "смотрит."
- message_param = "смотрит на %t."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/nod
- key = "nod"
- key_third_person = "nods"
- message = "кивает."
- message_param = "кивает в сторону %t."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/carbon/mothsqueak
- key = "msqueak"
- key_third_person = "lets out a tiny squeak"
- message = "издает тихий писк!"
- emote_type = EMOTE_AUDIBLE
- vary = TRUE
-
-/datum/emote/living/carbon/mothsqueak/get_sound(mob/living/user)
- var/mob/living/carbon/human/H = user
- if(ismoth(H) | (istype(H, /mob/living/simple_animal/pet/mothroach)))
- return 'mod_celadon/_storge_sounds/sound/voice/moth/mothsqueak.ogg'
-
-/datum/emote/living/peace
- key = "peace"
- key_third_person = "peaces"
- message = "выставляет два пальца перед собой, символизируя Знак Мира!"
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/point
- key = "point"
- key_third_person = "points"
- message = "показывает."
- message_param = "показывает на %t."
- emote_type = EMOTE_VISIBLE
- hands_use_check = TRUE
-
-/datum/emote/living/point/run_emote(mob/user, params, type_override, intentional)
- message_param = initial(message_param) // reset
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- if(H.usable_hands == 0)
- if(H.usable_legs != 0)
- message_param = "пытается показать на %t с помощью ноги, но теряет баланс и падает на землю!"
- H.Paralyze(20)
- else
- message_param = " [user.p_their()] ударяется головой об землю пытаясь двигаться в сторону %t."
- H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
- ..()
-
-/datum/emote/living/pout
- key = "pout"
- key_third_person = "pouts"
- message = "обижено дуется."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/scream
- key = "scream"
- key_third_person = "screams"
- message = "кричит."
- message_mime = "пытается крикнуть!"
- emote_type = EMOTE_AUDIBLE
- mob_type_blacklist_typecache = list(/mob/living/carbon/human) //Humans get specialized scream.
-
-/datum/emote/living/scream/select_message_type(mob/user, intentional)
- . = ..()
- if(!intentional && isanimal(user))
- return "издает болезненное хныканье."
-
-/datum/emote/living/scowl
- key = "scowl"
- key_third_person = "scowls"
- message = "хмурится."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/shake
- key = "shake"
- key_third_person = "shakes"
- message = "мотает головой."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/shame
- key = "shame"
- key_third_person = "shames"
- message = "испытывает сильный стыд."
-
-/datum/emote/living/shiver
- key = "shiver"
- key_third_person = "shiver"
- message = "трепещет!"
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/sigh
- key = "sigh"
- key_third_person = "sighs"
- message = "вздыхает."
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/sigh/get_sound(mob/living/user)
- if(ishuman(user))
- if(user.gender == FEMALE)
- return pick('mod_celadon/_storge_sounds/sound/voice/sigh_female.ogg')
- return pick('mod_celadon/_storge_sounds/sound/voice/sigh_male.ogg', 'mod_celadon/_storge_sounds/sound/voice/sigh_male.ogg')
- return ..()
-
-/datum/emote/living/sit
- key = "sit"
- key_third_person = "sits"
- message = "присаживается."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/surprised
- key = "surprised"
- key_third_person = "surpriseds"
- message = "удивлённо смотрит."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/smile
- key = "smile"
- key_third_person = "smiles"
- message = "улыбается."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/sneeze
- key = "sneeze"
- key_third_person = "sneezes"
- message = "чихает."
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/sneeze/get_sound(mob/living/user)
- if(ishuman(user))
- if(user.gender == FEMALE)
- return pick('mod_celadon/_storge_sounds/sound/voice/sneeze_female.ogg')
- return pick('mod_celadon/_storge_sounds/sound/voice/sneeze.ogg')
- return ..()
-
-/datum/emote/living/smug
- key = "smug"
- key_third_person = "smugs"
- message = "гордо откидывает голову в сторону, выражая самодовольство."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/sniff
- key = "sniff"
- key_third_person = "sniffs"
- message = "нюхает."
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/sniff/get_sound(mob/living/user)
- if(ishuman(user))
- if(user.gender == FEMALE)
- return pick('mod_celadon/_storge_sounds/sound/voice/sniff_female.ogg')
- return pick('mod_celadon/_storge_sounds/sound/voice/sniff_male.ogg')
- return ..()
-
-#define SNORE_DURATION 5.2 SECONDS
-
-/datum/emote/living/snore
- key = "snore"
- key_third_person = "snores"
- message = "храпит."
- message_mime = "крепко спит."
- emote_type = EMOTE_AUDIBLE
- stat_allowed = UNCONSCIOUS
- /// Timer for the blink to wear off
- var/snore_timer = TIMER_ID_NULL
-
-/datum/emote/living/snore/run_emote(mob/user, params, type_override, intentional)
- . = ..()
- if(. && isliving(user))
- var/mob/living/living_user = user
- ADD_TRAIT(living_user, TRAIT_SNORE, "[type]")
- living_user.update_body()
-
- // Use a timer to remove the closed eyes after the SNORE_DURATION has passed
- var/list/key_emotes = GLOB.emote_list["snore"]
- for(var/datum/emote/living/snore/living_emote in key_emotes)
- // The existing timer restarts if it's already running
- snore_timer = addtimer(CALLBACK(living_emote, PROC_REF(end_snore), living_user), SNORE_DURATION, TIMER_UNIQUE | TIMER_OVERRIDE)
-
-/datum/emote/living/snore/proc/end_snore(mob/living/living_user)
- if(!QDELETED(living_user))
- REMOVE_TRAIT(living_user, TRAIT_SNORE, "[type]")
- living_user.update_body()
-
-/datum/emote/living/snore/get_sound(mob/living/user)
- if(ishuman(user))
- return pick('mod_celadon/_storge_sounds/sound/voice/snore_1.ogg', 'mod_celadon/_storge_sounds/sound/voice/snore_2.ogg', 'mod_celadon/_storge_sounds/sound/voice/snore_3.ogg', 'mod_celadon/_storge_sounds/sound/voice/snore_4.ogg', 'mod_celadon/_storge_sounds/sound/voice/snore_5.ogg', 'mod_celadon/_storge_sounds/sound/voice/snore_6.ogg', 'mod_celadon/_storge_sounds/sound/voice/snore_7.ogg')
- return ..()
-
-#undef SNORE_DURATION
-
-/datum/emote/living/stare
- key = "stare"
- key_third_person = "stares"
- message = "пялится."
- message_param = "пялится на %t."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/strech
- key = "strech"
- key_third_person = "strechs"
- message = "потягивается."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/sulk
- key = "sulk"
- key_third_person = "sulks"
- message = "сильно сердится."
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/surrender
- key = "surrender"
- key_third_person = "surrenders"
- message = "сдаётся! Падает на землю, закидывая руки за свою голову."
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/surrender/run_emote(mob/user, params, type_override, intentional)
- . = ..()
- if(. && isliving(user))
- var/mob/living/L = user
- L.Paralyze(200)
- L.remove_status_effect(STATUS_EFFECT_SURRENDER)
-
-/datum/emote/living/sway
- key = "sway"
- key_third_person = "sways"
- message = "головокружительно кружится."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/tremble
- key = "tremble"
- key_third_person = "trembles"
- message = "дрожит!"
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/twitch
- key = "twitch"
- key_third_person = "twitches"
- message = "дёргается."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/twitch_s
- key = "twitch_s"
- message = "сильно дёргается."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/wave
- key = "wave"
- key_third_person = "waves"
- message = "машет."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/whimper
- key = "whimper"
- key_third_person = "whimpers"
- message = "хнычет."
- message_mime = "делает вид, словно плачет."
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/wsmile
- key = "wsmile"
- key_third_person = "wsmiles"
- message = "слегка улыбается."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/wing
- key = "wing"
- key_third_person = "wings"
- message = "подмигивает."
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/yawn
- key = "yawn"
- key_third_person = "yawns"
- message = "зевает."
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/yawn/get_sound(mob/living/user)
- if(ishuman(user))
- if(user.gender == FEMALE)
- return pick('mod_celadon/_storge_sounds/sound/voice/yawn_female_1.ogg', 'mod_celadon/_storge_sounds/sound/voice/yawn_female_2.ogg', 'mod_celadon/_storge_sounds/sound/voice/yawn_female_3.ogg')
- return pick('mod_celadon/_storge_sounds/sound/voice/yawn_male_1.ogg', 'mod_celadon/_storge_sounds/sound/voice/yawn_male_2.ogg')
- return ..()
-
-/datum/emote/living/gurgle
- key = "gurgle"
- key_third_person = "gurgles"
- message = "издает неприятное хлюпанье."
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/custom
- key = "me"
- key_third_person = "custom"
- message = null
-
-/datum/emote/living/custom/can_run_emote(mob/user, status_check, intentional)
- . = ..() && intentional
-
-/datum/emote/living/custom/proc/check_invalid(mob/user, input)
- var/static/regex/stop_bad_mime = regex(@"says|exclaims|yells|asks")
- if(stop_bad_mime.Find(input, 1, 1))
- to_chat(user, " Invalid emote.")
- return TRUE
- return FALSE
-
-/datum/emote/living/custom/run_emote(mob/user, params, type_override = null, intentional = FALSE)
- if(!can_run_emote(user, TRUE, intentional))
- return FALSE
- if(is_banned_from(user.ckey, "Emote"))
- to_chat(user, " You cannot send custom emotes (banned).")
- return FALSE
- else if(QDELETED(user))
- return FALSE
- else if(user.client && user.client.prefs.muted & MUTE_IC)
- to_chat(user, " You cannot send IC messages (muted).")
- return FALSE
- else if(params == ".")
- var/custom_emote = copytext(sanitize(input("Choose an emote to display.") as text|null), 1, MAX_MESSAGE_LEN)
- if(custom_emote && !check_invalid(user, custom_emote))
- var/type = input("Is this a visible or hearable emote?") as null|anything in list("Visible", "Hearable")
- switch(type)
- if("Visible")
- emote_type = EMOTE_VISIBLE
- if("Hearable")
- emote_type = EMOTE_AUDIBLE
- else
- alert("Unable to use this emote, must be either hearable or visible.")
- return
- message = user.say_emphasis(custom_emote)
- else
- message = params
- if(type_override)
- emote_type = type_override
- . = ..()
- message = null
- emote_type = EMOTE_VISIBLE
-
-/datum/emote/living/custom/replace_pronoun(mob/user, message)
- return message
-
-/datum/emote/living/help
- key = "help"
-
-/datum/emote/living/help/run_emote(mob/user, params, type_override, intentional)
- var/list/keys = list()
- var/list/message = list("Available emotes, you can use them with say \"*emote\": ")
-
- for(var/key in GLOB.emote_list)
- for(var/datum/emote/P in GLOB.emote_list[key])
- if(P.key in keys)
- continue
- if(P.can_run_emote(user, status_check = FALSE , intentional = TRUE))
- keys += P.key
-
- keys = sortList(keys)
-
- for(var/emote in keys)
- if(LAZYLEN(message) > 1)
- message += ", [emote]"
- else
- message += "[emote]"
-
- message += "."
-
- message = jointext(message, "")
-
- to_chat(user, message)
-
-/datum/emote/beep
- key = "beep"
- key_third_person = "beeps"
- message = "beeps."
- message_param = "beeps at %t."
- sound = 'sound/machines/twobeep.ogg'
- mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon)
-
-/datum/emote/inhale
- key = "inhale"
- key_third_person = "inhales"
- message = "делает вдох."
-
-/datum/emote/exhale
- key = "exhale"
- key_third_person = "exhales"
- message = "выдыхает."
-
-/datum/emote/living/clack
- key = "clack"
- key_third_person = "clacks"
- message = "щёлкает челюстью."
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/hoot
- key = "hoot"
- key_third_person = "hoots"
- message = "свистит!"
- message_mime = "издаёт тихий свист!"
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/hoot/get_sound(mob/living/user)
- if(ishuman(user))
- return pick('mod_celadon/_storge_sounds/sound/voice/whistle.ogg')
- return ..()
diff --git a/mod_celadon/_components/code/mob/living.dm b/mod_celadon/_components/code/mob/living.dm
new file mode 100644
index 000000000000..1d83593595f9
--- /dev/null
+++ b/mod_celadon/_components/code/mob/living.dm
@@ -0,0 +1,3 @@
+/mob/living
+ /// This can either be a numerical direction or a soft object reference (UID). It makes the mob always face towards the selected thing.
+ var/forced_look = null
diff --git a/mod_celadon/_storge_icons/icons/ammo/projectiles.dmi b/mod_celadon/_storge_icons/icons/ammo/projectiles.dmi
index 1acd53e8bf11..f66d4f1e1dc7 100644
Binary files a/mod_celadon/_storge_icons/icons/ammo/projectiles.dmi and b/mod_celadon/_storge_icons/icons/ammo/projectiles.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/clothing/obj/shoes.dmi b/mod_celadon/_storge_icons/icons/clothing/obj/shoes.dmi
index a4c9f24afb96..21437dbdb970 100644
Binary files a/mod_celadon/_storge_icons/icons/clothing/obj/shoes.dmi and b/mod_celadon/_storge_icons/icons/clothing/obj/shoes.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/clothing/overlay/feet.dmi b/mod_celadon/_storge_icons/icons/clothing/overlay/feet.dmi
index 5b8b5f177a6e..9b0c160b1403 100644
Binary files a/mod_celadon/_storge_icons/icons/clothing/overlay/feet.dmi and b/mod_celadon/_storge_icons/icons/clothing/overlay/feet.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/guns/guns_lefthand.dmi b/mod_celadon/_storge_icons/icons/guns/guns_lefthand.dmi
index fa42e33deee6..61caf4e1a56b 100644
Binary files a/mod_celadon/_storge_icons/icons/guns/guns_lefthand.dmi and b/mod_celadon/_storge_icons/icons/guns/guns_lefthand.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/guns/guns_righthand.dmi b/mod_celadon/_storge_icons/icons/guns/guns_righthand.dmi
index 93d6b05be2c3..769ca52b3778 100644
Binary files a/mod_celadon/_storge_icons/icons/guns/guns_righthand.dmi and b/mod_celadon/_storge_icons/icons/guns/guns_righthand.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/guns/ntsl_lasers.dmi b/mod_celadon/_storge_icons/icons/guns/ntsl_lasers.dmi
new file mode 100644
index 000000000000..503d7214c404
Binary files /dev/null and b/mod_celadon/_storge_icons/icons/guns/ntsl_lasers.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/items/obj/restraints.dmi b/mod_celadon/_storge_icons/icons/items/obj/restraints.dmi
new file mode 100644
index 000000000000..23404b479f2e
Binary files /dev/null and b/mod_celadon/_storge_icons/icons/items/obj/restraints.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/items/overlay/left_hand/left_pinkcuffs.dmi b/mod_celadon/_storge_icons/icons/items/overlay/left_hand/left_pinkcuffs.dmi
new file mode 100644
index 000000000000..c1b3720e6a7d
Binary files /dev/null and b/mod_celadon/_storge_icons/icons/items/overlay/left_hand/left_pinkcuffs.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/items/overlay/mob.dmi b/mod_celadon/_storge_icons/icons/items/overlay/mob.dmi
new file mode 100644
index 000000000000..64c6e89eab91
Binary files /dev/null and b/mod_celadon/_storge_icons/icons/items/overlay/mob.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/items/overlay/right_hand/right_pinkcuffs.dmi b/mod_celadon/_storge_icons/icons/items/overlay/right_hand/right_pinkcuffs.dmi
new file mode 100644
index 000000000000..087d133ef134
Binary files /dev/null and b/mod_celadon/_storge_icons/icons/items/overlay/right_hand/right_pinkcuffs.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/items/plushes.dmi b/mod_celadon/_storge_icons/icons/items/plushes.dmi
index 95f61a7d7956..f79dac511827 100644
Binary files a/mod_celadon/_storge_icons/icons/items/plushes.dmi and b/mod_celadon/_storge_icons/icons/items/plushes.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/mob/hands/musicbox_hands_left.dmi b/mod_celadon/_storge_icons/icons/mob/hands/musicbox_hands_left.dmi
new file mode 100644
index 000000000000..143216a945ed
Binary files /dev/null and b/mod_celadon/_storge_icons/icons/mob/hands/musicbox_hands_left.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/mob/hands/musicbox_hands_right.dmi b/mod_celadon/_storge_icons/icons/mob/hands/musicbox_hands_right.dmi
new file mode 100644
index 000000000000..0a9f0ccd915e
Binary files /dev/null and b/mod_celadon/_storge_icons/icons/mob/hands/musicbox_hands_right.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/mobs/Miko.dmi b/mod_celadon/_storge_icons/icons/mobs/Miko.dmi
new file mode 100644
index 000000000000..544eaf56e0e2
Binary files /dev/null and b/mod_celadon/_storge_icons/icons/mobs/Miko.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/obj/musicbox.dmi b/mod_celadon/_storge_icons/icons/obj/musicbox.dmi
new file mode 100644
index 000000000000..01b7ead7c78c
Binary files /dev/null and b/mod_celadon/_storge_icons/icons/obj/musicbox.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/overmap/overmap.dmi b/mod_celadon/_storge_icons/icons/overmap/overmap.dmi
index 1771ac67599d..641a12765733 100644
Binary files a/mod_celadon/_storge_icons/icons/overmap/overmap.dmi and b/mod_celadon/_storge_icons/icons/overmap/overmap.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/qol/human_face.dmi b/mod_celadon/_storge_icons/icons/qol/human_face.dmi
index 49dca5a2dea7..3bc1af990a62 100644
Binary files a/mod_celadon/_storge_icons/icons/qol/human_face.dmi and b/mod_celadon/_storge_icons/icons/qol/human_face.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/screen_alert.dmi b/mod_celadon/_storge_icons/icons/screen_alert.dmi
new file mode 100644
index 000000000000..5591755e0190
Binary files /dev/null and b/mod_celadon/_storge_icons/icons/screen_alert.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/structures/floors/metal_2.dmi b/mod_celadon/_storge_icons/icons/structures/floors/metal_2.dmi
new file mode 100644
index 000000000000..5bef41f0d515
Binary files /dev/null and b/mod_celadon/_storge_icons/icons/structures/floors/metal_2.dmi differ
diff --git a/mod_celadon/_storge_icons/icons/structures/obj/decales/zaklepki.dmi b/mod_celadon/_storge_icons/icons/structures/obj/decales/zaklepki.dmi
new file mode 100644
index 000000000000..f5b1bee2ba2d
Binary files /dev/null and b/mod_celadon/_storge_icons/icons/structures/obj/decales/zaklepki.dmi differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/bark.ogg b/mod_celadon/_storge_sounds/sound/emotes/bark.ogg
new file mode 100644
index 000000000000..62a8535b628c
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/bark.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/claps/clap1.ogg b/mod_celadon/_storge_sounds/sound/emotes/claps/clap1.ogg
new file mode 100644
index 000000000000..e2f23e34c480
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/claps/clap1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/claps/clap2.ogg b/mod_celadon/_storge_sounds/sound/emotes/claps/clap2.ogg
new file mode 100644
index 000000000000..7ff8e50c192e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/claps/clap2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/claps/clap3.ogg b/mod_celadon/_storge_sounds/sound/emotes/claps/clap3.ogg
new file mode 100644
index 000000000000..17b69b3971d4
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/claps/clap3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/claps/clap_low.ogg b/mod_celadon/_storge_sounds/sound/emotes/claps/clap_low.ogg
new file mode 100644
index 000000000000..5a93d792ab7f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/claps/clap_low.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/fart.ogg b/mod_celadon/_storge_sounds/sound/emotes/fart.ogg
new file mode 100644
index 000000000000..ea1370160f97
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/fart.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/choke_female_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/choke_female_1.ogg
new file mode 100644
index 000000000000..f33b775fd34e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/choke_female_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/choke_female_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/choke_female_2.ogg
new file mode 100644
index 000000000000..8bd7f74cfddc
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/choke_female_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/choke_female_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/choke_female_3.ogg
new file mode 100644
index 000000000000..444b6688a481
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/choke_female_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/cough_female_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/cough_female_1.ogg
new file mode 100644
index 000000000000..1888efa17d34
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/cough_female_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/cough_female_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/cough_female_2.ogg
new file mode 100644
index 000000000000..cb2b32437d02
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/cough_female_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/cough_female_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/cough_female_3.ogg
new file mode 100644
index 000000000000..f04e2800af2e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/cough_female_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/cry_female_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/cry_female_1.ogg
new file mode 100644
index 000000000000..1b415ea46a07
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/cry_female_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/cry_female_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/cry_female_2.ogg
new file mode 100644
index 000000000000..95eea1260a51
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/cry_female_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/cry_female_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/cry_female_3.ogg
new file mode 100644
index 000000000000..97b190d7994c
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/cry_female_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/female_sigh_moan.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/female_sigh_moan.ogg
new file mode 100644
index 000000000000..3c338a868baf
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/female_sigh_moan.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/female_sniff.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/female_sniff.ogg
new file mode 100644
index 000000000000..edc75248790d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/female_sniff.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_1.ogg
new file mode 100644
index 000000000000..c0f80a1408d7
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_2.ogg
new file mode 100644
index 000000000000..978a236dd1f2
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_3.ogg
new file mode 100644
index 000000000000..30e4150a5646
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_4.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_4.ogg
new file mode 100644
index 000000000000..bb73a1ef5d10
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_4.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_5.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_5.ogg
new file mode 100644
index 000000000000..96a08297b2b0
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/femalescream_5.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_1.ogg
new file mode 100644
index 000000000000..5161bb364099
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_2.ogg
new file mode 100644
index 000000000000..d9fc6919074d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_3.ogg
new file mode 100644
index 000000000000..5b39f41333c8
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_4.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_4.ogg
new file mode 100644
index 000000000000..9d31687aa998
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_4.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_5.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_5.ogg
new file mode 100644
index 000000000000..55509359c85f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_5.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_6.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_6.ogg
new file mode 100644
index 000000000000..02b61deef29c
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_6.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_7.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_7.ogg
new file mode 100644
index 000000000000..48beb4ab30d7
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/gasp_female_7.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/giggle_female_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/giggle_female_1.ogg
new file mode 100644
index 000000000000..73945321891b
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/giggle_female_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/giggle_female_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/giggle_female_2.ogg
new file mode 100644
index 000000000000..953450e66a4e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/giggle_female_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/giggle_female_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/giggle_female_3.ogg
new file mode 100644
index 000000000000..bd1e99de7690
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/giggle_female_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/giggle_female_4.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/giggle_female_4.ogg
new file mode 100644
index 000000000000..057a842adcbc
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/giggle_female_4.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_f1.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_f1.ogg
new file mode 100644
index 000000000000..d7e322babe5f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_f1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_f2.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_f2.ogg
new file mode 100644
index 000000000000..42627dcdea9f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_f2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_1.ogg
new file mode 100644
index 000000000000..e8fd2a8a3268
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_10.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_10.ogg
new file mode 100644
index 000000000000..b4b464bb685c
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_10.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_11.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_11.ogg
new file mode 100644
index 000000000000..064d464505a4
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_11.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_12.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_12.ogg
new file mode 100644
index 000000000000..de301f5c8233
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_12.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_13.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_13.ogg
new file mode 100644
index 000000000000..ed80538fa085
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_13.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_2.ogg
new file mode 100644
index 000000000000..59f5c22835b2
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_3.ogg
new file mode 100644
index 000000000000..b0e62d1cbb51
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_4.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_4.ogg
new file mode 100644
index 000000000000..87c61f0dab27
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_4.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_5.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_5.ogg
new file mode 100644
index 000000000000..a36c581a999c
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_5.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_6.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_6.ogg
new file mode 100644
index 000000000000..dc8ab5dfbdba
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_6.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_7.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_7.ogg
new file mode 100644
index 000000000000..015f02f84330
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_7.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_8.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_8.ogg
new file mode 100644
index 000000000000..ed80538fa085
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_8.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_9.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_9.ogg
new file mode 100644
index 000000000000..3124eaf055cd
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/laugh_female_9.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_f1.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f1.ogg
new file mode 100644
index 000000000000..836ecee5f8d0
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_f10.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f10.ogg
new file mode 100644
index 000000000000..9654b020e923
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f10.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_f11.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f11.ogg
new file mode 100644
index 000000000000..6fcb314058f3
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f11.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_f12.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f12.ogg
new file mode 100644
index 000000000000..7b3831961082
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f12.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_f13.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f13.ogg
new file mode 100644
index 000000000000..c3b368e3a8b9
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f13.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_f14.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f14.ogg
new file mode 100644
index 000000000000..09d3bb3fafba
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f14.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_f2.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f2.ogg
new file mode 100644
index 000000000000..fd2f26723607
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_f3.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f3.ogg
new file mode 100644
index 000000000000..7e3a35b4462e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_f4.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f4.ogg
new file mode 100644
index 000000000000..71ac8c9b8553
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f4.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_f5.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f5.ogg
new file mode 100644
index 000000000000..8e3396a4ac6d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f5.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_f6.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f6.ogg
new file mode 100644
index 000000000000..cf6f12900495
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f6.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_f7.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f7.ogg
new file mode 100644
index 000000000000..9eb7f7364318
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f7.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_f8.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f8.ogg
new file mode 100644
index 000000000000..5f1ceff6fed6
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f8.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_f9.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f9.ogg
new file mode 100644
index 000000000000..22160295fc69
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_f9.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_female_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_female_1.ogg
new file mode 100644
index 000000000000..dcbac9ae6579
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_female_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_female_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_female_2.ogg
new file mode 100644
index 000000000000..88a1bf62b93d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_female_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/moan_female_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/moan_female_3.ogg
new file mode 100644
index 000000000000..f283acbcac70
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/moan_female_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/sigh_female.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/sigh_female.ogg
new file mode 100644
index 000000000000..d72c206cc306
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/sigh_female.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/sneeze_female.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/sneeze_female.ogg
new file mode 100644
index 000000000000..4324415599a2
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/sneeze_female.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/sniff_female.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/sniff_female.ogg
new file mode 100644
index 000000000000..6f4ce34b0b89
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/sniff_female.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/yawn_female_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/yawn_female_1.ogg
new file mode 100644
index 000000000000..548be96b76e1
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/yawn_female_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/yawn_female_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/yawn_female_2.ogg
new file mode 100644
index 000000000000..67b15056728e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/yawn_female_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/female/yawn_female_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/female/yawn_female_3.ogg
new file mode 100644
index 000000000000..12d42db2440e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/female/yawn_female_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/cough_kidan.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/cough_kidan.ogg
new file mode 100644
index 000000000000..fcb41df9b3a4
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/cough_kidan.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/cry_kidan_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/cry_kidan_1.ogg
new file mode 100644
index 000000000000..09baca1e8ce6
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/cry_kidan_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/cry_kidan_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/cry_kidan_2.ogg
new file mode 100644
index 000000000000..545c7cb3dd86
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/cry_kidan_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/deathsound_kidan.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/deathsound_kidan.ogg
new file mode 100644
index 000000000000..373ab0bee75b
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/deathsound_kidan.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/dying_gasp_kidan_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/dying_gasp_kidan_1.ogg
new file mode 100644
index 000000000000..78de7bd6b5ca
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/dying_gasp_kidan_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/dying_gasp_kidan_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/dying_gasp_kidan_2.ogg
new file mode 100644
index 000000000000..3a77eaa0ce1d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/dying_gasp_kidan_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/dying_gasp_kidan_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/dying_gasp_kidan_3.ogg
new file mode 100644
index 000000000000..0b691233e365
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/dying_gasp_kidan_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/giggle_kidan_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/giggle_kidan_1.ogg
new file mode 100644
index 000000000000..960be0b59185
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/giggle_kidan_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/giggle_kidan_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/giggle_kidan_2.ogg
new file mode 100644
index 000000000000..e0a75f3fe65b
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/giggle_kidan_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/laugh_kidan_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/laugh_kidan_1.ogg
new file mode 100644
index 000000000000..8266231e230e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/laugh_kidan_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/laugh_kidan_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/laugh_kidan_2.ogg
new file mode 100644
index 000000000000..675b84222e26
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/laugh_kidan_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/laugh_kidan_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/laugh_kidan_3.ogg
new file mode 100644
index 000000000000..dfdd8278f602
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/laugh_kidan_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/laugh_kidan_4.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/laugh_kidan_4.ogg
new file mode 100644
index 000000000000..93d39af1f80d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/laugh_kidan_4.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/moan_kidan.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/moan_kidan.ogg
new file mode 100644
index 000000000000..a6a05d070070
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/moan_kidan.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/scream_kidan.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/scream_kidan.ogg
new file mode 100644
index 000000000000..20a361186586
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/scream_kidan.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/sigh_kidan_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/sigh_kidan_1.ogg
new file mode 100644
index 000000000000..bfb2b091e63c
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/sigh_kidan_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/sigh_kidan_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/sigh_kidan_2.ogg
new file mode 100644
index 000000000000..92326e36924b
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/sigh_kidan_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/sneeze_kidan_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/sneeze_kidan_1.ogg
new file mode 100644
index 000000000000..068c8deffb42
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/sneeze_kidan_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/sneeze_kidan_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/sneeze_kidan_2.ogg
new file mode 100644
index 000000000000..76e8bd363fb7
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/sneeze_kidan_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/sneeze_kidan_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/sneeze_kidan_3.ogg
new file mode 100644
index 000000000000..5970e47646b4
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/sneeze_kidan_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/talk_kidan_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/talk_kidan_1.ogg
new file mode 100644
index 000000000000..3ce623ec34cb
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/talk_kidan_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/talk_kidan_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/talk_kidan_2.ogg
new file mode 100644
index 000000000000..42b76478a95a
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/talk_kidan_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/talk_kidan_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/talk_kidan_3.ogg
new file mode 100644
index 000000000000..2d851bddb839
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/talk_kidan_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/waves_kidan_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/waves_kidan_1.ogg
new file mode 100644
index 000000000000..1a51d0baee21
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/waves_kidan_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/waves_kidan_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/waves_kidan_2.ogg
new file mode 100644
index 000000000000..baac80f59e03
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/waves_kidan_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/wiggles_kidan_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/wiggles_kidan_1.ogg
new file mode 100644
index 000000000000..b89b6c11f829
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/wiggles_kidan_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/wiggles_kidan_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/wiggles_kidan_2.ogg
new file mode 100644
index 000000000000..434d8cf6c4d1
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/wiggles_kidan_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/kidan/wiggles_kidan_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/kidan/wiggles_kidan_3.ogg
new file mode 100644
index 000000000000..e68bc71799b7
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/kidan/wiggles_kidan_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/choke_male_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/choke_male_1.ogg
new file mode 100644
index 000000000000..e0ddde118f3a
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/choke_male_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/choke_male_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/choke_male_2.ogg
new file mode 100644
index 000000000000..8e7ef3734d80
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/choke_male_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/choke_male_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/choke_male_3.ogg
new file mode 100644
index 000000000000..546ba45bff0f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/choke_male_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/cough_male_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/cough_male_1.ogg
new file mode 100644
index 000000000000..146beefdf873
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/cough_male_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/cough_male_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/cough_male_2.ogg
new file mode 100644
index 000000000000..745fb50e19c4
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/cough_male_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/cough_male_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/cough_male_3.ogg
new file mode 100644
index 000000000000..abfe70d27690
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/cough_male_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/cry_male_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/cry_male_1.ogg
new file mode 100644
index 000000000000..6d4e35be168f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/cry_male_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/cry_male_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/cry_male_2.ogg
new file mode 100644
index 000000000000..b0437d3d9383
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/cry_male_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_1.ogg
new file mode 100644
index 000000000000..5ce88dde766f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_2.ogg
new file mode 100644
index 000000000000..df311e2698e1
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_3.ogg
new file mode 100644
index 000000000000..5614ae1b5735
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_4.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_4.ogg
new file mode 100644
index 000000000000..3d29b276d22d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_4.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_5.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_5.ogg
new file mode 100644
index 000000000000..6cbc4001bfd7
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_5.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_6.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_6.ogg
new file mode 100644
index 000000000000..a2417066a1fd
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_6.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_7.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_7.ogg
new file mode 100644
index 000000000000..84059f30c441
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/gasp_male_7.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/giggle_male_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/giggle_male_1.ogg
new file mode 100644
index 000000000000..06eb4abdfef7
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/giggle_male_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/giggle_male_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/giggle_male_2.ogg
new file mode 100644
index 000000000000..befb7665723a
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/giggle_male_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_m1.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_m1.ogg
new file mode 100644
index 000000000000..5ff9fe2d8b32
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_m1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_m2.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_m2.ogg
new file mode 100644
index 000000000000..391ea1af2983
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_m2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_1.ogg
new file mode 100644
index 000000000000..db42a17d0f19
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_10.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_10.ogg
new file mode 100644
index 000000000000..dba2e80c257f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_10.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_11.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_11.ogg
new file mode 100644
index 000000000000..7522a4b4d962
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_11.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_12.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_12.ogg
new file mode 100644
index 000000000000..89805016ef00
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_12.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_13.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_13.ogg
new file mode 100644
index 000000000000..8892c8868b84
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_13.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_2.ogg
new file mode 100644
index 000000000000..8f7853596dbf
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_3.ogg
new file mode 100644
index 000000000000..8b826be639d8
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_4.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_4.ogg
new file mode 100644
index 000000000000..e5fb59a43a47
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_4.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_5.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_5.ogg
new file mode 100644
index 000000000000..b93de32ac989
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_5.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_6.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_6.ogg
new file mode 100644
index 000000000000..6ca3513e542a
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_6.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_7.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_7.ogg
new file mode 100644
index 000000000000..795e7a6ba674
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_7.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_8.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_8.ogg
new file mode 100644
index 000000000000..6b4f906ffe09
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_8.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_9.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_9.ogg
new file mode 100644
index 000000000000..4033e04eac3b
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/laugh_male_9.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/male_sigh_moan.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/male_sigh_moan.ogg
new file mode 100644
index 000000000000..e748c0c22b93
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/male_sigh_moan.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/male_sniff.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/male_sniff.ogg
new file mode 100644
index 000000000000..bab9580ff490
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/male_sniff.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/malescream_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/malescream_1.ogg
new file mode 100644
index 000000000000..ee9005b89222
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/malescream_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/malescream_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/malescream_2.ogg
new file mode 100644
index 000000000000..989b612ab153
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/malescream_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/malescream_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/malescream_3.ogg
new file mode 100644
index 000000000000..902db1c132cb
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/malescream_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/malescream_4.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/malescream_4.ogg
new file mode 100644
index 000000000000..62f787d4a7b5
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/malescream_4.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/malescream_5.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/malescream_5.ogg
new file mode 100644
index 000000000000..2aec2c7149cf
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/malescream_5.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/malescream_6.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/malescream_6.ogg
new file mode 100644
index 000000000000..bdf732c2212b
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/malescream_6.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/moan_m1.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m1.ogg
new file mode 100644
index 000000000000..93e6d1410cdd
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/moan_m2.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m2.ogg
new file mode 100644
index 000000000000..3bae5e073c67
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/moan_m3.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m3.ogg
new file mode 100644
index 000000000000..a37eefe4cd8f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/moan_m4.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m4.ogg
new file mode 100644
index 000000000000..e8683ea52611
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m4.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/moan_m5.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m5.ogg
new file mode 100644
index 000000000000..2308558b6699
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m5.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/moan_m6.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m6.ogg
new file mode 100644
index 000000000000..0d60d7a74cca
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m6.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/moan_m7.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m7.ogg
new file mode 100644
index 000000000000..4e744775702d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m7.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/moan_m8.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m8.ogg
new file mode 100644
index 000000000000..cd9a9d1e3d7e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/moan_m8.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/moan_male_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/moan_male_1.ogg
new file mode 100644
index 000000000000..59cc27914305
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/moan_male_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/moan_male_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/moan_male_2.ogg
new file mode 100644
index 000000000000..82a021b0a945
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/moan_male_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/moan_male_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/moan_male_3.ogg
new file mode 100644
index 000000000000..78e8eb9c8f66
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/moan_male_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/sigh_male.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/sigh_male.ogg
new file mode 100644
index 000000000000..1590bcdee605
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/sigh_male.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/sniff_male.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/sniff_male.ogg
new file mode 100644
index 000000000000..d4b9ddf6cedb
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/sniff_male.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/yawn_male_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/yawn_male_1.ogg
new file mode 100644
index 000000000000..193f59874584
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/yawn_male_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/male/yawn_male_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/male/yawn_male_2.ogg
new file mode 100644
index 000000000000..4064029e1e34
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/male/yawn_male_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/diona_crunch.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/diona_crunch.ogg
new file mode 100644
index 000000000000..1cfea3c022d7
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/diona_crunch.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_cougha.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_cougha.ogg
new file mode 100644
index 000000000000..f53e0f5bd2c9
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_cougha.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_coughb.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_coughb.ogg
new file mode 100644
index 000000000000..2626f8d6621a
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_coughb.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_machine_cougha.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_machine_cougha.ogg
new file mode 100644
index 000000000000..e0a8441e3d43
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_machine_cougha.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_machine_coughb.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_machine_coughb.ogg
new file mode 100644
index 000000000000..b70b6d16c144
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_machine_coughb.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_machine_sneeze.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_machine_sneeze.ogg
new file mode 100644
index 000000000000..9649c862449d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_machine_sneeze.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_sneeze.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_sneeze.ogg
new file mode 100644
index 000000000000..e6c4a49ade82
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/f_sneeze.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/ipc_crunch.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/ipc_crunch.ogg
new file mode 100644
index 000000000000..225efd5ba608
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/ipc_crunch.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/knuckles.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/knuckles.ogg
new file mode 100644
index 000000000000..b61a50fb613a
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/knuckles.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_cougha.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_cougha.ogg
new file mode 100644
index 000000000000..146beefdf873
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_cougha.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_coughb.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_coughb.ogg
new file mode 100644
index 000000000000..745fb50e19c4
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_coughb.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_coughc.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_coughc.ogg
new file mode 100644
index 000000000000..abfe70d27690
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_coughc.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_machine_cougha.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_machine_cougha.ogg
new file mode 100644
index 000000000000..3e803f64b1e9
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_machine_cougha.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_machine_coughb.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_machine_coughb.ogg
new file mode 100644
index 000000000000..d12870709228
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_machine_coughb.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_machine_coughc.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_machine_coughc.ogg
new file mode 100644
index 000000000000..67e133149340
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/m_machine_coughc.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/machine_sneeze.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/machine_sneeze.ogg
new file mode 100644
index 000000000000..f0ba0ab81702
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/machine_sneeze.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/slime_bubble.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/slime_bubble.ogg
new file mode 100644
index 000000000000..c8ca98ef7a13
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/slime_bubble.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/slime_pop.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/slime_pop.ogg
new file mode 100644
index 000000000000..e1196fc29c0e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/slime_pop.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/mob_effects/sneeze.ogg b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/sneeze.ogg
new file mode 100644
index 000000000000..e7587bab20fa
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/mob_effects/sneeze.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/moth/moth_chitter.ogg b/mod_celadon/_storge_sounds/sound/emotes/moth/moth_chitter.ogg
new file mode 100644
index 000000000000..842bcf8e533d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/moth/moth_chitter.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/moth/moth_cough.ogg b/mod_celadon/_storge_sounds/sound/emotes/moth/moth_cough.ogg
new file mode 100644
index 000000000000..6222e84f6faf
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/moth/moth_cough.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/moth/moth_laugh.ogg b/mod_celadon/_storge_sounds/sound/emotes/moth/moth_laugh.ogg
new file mode 100644
index 000000000000..391d6c5aefe2
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/moth/moth_laugh.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/moth/moth_scream.ogg b/mod_celadon/_storge_sounds/sound/emotes/moth/moth_scream.ogg
new file mode 100644
index 000000000000..482086fb630d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/moth/moth_scream.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/moth/moth_sneeze.ogg b/mod_celadon/_storge_sounds/sound/emotes/moth/moth_sneeze.ogg
new file mode 100644
index 000000000000..c5ac979aed11
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/moth/moth_sneeze.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/plasmaman/scream_plasmaman_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/plasmaman/scream_plasmaman_1.ogg
new file mode 100644
index 000000000000..4cfc6ae65e6f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/plasmaman/scream_plasmaman_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/plasmaman/scream_plasmaman_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/plasmaman/scream_plasmaman_2.ogg
new file mode 100644
index 000000000000..00ae761a239e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/plasmaman/scream_plasmaman_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/plasmaman/scream_plasmaman_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/plasmaman/scream_plasmaman_3.ogg
new file mode 100644
index 000000000000..3868149c8e56
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/plasmaman/scream_plasmaman_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/salute.ogg b/mod_celadon/_storge_sounds/sound/emotes/salute.ogg
new file mode 100644
index 000000000000..76521a63540e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/salute.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/sarathi/lizard_laugh1.ogg b/mod_celadon/_storge_sounds/sound/emotes/sarathi/lizard_laugh1.ogg
new file mode 100644
index 000000000000..b2c02e6d2fcb
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/sarathi/lizard_laugh1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/scream_jelly.ogg b/mod_celadon/_storge_sounds/sound/emotes/scream_jelly.ogg
new file mode 100644
index 000000000000..97fb7e3c68e8
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/scream_jelly.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/anger_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/anger_1.ogg
new file mode 100644
index 000000000000..41f436d3540a
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/anger_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/anger_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/anger_2.ogg
new file mode 100644
index 000000000000..59b7d71d05c0
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/anger_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/credit.txt b/mod_celadon/_storge_sounds/sound/emotes/skrell/credit.txt
new file mode 100644
index 000000000000..b99f5b367010
--- /dev/null
+++ b/mod_celadon/_storge_sounds/sound/emotes/skrell/credit.txt
@@ -0,0 +1,14 @@
+anger_1.ogg
+CC4-BY-NC https://freesound.org/people/BiancaBothaPure/sounds/365671/
+
+anger_2.ogg
+CC0 https://freesound.org/people/BaDoink/sounds/522731/
+
+warble_1.ogg
+CC4-BY https://freesound.org/people/JPBILLINGSLEYJR/sounds/469364/
+
+warble_2.ogg
+CC0 https://freesound.org/people/D.jones/sounds/527846/
+
+croak_1.ogg, croak_2.ogg, croak_3.ogg
+CC4-BY https://freesound.org/people/juskiddink/sounds/99644/
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/croak_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/croak_1.ogg
new file mode 100644
index 000000000000..a680fc29dbc8
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/croak_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/croak_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/croak_2.ogg
new file mode 100644
index 000000000000..2fbeb76a090f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/croak_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/croak_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/croak_3.ogg
new file mode 100644
index 000000000000..f4a5966382d9
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/croak_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/giggle_female_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/giggle_female_1.ogg
new file mode 100644
index 000000000000..1ea51a20362b
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/giggle_female_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/giggle_male_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/giggle_male_1.ogg
new file mode 100644
index 000000000000..1b6e69ff0cf5
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/giggle_male_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_female_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_female_1.ogg
new file mode 100644
index 000000000000..5a11708fa835
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_female_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_female_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_female_2.ogg
new file mode 100644
index 000000000000..6357b3e56099
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_female_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_female_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_female_3.ogg
new file mode 100644
index 000000000000..ca69d95a8d8d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_female_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_male_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_male_1.ogg
new file mode 100644
index 000000000000..384f8a797e92
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_male_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_male_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_male_2.ogg
new file mode 100644
index 000000000000..8087bdcdbd02
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_male_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_male_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_male_3.ogg
new file mode 100644
index 000000000000..2954bbcaa33f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/laugh_male_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/warble_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/warble_1.ogg
new file mode 100644
index 000000000000..120353048579
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/warble_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/skrell/warble_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/skrell/warble_2.ogg
new file mode 100644
index 000000000000..3dc79ab0c454
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/skrell/warble_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/snore_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/snore_1.ogg
new file mode 100644
index 000000000000..f1afa4ecccab
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/snore_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/snore_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/snore_2.ogg
new file mode 100644
index 000000000000..97b4b7a99cf5
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/snore_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/snore_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/snore_3.ogg
new file mode 100644
index 000000000000..b95e4603cc11
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/snore_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/snore_4.ogg b/mod_celadon/_storge_sounds/sound/emotes/snore_4.ogg
new file mode 100644
index 000000000000..4e867039ea71
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/snore_4.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/snore_5.ogg b/mod_celadon/_storge_sounds/sound/emotes/snore_5.ogg
new file mode 100644
index 000000000000..8c0a300acd26
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/snore_5.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/snore_6.ogg b/mod_celadon/_storge_sounds/sound/emotes/snore_6.ogg
new file mode 100644
index 000000000000..bddccff92491
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/snore_6.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/snore_7.ogg b/mod_celadon/_storge_sounds/sound/emotes/snore_7.ogg
new file mode 100644
index 000000000000..7bfe7ca8b6b4
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/snore_7.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/tajaran/annoyed_meow_tajaran.ogg b/mod_celadon/_storge_sounds/sound/emotes/tajaran/annoyed_meow_tajaran.ogg
new file mode 100644
index 000000000000..add32db8d9c7
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/tajaran/annoyed_meow_tajaran.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/tajaran/hiss_tajaran.ogg b/mod_celadon/_storge_sounds/sound/emotes/tajaran/hiss_tajaran.ogg
new file mode 100644
index 000000000000..8a14458ad24e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/tajaran/hiss_tajaran.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/tajaran/meow_tajaran.ogg b/mod_celadon/_storge_sounds/sound/emotes/tajaran/meow_tajaran.ogg
new file mode 100644
index 000000000000..3dcccca7de7c
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/tajaran/meow_tajaran.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/tajaran/purr_tajaran.ogg b/mod_celadon/_storge_sounds/sound/emotes/tajaran/purr_tajaran.ogg
new file mode 100644
index 000000000000..1125cb2bbd71
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/tajaran/purr_tajaran.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/tajaran/purr_tajaran_long.ogg b/mod_celadon/_storge_sounds/sound/emotes/tajaran/purr_tajaran_long.ogg
new file mode 100644
index 000000000000..c74b845250d0
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/tajaran/purr_tajaran_long.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/tajaran/scream_tajaran.ogg b/mod_celadon/_storge_sounds/sound/emotes/tajaran/scream_tajaran.ogg
new file mode 100644
index 000000000000..a9f3be40ddd8
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/tajaran/scream_tajaran.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/toysqueak1.ogg b/mod_celadon/_storge_sounds/sound/emotes/toysqueak1.ogg
new file mode 100644
index 000000000000..e64a6fb179d1
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/toysqueak1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/deathsound_unathi.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/deathsound_unathi.ogg
new file mode 100644
index 000000000000..6fe30f0f1f9f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/deathsound_unathi.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/roar_unathi_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/roar_unathi_1.ogg
new file mode 100644
index 000000000000..f286ebd35e09
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/roar_unathi_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/roar_unathi_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/roar_unathi_2.ogg
new file mode 100644
index 000000000000..1674bb756eba
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/roar_unathi_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/roar_unathi_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/roar_unathi_3.ogg
new file mode 100644
index 000000000000..24d212007b40
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/roar_unathi_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/rumble_unathi_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/rumble_unathi_1.ogg
new file mode 100644
index 000000000000..f9e218f2ce72
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/rumble_unathi_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/rumble_unathi_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/rumble_unathi_2.ogg
new file mode 100644
index 000000000000..18e353878f9b
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/rumble_unathi_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/scream_female.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/scream_female.ogg
new file mode 100644
index 000000000000..a8a8fb45ce8d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/scream_female.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/scream_male.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/scream_male.ogg
new file mode 100644
index 000000000000..30255bf49c4f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/scream_male.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/sneeze_female.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/sneeze_female.ogg
new file mode 100644
index 000000000000..cb62b78dea96
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/sneeze_female.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/sneeze_male.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/sneeze_male.ogg
new file mode 100644
index 000000000000..bc2cb785836f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/sneeze_male.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/talk_unathi_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/talk_unathi_1.ogg
new file mode 100644
index 000000000000..c48027b52ae1
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/talk_unathi_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/talk_unathi_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/talk_unathi_2.ogg
new file mode 100644
index 000000000000..3ee114f6ec86
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/talk_unathi_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/talk_unathi_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/talk_unathi_3.ogg
new file mode 100644
index 000000000000..64a494d0b0cc
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/talk_unathi_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/threat_unathi_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/threat_unathi_1.ogg
new file mode 100644
index 000000000000..e101bab110a0
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/threat_unathi_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/threat_unathi_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/threat_unathi_2.ogg
new file mode 100644
index 000000000000..9560561ba74e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/threat_unathi_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/whip_short_unathi.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/whip_short_unathi.ogg
new file mode 100644
index 000000000000..1f0cf906d7f9
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/whip_short_unathi.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/unathi/whip_unathi.ogg b/mod_celadon/_storge_sounds/sound/emotes/unathi/whip_unathi.ogg
new file mode 100644
index 000000000000..27041906ba02
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/unathi/whip_unathi.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/deathgasp_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/deathgasp_1.ogg
new file mode 100644
index 000000000000..71788a14f45d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/deathgasp_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/deathgasp_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/deathgasp_2.ogg
new file mode 100644
index 000000000000..38daa763fc45
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/deathgasp_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_1.ogg
new file mode 100644
index 000000000000..0e329374617b
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_2.ogg
new file mode 100644
index 000000000000..76857f4ee928
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_3.ogg
new file mode 100644
index 000000000000..e6e0898062c1
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_4.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_4.ogg
new file mode 100644
index 000000000000..516f763f864d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_4.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_5.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_5.ogg
new file mode 100644
index 000000000000..cb076af860ae
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/female_dying_gasp_5.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/female_scream.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/female_scream.ogg
new file mode 100644
index 000000000000..a409cd019358
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/female_scream.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/gasp.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/gasp.ogg
new file mode 100644
index 000000000000..b1fe8bc177f9
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/gasp.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/growl1.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/growl1.ogg
new file mode 100644
index 000000000000..d5152d9c0577
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/growl1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/growl2.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/growl2.ogg
new file mode 100644
index 000000000000..5c48053ac685
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/growl2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/growl3.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/growl3.ogg
new file mode 100644
index 000000000000..bcacf2442f0f
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/growl3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/howl.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/howl.ogg
new file mode 100644
index 000000000000..778fd6b2483b
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/howl.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_1.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_1.ogg
new file mode 100644
index 000000000000..767d6ecb9952
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_1.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_2.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_2.ogg
new file mode 100644
index 000000000000..8a545f532653
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_2.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_3.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_3.ogg
new file mode 100644
index 000000000000..acfbfe913ec9
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_3.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_4.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_4.ogg
new file mode 100644
index 000000000000..516f763f864d
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_4.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_5.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_5.ogg
new file mode 100644
index 000000000000..cb076af860ae
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/male_dying_gasp_5.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/male_scream.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/male_scream.ogg
new file mode 100644
index 000000000000..e7c1571f6d46
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/male_scream.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/monkey_scream.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/monkey_scream.ogg
new file mode 100644
index 000000000000..3aaf0f65cec9
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/monkey_scream.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/voice/robot_scream.ogg b/mod_celadon/_storge_sounds/sound/emotes/voice/robot_scream.ogg
new file mode 100644
index 000000000000..a14b3ad0b145
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/voice/robot_scream.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/vulpkanin/purr.ogg b/mod_celadon/_storge_sounds/sound/emotes/vulpkanin/purr.ogg
new file mode 100644
index 000000000000..529160920930
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/vulpkanin/purr.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/wbark.ogg b/mod_celadon/_storge_sounds/sound/emotes/wbark.ogg
new file mode 100644
index 000000000000..e37005eeb9ab
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/wbark.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/emotes/whistle.ogg b/mod_celadon/_storge_sounds/sound/emotes/whistle.ogg
new file mode 100644
index 000000000000..e8c1a6c90f46
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/emotes/whistle.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/items/musicbox.ogg b/mod_celadon/_storge_sounds/sound/items/musicbox.ogg
new file mode 100644
index 000000000000..667d7cd19c71
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/items/musicbox.ogg differ
diff --git a/mod_celadon/_storge_sounds/sound/plushes/emotes/hiss_t.ogg b/mod_celadon/_storge_sounds/sound/plushes/emotes/hiss_t.ogg
new file mode 100644
index 000000000000..8a14458ad24e
Binary files /dev/null and b/mod_celadon/_storge_sounds/sound/plushes/emotes/hiss_t.ogg differ
diff --git a/mod_celadon/balance/README.md b/mod_celadon/balance/README.md
index d6d6856d7f0d..454760c39a92 100644
--- a/mod_celadon/balance/README.md
+++ b/mod_celadon/balance/README.md
@@ -51,7 +51,7 @@ EDIT: `code\modules\cargo\packs\food.dm` : `/datum/supply_pack/food/`
Лут с элиток (на данный момент убрано из кода для ребаланса)
EDIT: `code\modules\mob\living\simple_animal\hostile\mining_mobs\elites\elite.dm`: `/obj/structure/elite_tumor/proc/onEliteLoss()` -> var/obj/structure/closet/crate/necropolis/tendril/lootbox = new /obj/structure/closet/crate/necropolis/tendril(loc)
-ADD: `code\modules\projectiles\ammunition\_ammunition.dm` : /obj/item/ammo_casing/attackby(obj/item/I, mob/user, params) -> добавлены звук подбора патрона в магазин с пола и задержка в 1 секунду зависящая от кликанья по патронам. Чем быстрее клики - тем быстрее загрузятся патроны.
+ADD: `code\modules\projectiles\ammunition\_ammunition.dm` : /obj/item/ammo_casing/attackby(obj/item/I, mob/user, params) -> добавлены звук подбора патрона в магазин с пола и задержка в 1 секунду зависящая от кликанья по патронам. Чем быстрее клики - тем быстрее загрузятся патроны. -> перемещено в `mod_celadon/items/code/ammunition.dm`
Очки с зомби и ксеноморфов
REMOVE: `D:\1ss\ShiptestYata\code\modules\surgery\experimental_dissection.dm`: `/datum/surgery_step/dissection/preop`
REMOVE: `code\modules\projectiles\guns\energy.dm`
@@ -92,6 +92,8 @@ EDIT: `code/modules/modular_computers/file_system/programs/radar.dm` : став
EDIT: `mod_celadon/return_content/code/hivebot.dm` : понизили шанс выпадения ксенобио с 45% до 15% с портала
EDIT: `code/modules/reagents/chemistry/recipes/others.dm` : Меняем кровь слаймоменов в ядрах слаймов на кислоту
+EDIT: `code/game/objects/items/storage/briefcase.dm` : Меняем разрешенные вложенные предметы с нормала на смол, чтобы нельзя было вкладывать коробки с и создавать матрешку коробок.
+
"
);
};
-
-// Signal tgui that we're ready to receive updates
-Byond.sendMessage('ready');
|